Bug 13632 Header 84 Assorted questions and comments on vulkan.h
diff --git a/icd/intel/gpu.h b/icd/intel/gpu.h
index ba32f3b..30781da 100644
--- a/icd/intel/gpu.h
+++ b/icd/intel/gpu.h
@@ -74,7 +74,7 @@
     int gen_opaque;     /* always read this with intel_gpu_gen() */
     int gt;
 
-    VkGpuSize max_batch_buffer_size;
+    VkDeviceSize max_batch_buffer_size;
     uint32_t batch_buffer_reloc_count;
 
     /*
@@ -93,7 +93,7 @@
     uint32_t display_count;
 };
 
-static inline struct intel_gpu *intel_gpu(VkPhysicalGpu gpu)
+static inline struct intel_gpu *intel_gpu(VkPhysicalDevice gpu)
 {
     return (struct intel_gpu *) gpu;
 }
@@ -113,17 +113,17 @@
 void intel_gpu_destroy(struct intel_gpu *gpu);
 
 void intel_gpu_get_props(const struct intel_gpu *gpu,
-                         VkPhysicalGpuProperties *props);
+                         VkPhysicalDeviceProperties *props);
 void intel_gpu_get_perf(const struct intel_gpu *gpu,
-                        VkPhysicalGpuPerformance *perf);
+                        VkPhysicalDevicePerformance *perf);
 void intel_gpu_get_queue_props(const struct intel_gpu *gpu,
                                enum intel_gpu_engine_type engine,
-                               VkPhysicalGpuQueueProperties *props);
+                               VkPhysicalDeviceQueueProperties *props);
 void intel_gpu_get_memory_props(const struct intel_gpu *gpu,
-                                VkPhysicalGpuMemoryProperties *props);
+                                VkPhysicalDeviceMemoryProperties *props);
 
 int intel_gpu_get_max_threads(const struct intel_gpu *gpu,
-                              VkPipelineShaderStage stage);
+                              VkShaderStage stage);
 
 int intel_gpu_get_primary_fd(struct intel_gpu *gpu);