vulkan: beautification changes

TODO: verify vk-layer-generate.py

TODO: need to rename object tracker generator

v2: fix "python3 vulkan.py"
    fix dead cod in tri introduced by rebase
    beautify wsi_null.c (olv)
diff --git a/icd/intel/dev.h b/icd/intel/dev.h
index f8803a3..ab86cd9 100644
--- a/icd/intel/dev.h
+++ b/icd/intel/dev.h
@@ -146,7 +146,7 @@
 struct intel_dev_dbg {
     struct intel_base_dbg base;
 
-    VK_VALIDATION_LEVEL validation_level;
+    VkValidationLevel validation_level;
     bool disable_pipeline_loads;
     bool force_object_memory_reqs;
     bool force_large_image_alignment;
@@ -176,7 +176,7 @@
     struct intel_queue *queues[INTEL_GPU_ENGINE_COUNT];
 };
 
-static inline struct intel_dev *intel_dev(VK_DEVICE dev)
+static inline struct intel_dev *intel_dev(VkDevice dev)
 {
     return (struct intel_dev *) dev;
 }
@@ -186,12 +186,12 @@
     return (struct intel_dev_dbg *) dev->base.dbg;
 }
 
-VK_RESULT intel_dev_create(struct intel_gpu *gpu,
+VkResult intel_dev_create(struct intel_gpu *gpu,
                             const VkDeviceCreateInfo *info,
                             struct intel_dev **dev_ret);
 void intel_dev_destroy(struct intel_dev *dev);
 
-VK_RESULT intel_dev_add_msg_filter(struct intel_dev *dev,
+VkResult intel_dev_add_msg_filter(struct intel_dev *dev,
                                     int32_t msg_code,
                                     VK_DBG_MSG_FILTER filter);
 
@@ -200,7 +200,7 @@
 
 void intel_dev_log(struct intel_dev *dev,
                    VK_DBG_MSG_TYPE msg_type,
-                   VK_VALIDATION_LEVEL validation_level,
+                   VkValidationLevel validation_level,
                    struct intel_base *src_object,
                    size_t location,
                    int32_t msg_code,