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/cmd_priv.h

diff --git a/icd/intel/cmd_priv.h b/icd/intel/cmd_priv.h
index ff930a9..b5d831d 100644
--- a/icd/intel/cmd_priv.h
+++ b/icd/intel/cmd_priv.h
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -125,7 +125,7 @@
     struct {
         struct intel_ds_view *view;
         uint32_t stencil_ref;
-        XGL_IMAGE_ASPECT aspect;
+        VK_IMAGE_ASPECT aspect;
 
         enum intel_cmd_meta_ds_op op;
         bool optimal;
@@ -142,10 +142,10 @@
     return intel_gpu_gen(cmd->dev->gpu);
 }
 
-static inline void cmd_fail(struct intel_cmd *cmd, XGL_RESULT result)
+static inline void cmd_fail(struct intel_cmd *cmd, VK_RESULT result)
 {
-    intel_dev_log(cmd->dev, XGL_DBG_MSG_ERROR,
-            XGL_VALIDATION_LEVEL_0, XGL_NULL_HANDLE, 0, 0,
+    intel_dev_log(cmd->dev, VK_DBG_MSG_ERROR,
+            VK_VALIDATION_LEVEL_0, VK_NULL_HANDLE, 0, 0,
             "command building error");
 
     cmd->result = result;
@@ -157,7 +157,7 @@
     /* fail silently */
     if (cmd->reloc_used + reloc_len > cmd->reloc_count) {
         cmd->reloc_used = 0;
-        cmd_fail(cmd, XGL_ERROR_TOO_MANY_MEMORY_REFERENCES);
+        cmd_fail(cmd, VK_ERROR_TOO_MANY_MEMORY_REFERENCES);
     }
     assert(cmd->reloc_used + reloc_len <= cmd->reloc_count);
 }
@@ -506,16 +506,16 @@
 
 void cmd_batch_depth_count(struct intel_cmd *cmd,
                            struct intel_bo *bo,
-                           XGL_GPU_SIZE offset);
+                           VK_GPU_SIZE offset);
 
 void cmd_batch_timestamp(struct intel_cmd *cmd,
                          struct intel_bo *bo,
-                         XGL_GPU_SIZE offset);
+                         VK_GPU_SIZE offset);
 
 void cmd_batch_immediate(struct intel_cmd *cmd,
                          uint32_t pipe_control_flags,
                          struct intel_bo *bo,
-                         XGL_GPU_SIZE offset,
+                         VK_GPU_SIZE offset,
                          uint64_t val);
 
 void cmd_draw_meta(struct intel_cmd *cmd, const struct intel_cmd_meta *meta);
@@ -523,6 +523,6 @@
 void cmd_meta_ds_op(struct intel_cmd *cmd,
                     enum intel_cmd_meta_ds_op op,
                     struct intel_img *img,
-                    const XGL_IMAGE_SUBRESOURCE_RANGE *range);
+                    const VK_IMAGE_SUBRESOURCE_RANGE *range);
 
 #endif /* CMD_PRIV_H */