commit 95e6dba42bec7fb5786bbe9254bb7aa78d8a85fd
author Courtney Goeltzenleuchter <courtneygo@google.com> Wed Nov 25 11:38:54 2015 -0700
committer Jon Ashburn <jon@lunarg.com> Tue Dec 15 09:04:00 2015 -0700
tree b5283141b9f3427bac5e30da42e2fc90144d8519
parent f8fe1288185e8721a9c2da2143259fad4c77eda1

layers: rename VkDbgObjectType

VkDebugReportObjectTypeLUNARG fits the extension naming requirements

icd/intel/compiler/shader/standalone_utils.c

diff --git a/icd/intel/compiler/shader/standalone_utils.c b/icd/intel/compiler/shader/standalone_utils.c
index 6973529..44a4583 100644
--- a/icd/intel/compiler/shader/standalone_utils.c
+++ b/icd/intel/compiler/shader/standalone_utils.c
@@ -53,7 +53,7 @@
 
 void intel_logv(const void *handle,
                 VkFlags msg_flags,
-                VkDbgObjectType obj_type, uint64_t src_object,
+                VkDebugReportObjectTypeLUNARG obj_type, uint64_t src_object,
                 size_t location, int32_t msg_code,
                 const char *format, va_list ap)
 {

icd/intel/instance.c

diff --git a/icd/intel/instance.c b/icd/intel/instance.c
index 2cce88c..34e3d7d 100644
--- a/icd/intel/instance.c
+++ b/icd/intel/instance.c
@@ -49,7 +49,7 @@
 
 void intel_logv(const void *handle,
                 VkFlags msg_flags,
-                VkDbgObjectType obj_type, uint64_t src_object,
+                VkDebugReportObjectTypeLUNARG obj_type, uint64_t src_object,
                 size_t location, int32_t msg_code,
                 const char *format, va_list ap)
 {

icd/intel/intel.h

diff --git a/icd/intel/intel.h b/icd/intel/intel.h
index b9c9f7b..708a1df 100644
--- a/icd/intel/intel.h
+++ b/icd/intel/intel.h
@@ -88,7 +88,7 @@
 static const uint32_t intel_handle_magic = 0x494e544c;
 
 static inline void intel_handle_init(struct intel_handle *handle,
-                                     VkDbgObjectType type,
+                                     VkDebugReportObjectTypeLUNARG type,
                                      const struct intel_instance *instance)
 {
     set_loader_magic_value((void *)handle);
@@ -118,7 +118,7 @@
  * \see intel_handle_validate().
  */
 static inline bool intel_handle_validate_type(const void *handle,
-                                              VkDbgObjectType type)
+                                              VkDebugReportObjectTypeLUNARG type)
 {
     const uint32_t handle_type =
         ((const struct intel_handle *) handle)->magic - intel_handle_magic;
@@ -134,13 +134,13 @@
 
 void intel_logv(const void *handle,
                 VkFlags msg_flags,
-                VkDbgObjectType obj_type, uint64_t src_object,
+                VkDebugReportObjectTypeLUNARG obj_type, uint64_t src_object,
                 size_t location, int32_t msg_code,
                 const char *format, va_list ap);
 
 static inline void intel_log(const void *handle,
                              VkFlags msg_flags,
-                             VkDbgObjectType obj_type, uint64_t src_object,
+                             VkDebugReportObjectTypeLUNARG obj_type, uint64_t src_object,
                              size_t location, int32_t msg_code,
                              const char *format, ...)
 {

icd/intel/obj.c

diff --git a/icd/intel/obj.c b/icd/intel/obj.c
index 0abd077..a8ea85d 100644
--- a/icd/intel/obj.c
+++ b/icd/intel/obj.c
@@ -225,7 +225,7 @@
  * size is allocated and zeroed.
  */
 struct intel_base_dbg *intel_base_dbg_create(const struct intel_handle *handle,
-                                             VkDbgObjectType type,
+                                             VkDebugReportObjectTypeLUNARG type,
                                              const void *create_info,
                                              size_t dbg_size)
 {
@@ -270,7 +270,7 @@
  */
 struct intel_base *intel_base_create(const struct intel_handle *handle,
                                      size_t obj_size, bool debug,
-                                     VkDbgObjectType type,
+                                     VkDebugReportObjectTypeLUNARG type,
                                      const void *create_info,
                                      size_t dbg_size)
 {

icd/intel/obj.h

diff --git a/icd/intel/obj.h b/icd/intel/obj.h
index 4293392..129c51b 100644
--- a/icd/intel/obj.h
+++ b/icd/intel/obj.h
@@ -34,7 +34,7 @@
 struct intel_mem;
 
 struct intel_base_dbg {
-    VkDbgObjectType type;
+    VkDebugReportObjectTypeLUNARG type;
 
     void *create_info;
     size_t create_info_size;
@@ -83,7 +83,7 @@
 VkResult intel_base_get_memory_requirements(struct intel_base *base, VkMemoryRequirements *data);
 
 struct intel_base_dbg *intel_base_dbg_create(const struct intel_handle *handle,
-                                             VkDbgObjectType type,
+                                             VkDebugReportObjectTypeLUNARG type,
                                              const void *create_info,
                                              size_t dbg_size);
 void intel_base_dbg_destroy(const struct intel_handle *handle,
@@ -91,7 +91,7 @@
 
 struct intel_base *intel_base_create(const struct intel_handle *handle,
                                      size_t obj_size, bool debug,
-                                     VkDbgObjectType type,
+                                     VkDebugReportObjectTypeLUNARG type,
                                      const void *create_info,
                                      size_t dbg_size);
 void intel_base_destroy(struct intel_base *base);