1 files changed, 75 insertions, 75 deletions

diff --git a/layers/object_track.h b/layers/object_track.h
index 65e1fef6..a0050c86 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "xglLayer.h"
+#include "vkLayer.h"
 // Object Tracker ERROR codes
 typedef enum _OBJECT_TRACK_ERROR
 {
@@ -56,109 +56,109 @@ typedef enum _OBJECT_STATUS
 } OBJECT_STATUS;
 // TODO : Make this code-generated
 // Object type enum
-typedef enum _XGL_OBJECT_TYPE
+typedef enum _VK_OBJECT_TYPE
 {
-    XGL_OBJECT_TYPE_SAMPLER,
-    XGL_OBJECT_TYPE_DYNAMIC_DS_STATE_OBJECT,
-    XGL_OBJECT_TYPE_DESCRIPTOR_SET,
-    XGL_OBJECT_TYPE_DESCRIPTOR_POOL,
-    XGL_OBJECT_TYPE_DYNAMIC_CB_STATE_OBJECT,
-    XGL_OBJECT_TYPE_IMAGE_VIEW,
-    XGL_OBJECT_TYPE_SEMAPHORE,
-    XGL_OBJECT_TYPE_SHADER,
-    XGL_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT,
-    XGL_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_CHAIN,
-    XGL_OBJECT_TYPE_BUFFER,
-    XGL_OBJECT_TYPE_PIPELINE,
-    XGL_OBJECT_TYPE_DEVICE,
-    XGL_OBJECT_TYPE_QUERY_POOL,
-    XGL_OBJECT_TYPE_EVENT,
-    XGL_OBJECT_TYPE_QUEUE,
-    XGL_OBJECT_TYPE_PHYSICAL_GPU,
-    XGL_OBJECT_TYPE_RENDER_PASS,
-    XGL_OBJECT_TYPE_FRAMEBUFFER,
-    XGL_OBJECT_TYPE_IMAGE,
-    XGL_OBJECT_TYPE_BUFFER_VIEW,
-    XGL_OBJECT_TYPE_DEPTH_STENCIL_VIEW,
-    XGL_OBJECT_TYPE_INSTANCE,
-    XGL_OBJECT_TYPE_PIPELINE_DELTA,
-    XGL_OBJECT_TYPE_DYNAMIC_VP_STATE_OBJECT,
-    XGL_OBJECT_TYPE_COLOR_ATTACHMENT_VIEW,
-    XGL_OBJECT_TYPE_GPU_MEMORY,
-    XGL_OBJECT_TYPE_DYNAMIC_RS_STATE_OBJECT,
-    XGL_OBJECT_TYPE_FENCE,
-    XGL_OBJECT_TYPE_CMD_BUFFER,
-    XGL_OBJECT_TYPE_PRESENTABLE_IMAGE_MEMORY,
+    VK_OBJECT_TYPE_SAMPLER,
+    VK_OBJECT_TYPE_DYNAMIC_DS_STATE_OBJECT,
+    VK_OBJECT_TYPE_DESCRIPTOR_SET,
+    VK_OBJECT_TYPE_DESCRIPTOR_POOL,
+    VK_OBJECT_TYPE_DYNAMIC_CB_STATE_OBJECT,
+    VK_OBJECT_TYPE_IMAGE_VIEW,
+    VK_OBJECT_TYPE_SEMAPHORE,
+    VK_OBJECT_TYPE_SHADER,
+    VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT,
+    VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_CHAIN,
+    VK_OBJECT_TYPE_BUFFER,
+    VK_OBJECT_TYPE_PIPELINE,
+    VK_OBJECT_TYPE_DEVICE,
+    VK_OBJECT_TYPE_QUERY_POOL,
+    VK_OBJECT_TYPE_EVENT,
+    VK_OBJECT_TYPE_QUEUE,
+    VK_OBJECT_TYPE_PHYSICAL_GPU,
+    VK_OBJECT_TYPE_RENDER_PASS,
+    VK_OBJECT_TYPE_FRAMEBUFFER,
+    VK_OBJECT_TYPE_IMAGE,
+    VK_OBJECT_TYPE_BUFFER_VIEW,
+    VK_OBJECT_TYPE_DEPTH_STENCIL_VIEW,
+    VK_OBJECT_TYPE_INSTANCE,
+    VK_OBJECT_TYPE_PIPELINE_DELTA,
+    VK_OBJECT_TYPE_DYNAMIC_VP_STATE_OBJECT,
+    VK_OBJECT_TYPE_COLOR_ATTACHMENT_VIEW,
+    VK_OBJECT_TYPE_GPU_MEMORY,
+    VK_OBJECT_TYPE_DYNAMIC_RS_STATE_OBJECT,
+    VK_OBJECT_TYPE_FENCE,
+    VK_OBJECT_TYPE_CMD_BUFFER,
+    VK_OBJECT_TYPE_PRESENTABLE_IMAGE_MEMORY,
 
-    XGL_OBJECT_TYPE_UNKNOWN,
-    XGL_NUM_OBJECT_TYPE,
-    XGL_OBJECT_TYPE_ANY, // Allow global object list to be queried/retrieved
-} XGL_OBJECT_TYPE;
+    VK_OBJECT_TYPE_UNKNOWN,
+    VK_NUM_OBJECT_TYPE,
+    VK_OBJECT_TYPE_ANY, // Allow global object list to be queried/retrieved
+} VK_OBJECT_TYPE;
 
-static const char* string_XGL_OBJECT_TYPE(XGL_OBJECT_TYPE type) {
+static const char* string_VK_OBJECT_TYPE(VK_OBJECT_TYPE type) {
     switch (type)
     {
-        case XGL_OBJECT_TYPE_DEVICE:
+        case VK_OBJECT_TYPE_DEVICE:
             return "DEVICE";
-        case XGL_OBJECT_TYPE_PIPELINE:
+        case VK_OBJECT_TYPE_PIPELINE:
             return "PIPELINE";
-        case XGL_OBJECT_TYPE_FENCE:
+        case VK_OBJECT_TYPE_FENCE:
             return "FENCE";
-        case XGL_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT:
+        case VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT:
             return "DESCRIPTOR_SET_LAYOUT";
-        case XGL_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_CHAIN:
+        case VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_CHAIN:
             return "DESCRIPTOR_SET_LAYOUT_CHAIN";
-        case XGL_OBJECT_TYPE_GPU_MEMORY:
+        case VK_OBJECT_TYPE_GPU_MEMORY:
             return "GPU_MEMORY";
-        case XGL_OBJECT_TYPE_QUEUE:
+        case VK_OBJECT_TYPE_QUEUE:
             return "QUEUE";
-        case XGL_OBJECT_TYPE_IMAGE:
+        case VK_OBJECT_TYPE_IMAGE:
             return "IMAGE";
-        case XGL_OBJECT_TYPE_CMD_BUFFER:
+        case VK_OBJECT_TYPE_CMD_BUFFER:
             return "CMD_BUFFER";
-        case XGL_OBJECT_TYPE_SEMAPHORE:
+        case VK_OBJECT_TYPE_SEMAPHORE:
             return "SEMAPHORE";
-        case XGL_OBJECT_TYPE_FRAMEBUFFER:
+        case VK_OBJECT_TYPE_FRAMEBUFFER:
             return "FRAMEBUFFER";
-        case XGL_OBJECT_TYPE_SAMPLER:
+        case VK_OBJECT_TYPE_SAMPLER:
             return "SAMPLER";
-        case XGL_OBJECT_TYPE_COLOR_ATTACHMENT_VIEW:
+        case VK_OBJECT_TYPE_COLOR_ATTACHMENT_VIEW:
             return "COLOR_ATTACHMENT_VIEW";
-        case XGL_OBJECT_TYPE_BUFFER_VIEW:
+        case VK_OBJECT_TYPE_BUFFER_VIEW:
             return "BUFFER_VIEW";
-        case XGL_OBJECT_TYPE_DESCRIPTOR_SET:
+        case VK_OBJECT_TYPE_DESCRIPTOR_SET:
             return "DESCRIPTOR_SET";
-        case XGL_OBJECT_TYPE_PHYSICAL_GPU:
+        case VK_OBJECT_TYPE_PHYSICAL_GPU:
             return "PHYSICAL_GPU";
-        case XGL_OBJECT_TYPE_IMAGE_VIEW:
+        case VK_OBJECT_TYPE_IMAGE_VIEW:
             return "IMAGE_VIEW";
-        case XGL_OBJECT_TYPE_BUFFER:
+        case VK_OBJECT_TYPE_BUFFER:
             return "BUFFER";
-        case XGL_OBJECT_TYPE_PIPELINE_DELTA:
+        case VK_OBJECT_TYPE_PIPELINE_DELTA:
             return "PIPELINE_DELTA";
-        case XGL_OBJECT_TYPE_DYNAMIC_RS_STATE_OBJECT:
+        case VK_OBJECT_TYPE_DYNAMIC_RS_STATE_OBJECT:
             return "DYNAMIC_RS_STATE_OBJECT";
-        case XGL_OBJECT_TYPE_EVENT:
+        case VK_OBJECT_TYPE_EVENT:
             return "EVENT";
-        case XGL_OBJECT_TYPE_DEPTH_STENCIL_VIEW:
+        case VK_OBJECT_TYPE_DEPTH_STENCIL_VIEW:
             return "DEPTH_STENCIL_VIEW";
-        case XGL_OBJECT_TYPE_SHADER:
+        case VK_OBJECT_TYPE_SHADER:
             return "SHADER";
-        case XGL_OBJECT_TYPE_DYNAMIC_DS_STATE_OBJECT:
+        case VK_OBJECT_TYPE_DYNAMIC_DS_STATE_OBJECT:
             return "DYNAMIC_DS_STATE_OBJECT";
-        case XGL_OBJECT_TYPE_DYNAMIC_VP_STATE_OBJECT:
+        case VK_OBJECT_TYPE_DYNAMIC_VP_STATE_OBJECT:
             return "DYNAMIC_VP_STATE_OBJECT";
-        case XGL_OBJECT_TYPE_DYNAMIC_CB_STATE_OBJECT:
+        case VK_OBJECT_TYPE_DYNAMIC_CB_STATE_OBJECT:
             return "DYNAMIC_CB_STATE_OBJECT";
-        case XGL_OBJECT_TYPE_INSTANCE:
+        case VK_OBJECT_TYPE_INSTANCE:
             return "INSTANCE";
-        case XGL_OBJECT_TYPE_RENDER_PASS:
+        case VK_OBJECT_TYPE_RENDER_PASS:
             return "RENDER_PASS";
-        case XGL_OBJECT_TYPE_QUERY_POOL:
+        case VK_OBJECT_TYPE_QUERY_POOL:
             return "QUERY_POOL";
-        case XGL_OBJECT_TYPE_DESCRIPTOR_POOL:
+        case VK_OBJECT_TYPE_DESCRIPTOR_POOL:
             return "DESCRIPTOR_POOL";
-        case XGL_OBJECT_TYPE_PRESENTABLE_IMAGE_MEMORY:
+        case VK_OBJECT_TYPE_PRESENTABLE_IMAGE_MEMORY:
             return "PRESENTABLE_IMAGE_MEMORY";
         default:
             return "UNKNOWN";
@@ -167,15 +167,15 @@ static const char* string_XGL_OBJECT_TYPE(XGL_OBJECT_TYPE type) {
 
 typedef struct _OBJTRACK_NODE {
     void            *pObj;
-    XGL_OBJECT_TYPE objType;
+    VK_OBJECT_TYPE objType;
     uint64_t        numUses;
     OBJECT_STATUS   status;
 } OBJTRACK_NODE;
 
 // prototype for extension functions
-uint64_t objTrackGetObjectCount(XGL_OBJECT_TYPE type);
-XGL_RESULT objTrackGetObjects(XGL_OBJECT_TYPE type, uint64_t objCount, OBJTRACK_NODE* pObjNodeArray);
+uint64_t objTrackGetObjectCount(VK_OBJECT_TYPE type);
+VK_RESULT objTrackGetObjects(VK_OBJECT_TYPE type, uint64_t objCount, OBJTRACK_NODE* pObjNodeArray);
 
 // Func ptr typedefs
-typedef uint64_t (*OBJ_TRACK_GET_OBJECT_COUNT)(XGL_OBJECT_TYPE);
-typedef XGL_RESULT (*OBJ_TRACK_GET_OBJECTS)(XGL_OBJECT_TYPE, uint64_t, OBJTRACK_NODE*);
+typedef uint64_t (*OBJ_TRACK_GET_OBJECT_COUNT)(VK_OBJECT_TYPE);
+typedef VK_RESULT (*OBJ_TRACK_GET_OBJECTS)(VK_OBJECT_TYPE, uint64_t, OBJTRACK_NODE*);