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/gpu.h b/icd/intel/gpu.h
index 70237e2..a113a5e 100644
--- a/icd/intel/gpu.h
+++ b/icd/intel/gpu.h
@@ -66,7 +66,7 @@
     int gen_opaque;     /* always read this with intel_gpu_gen() */
     int gt;
 
-    VK_GPU_SIZE max_batch_buffer_size;
+    VkGpuSize max_batch_buffer_size;
     uint32_t batch_buffer_reloc_count;
 
     /*
@@ -85,7 +85,7 @@
     uint32_t display_count;
 };
 
-static inline struct intel_gpu *intel_gpu(VK_PHYSICAL_GPU gpu)
+static inline struct intel_gpu *intel_gpu(VkPhysicalGpu gpu)
 {
     return (struct intel_gpu *) gpu;
 }
@@ -99,27 +99,27 @@
 #endif
 }
 
-VK_RESULT intel_gpu_create(const struct intel_instance *instance, int devid,
+VkResult intel_gpu_create(const struct intel_instance *instance, int devid,
                             const char *primary_node, const char *render_node,
                             struct intel_gpu **gpu_ret);
 void intel_gpu_destroy(struct intel_gpu *gpu);
 
 void intel_gpu_get_props(const struct intel_gpu *gpu,
-                         VK_PHYSICAL_GPU_PROPERTIES *props);
+                         VkPhysicalGpuProperties *props);
 void intel_gpu_get_perf(const struct intel_gpu *gpu,
-                        VK_PHYSICAL_GPU_PERFORMANCE *perf);
+                        VkPhysicalGpuPerformance *perf);
 void intel_gpu_get_queue_props(const struct intel_gpu *gpu,
                                enum intel_gpu_engine_type engine,
-                               VK_PHYSICAL_GPU_QUEUE_PROPERTIES *props);
+                               VkPhysicalGpuQueueProperties *props);
 void intel_gpu_get_memory_props(const struct intel_gpu *gpu,
-                                VK_PHYSICAL_GPU_MEMORY_PROPERTIES *props);
+                                VkPhysicalGpuMemoryProperties *props);
 
 int intel_gpu_get_max_threads(const struct intel_gpu *gpu,
-                              VK_PIPELINE_SHADER_STAGE stage);
+                              VkPipelineShaderStage stage);
 
 int intel_gpu_get_primary_fd(struct intel_gpu *gpu);
 
-VK_RESULT intel_gpu_init_winsys(struct intel_gpu *gpu);
+VkResult intel_gpu_init_winsys(struct intel_gpu *gpu);
 void intel_gpu_cleanup_winsys(struct intel_gpu *gpu);
 
 enum intel_ext_type intel_gpu_lookup_extension(const struct intel_gpu *gpu,