commit 9cc421eb545767e22fd723dc573a7a3225261b1c
author Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Apr 08 15:36:08 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:48:17 2015 +0800
tree 2f6b6e233f1daf56a2123264a2347cbcc43a0f1b
parent 89e99e6dd74c1f407c2f2cb1aac2ad4ca3d45ff2

Stage 1 of rename

TODO: re-enable glave build, advance API for glave

v2: get rid of outdated code in tri introduced by rebase
    rename wsi_null.c (olv)

icd/intel/gpu.h

diff --git a/icd/intel/gpu.h b/icd/intel/gpu.h
index 1afd347..70237e2 100644
--- a/icd/intel/gpu.h
+++ b/icd/intel/gpu.h
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -66,7 +66,7 @@
     int gen_opaque;     /* always read this with intel_gpu_gen() */
     int gt;
 
-    XGL_GPU_SIZE max_batch_buffer_size;
+    VK_GPU_SIZE 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(XGL_PHYSICAL_GPU gpu)
+static inline struct intel_gpu *intel_gpu(VK_PHYSICAL_GPU gpu)
 {
     return (struct intel_gpu *) gpu;
 }
@@ -99,27 +99,27 @@
 #endif
 }
 
-XGL_RESULT intel_gpu_create(const struct intel_instance *instance, int devid,
+VK_RESULT 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,
-                         XGL_PHYSICAL_GPU_PROPERTIES *props);
+                         VK_PHYSICAL_GPU_PROPERTIES *props);
 void intel_gpu_get_perf(const struct intel_gpu *gpu,
-                        XGL_PHYSICAL_GPU_PERFORMANCE *perf);
+                        VK_PHYSICAL_GPU_PERFORMANCE *perf);
 void intel_gpu_get_queue_props(const struct intel_gpu *gpu,
                                enum intel_gpu_engine_type engine,
-                               XGL_PHYSICAL_GPU_QUEUE_PROPERTIES *props);
+                               VK_PHYSICAL_GPU_QUEUE_PROPERTIES *props);
 void intel_gpu_get_memory_props(const struct intel_gpu *gpu,
-                                XGL_PHYSICAL_GPU_MEMORY_PROPERTIES *props);
+                                VK_PHYSICAL_GPU_MEMORY_PROPERTIES *props);
 
 int intel_gpu_get_max_threads(const struct intel_gpu *gpu,
-                              XGL_PIPELINE_SHADER_STAGE stage);
+                              VK_PIPELINE_SHADER_STAGE stage);
 
 int intel_gpu_get_primary_fd(struct intel_gpu *gpu);
 
-XGL_RESULT intel_gpu_init_winsys(struct intel_gpu *gpu);
+VK_RESULT 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,