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

diff --git a/icd/intel/cmd.h b/icd/intel/cmd.h
index 2379b3a..a832ef5 100644
--- a/icd/intel/cmd.h
+++ b/icd/intel/cmd.h
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -179,13 +179,13 @@
 
     struct {
         const struct intel_buf *buf[INTEL_MAX_VERTEX_BINDING_COUNT];
-        XGL_GPU_SIZE offset[INTEL_MAX_VERTEX_BINDING_COUNT];
+        VK_GPU_SIZE offset[INTEL_MAX_VERTEX_BINDING_COUNT];
     } vertex;
 
     struct {
         const struct intel_buf *buf;
-        XGL_GPU_SIZE offset;
-        XGL_INDEX_TYPE type;
+        VK_GPU_SIZE offset;
+        VK_INDEX_TYPE type;
     } index;
 
 
@@ -222,17 +222,17 @@
     struct intel_cmd_reloc *relocs;
     uint32_t reloc_count;
 
-    XGL_FLAGS flags;
+    VK_FLAGS flags;
 
     struct intel_cmd_writer writers[INTEL_CMD_WRITER_COUNT];
 
     uint32_t reloc_used;
-    XGL_RESULT result;
+    VK_RESULT result;
 
     struct intel_cmd_bind bind;
 };
 
-static inline struct intel_cmd *intel_cmd(XGL_CMD_BUFFER cmd)
+static inline struct intel_cmd *intel_cmd(VK_CMD_BUFFER cmd)
 {
     return (struct intel_cmd *) cmd;
 }
@@ -242,18 +242,18 @@
     return (struct intel_cmd *) obj;
 }
 
-XGL_RESULT intel_cmd_create(struct intel_dev *dev,
-                            const XGL_CMD_BUFFER_CREATE_INFO *info,
+VK_RESULT intel_cmd_create(struct intel_dev *dev,
+                            const VK_CMD_BUFFER_CREATE_INFO *info,
                             struct intel_cmd **cmd_ret);
 void intel_cmd_destroy(struct intel_cmd *cmd);
 
-XGL_RESULT intel_cmd_begin(struct intel_cmd *cmd, const XGL_CMD_BUFFER_BEGIN_INFO* pBeginInfo);
-XGL_RESULT intel_cmd_end(struct intel_cmd *cmd);
+VK_RESULT intel_cmd_begin(struct intel_cmd *cmd, const VK_CMD_BUFFER_BEGIN_INFO* pBeginInfo);
+VK_RESULT intel_cmd_end(struct intel_cmd *cmd);
 
 void intel_cmd_decode(struct intel_cmd *cmd, bool decode_inst_writer);
 
 static inline struct intel_bo *intel_cmd_get_batch(const struct intel_cmd *cmd,
-                                                   XGL_GPU_SIZE *used)
+                                                   VK_GPU_SIZE *used)
 {
     const struct intel_cmd_writer *writer =
         &cmd->writers[INTEL_CMD_WRITER_BATCH];