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/shader.c

diff --git a/icd/intel/shader.c b/icd/intel/shader.c
index 232fb31..c8070c3 100644
--- a/icd/intel/shader.c
+++ b/icd/intel/shader.c
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -39,8 +39,8 @@
     intel_base_destroy(&sh->obj.base);
 }
 
-static XGL_RESULT shader_create(struct intel_dev *dev,
-                                const XGL_SHADER_CREATE_INFO *info,
+static VK_RESULT shader_create(struct intel_dev *dev,
+                                const VK_SHADER_CREATE_INFO *info,
                                 struct intel_shader **sh_ret)
 {
     const struct icd_spv_header *spv =
@@ -48,32 +48,32 @@
     struct intel_shader *sh;
 
     sh = (struct intel_shader *) intel_base_create(&dev->base.handle,
-            sizeof(*sh), dev->base.dbg, XGL_DBG_OBJECT_SHADER, info, 0);
+            sizeof(*sh), dev->base.dbg, VK_DBG_OBJECT_SHADER, info, 0);
     if (!sh)
-        return XGL_ERROR_OUT_OF_MEMORY;
+        return VK_ERROR_OUT_OF_MEMORY;
 
     if (info->codeSize < sizeof(*spv))
-        return XGL_ERROR_INVALID_MEMORY_SIZE;
+        return VK_ERROR_INVALID_MEMORY_SIZE;
     if (spv->magic != ICD_SPV_MAGIC)
-        return XGL_ERROR_BAD_SHADER_CODE;
+        return VK_ERROR_BAD_SHADER_CODE;
 
     sh->ir = shader_create_ir(dev->gpu, info->pCode, info->codeSize);
     if (!sh->ir) {
         shader_destroy(&sh->obj);
-        return XGL_ERROR_UNKNOWN;
+        return VK_ERROR_UNKNOWN;
     }
 
     sh->obj.destroy = shader_destroy;
 
     *sh_ret = sh;
 
-    return XGL_SUCCESS;
+    return VK_SUCCESS;
 }
 
-ICD_EXPORT XGL_RESULT XGLAPI xglCreateShader(
-        XGL_DEVICE                                  device,
-        const XGL_SHADER_CREATE_INFO*               pCreateInfo,
-        XGL_SHADER*                                 pShader)
+ICD_EXPORT VK_RESULT VKAPI vkCreateShader(
+        VK_DEVICE                                  device,
+        const VK_SHADER_CREATE_INFO*               pCreateInfo,
+        VK_SHADER*                                 pShader)
 {
     struct intel_dev *dev = intel_dev(device);