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

diff --git a/icd/intel/intel.h b/icd/intel/intel.h
index 5d0bb72..89f9476 100644
--- a/icd/intel/intel.h
+++ b/icd/intel/intel.h
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -36,10 +36,10 @@
 #include <string.h>
 #include <assert.h>
 
-#include <xgl.h>
-#include <xglDbg.h>
-#include <xglWsiX11Ext.h>
-#include <xglIcd.h>
+#include <vulkan.h>
+#include <vkDbg.h>
+#include <vkWsiX11Ext.h>
+#include <vkIcd.h>
 
 #include "icd.h"
 #include "icd-spv.h"
@@ -47,7 +47,7 @@
 #include "icd-instance.h"
 #include "icd-utils.h"
 
-#define INTEL_API_VERSION XGL_API_VERSION
+#define INTEL_API_VERSION VK_API_VERSION
 #define INTEL_DRIVER_VERSION 0
 
 #define INTEL_GEN(gen) ((int) ((gen) * 100))
@@ -78,7 +78,7 @@
 static const uint32_t intel_handle_magic = 0x494e544c;
 
 static inline void intel_handle_init(struct intel_handle *handle,
-                                     XGL_DBG_OBJECT_TYPE type,
+                                     VK_DBG_OBJECT_TYPE type,
                                      const struct icd_instance *icd)
 {
     set_loader_magic_value(handle);
@@ -97,7 +97,7 @@
     const uint32_t handle_type =
         ((const struct intel_handle *) handle)->magic - intel_handle_magic;
 
-    return (handle_type <= XGL_DBG_OBJECT_TYPE_END_RANGE);
+    return (handle_type <= VK_DBG_OBJECT_TYPE_END_RANGE);
 }
 
 /**
@@ -106,7 +106,7 @@
  * \see intel_handle_validate().
  */
 static inline bool intel_handle_validate_type(const void *handle,
-                                              XGL_DBG_OBJECT_TYPE type)
+                                              VK_DBG_OBJECT_TYPE type)
 {
     const uint32_t handle_type =
         ((const struct intel_handle *) handle)->magic - intel_handle_magic;
@@ -116,7 +116,7 @@
 
 static inline void *intel_alloc(const void *handle,
                                 size_t size, size_t alignment,
-                                XGL_SYSTEM_ALLOC_TYPE type)
+                                VK_SYSTEM_ALLOC_TYPE type)
 {
     assert(intel_handle_validate(handle));
     return icd_instance_alloc(((const struct intel_handle *) handle)->icd,
@@ -130,9 +130,9 @@
 }
 
 static inline void intel_logv(const void *handle,
-                              XGL_DBG_MSG_TYPE msg_type,
-                              XGL_VALIDATION_LEVEL validation_level,
-                              XGL_BASE_OBJECT src_object,
+                              VK_DBG_MSG_TYPE msg_type,
+                              VK_VALIDATION_LEVEL validation_level,
+                              VK_BASE_OBJECT src_object,
                               size_t location, int32_t msg_code,
                               const char *format, va_list ap)
 {
@@ -149,9 +149,9 @@
 }
 
 static inline void intel_log(const void *handle,
-                             XGL_DBG_MSG_TYPE msg_type,
-                             XGL_VALIDATION_LEVEL validation_level,
-                             XGL_BASE_OBJECT src_object,
+                             VK_DBG_MSG_TYPE msg_type,
+                             VK_VALIDATION_LEVEL validation_level,
+                             VK_BASE_OBJECT src_object,
                              size_t location, int32_t msg_code,
                              const char *format, ...)
 {