debug_report: rename object type and error bits

Conflicts:
	demos/tri.c
	layers/device_limits.cpp
	layers/draw_state.cpp
	layers/image.cpp
	layers/mem_tracker.cpp
	layers/param_checker.cpp
	layers/vk_layer_logging.h
	loader/debug_report.c
	tests/layer_validation_tests.cpp

6 files changed, 35 insertions, 35 deletions

diff --git a/icd/common/icd-enumerate-drm.c b/icd/common/icd-enumerate-drm.c
index 7c3769ec..857088b4 100644
--- a/icd/common/icd-enumerate-drm.c
+++ b/icd/common/icd-enumerate-drm.c
@@ -150,7 +150,7 @@ struct icd_drm_device *icd_drm_enumerate(const struct icd_instance *instance,
 
     udev = udev_new();
     if (udev == NULL) {
-        icd_instance_log(instance, VK_DEBUG_REPORT_ERROR_BIT,
+        icd_instance_log(instance, VK_DEBUG_REPORT_ERROR_BIT_EXT,
                          0, VK_NULL_HANDLE,     /* obj_type, object */
                          0, 0,                  /* location, msg_code */
                          "failed to initialize udev context");
@@ -160,7 +160,7 @@ struct icd_drm_device *icd_drm_enumerate(const struct icd_instance *instance,
 
     e = udev_enumerate_new(udev);
     if (e == NULL) {
-        icd_instance_log(instance, VK_DEBUG_REPORT_ERROR_BIT,
+        icd_instance_log(instance, VK_DEBUG_REPORT_ERROR_BIT_EXT,
                          0, VK_NULL_HANDLE,     /* obj_type, object */
                          0, 0,                  /* location, msg_code */
                          "failed to initialize udev enumerate context");
diff --git a/icd/common/icd-instance.c b/icd/common/icd-instance.c
index 6b674a0e..0219a771 100644
--- a/icd/common/icd-instance.c
+++ b/icd/common/icd-instance.c
@@ -119,9 +119,9 @@ void icd_instance_destroy(struct icd_instance *instance)
 
 VkResult icd_instance_create_logger(
         struct icd_instance *instance,
-        VkDebugReportCallbackCreateInfoLUNARG *pCreateInfo,
+        const VkDebugReportCallbackCreateInfoEXT *pCreateInfo,
         const VkAllocationCallbacks *pAllocator,
-        VkDebugReportCallbackLUNARG *msg_obj)
+        VkDebugReportCallbackEXT *msg_obj)
 {
     struct icd_instance_logger *logger;
 
@@ -149,11 +149,11 @@ VkResult icd_instance_create_logger(
 
 void icd_instance_destroy_logger(
         struct icd_instance *instance,
-        const VkDebugReportCallbackLUNARG msg_obj,
+        const VkDebugReportCallbackEXT msg_obj,
         const VkAllocationCallbacks *pAllocator)
 {
     struct icd_instance_logger *logger, *prev;
-    VkDebugReportCallbackLUNARG local_msg_obj = msg_obj;
+    VkDebugReportCallbackEXT local_msg_obj = msg_obj;
 
     for (prev = NULL, logger = instance->loggers; logger;
          prev = logger, logger = logger->next) {
@@ -175,7 +175,7 @@ void icd_instance_destroy_logger(
 
 void icd_instance_log(const struct icd_instance *instance,
                       VkFlags msg_flags,
-                      VkDebugReportObjectTypeLUNARG obj_type,
+                      VkDebugReportObjectTypeEXT obj_type,
                       uint64_t src_object,
                       size_t location,
                       int32_t msg_code,
diff --git a/icd/common/icd-instance.h b/icd/common/icd-instance.h
index d9cb847c..f94006ac 100644
--- a/icd/common/icd-instance.h
+++ b/icd/common/icd-instance.h
@@ -35,7 +35,7 @@ extern "C" {
 #endif
 
 struct icd_instance_logger {
-    PFN_vkDebugReportCallbackLUNARG func;
+    PFN_vkDebugReportCallbackEXT func;
     const void *user_data;
     VkFlags flags;
 
@@ -69,16 +69,16 @@ static inline void icd_instance_free(const struct icd_instance *instance,
 }
 
 VkResult icd_instance_create_logger(struct icd_instance *instance,
-        VkDebugReportCallbackCreateInfoLUNARG *pCreateInfo,
+        const VkDebugReportCallbackCreateInfoEXT *pCreateInfo,
         const VkAllocationCallbacks *pAllocator,
-        VkDebugReportCallbackLUNARG *msg_obj);
+        VkDebugReportCallbackEXT *msg_obj);
 
 void icd_instance_destroy_logger(struct icd_instance *instance,
-        const VkDebugReportCallbackLUNARG msg_obj, const VkAllocationCallbacks *pAllocator);
+        const VkDebugReportCallbackEXT msg_obj, const VkAllocationCallbacks *pAllocator);
 
 void icd_instance_log(const struct icd_instance *instance,
                       VkFlags msg_flags,
-                      VkDebugReportObjectTypeLUNARG obj_type,
+                      VkDebugReportObjectTypeEXT obj_type,
                       uint64_t src_object,
                       size_t location, int32_t msg_code,
                       const char *msg);
diff --git a/icd/common/icd.h b/icd/common/icd.h
index 6b439924..ba55bf77 100644
--- a/icd/common/icd.h
+++ b/icd/common/icd.h
@@ -32,7 +32,7 @@
 
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_platform.h>
-#include <vulkan/vk_lunarg_debug_report.h>
+#include <vulkan/vk_ext_debug_report.h>
 #include "vulkan/vk_sdk_platform.h"
 
 #if defined(__GNUC__) && __GNUC__ >= 4
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index a692cb49..8faa8189 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -64,7 +64,7 @@ static struct nulldrv_base *nulldrv_base(void* base)
 static struct nulldrv_base *nulldrv_base_create(
         struct nulldrv_dev *dev,
         size_t obj_size,
-        VkDebugReportObjectTypeLUNARG type)
+        VkDebugReportObjectTypeEXT type)
 {
     struct nulldrv_base *base;
 
@@ -121,7 +121,7 @@ static VkResult nulldrv_queue_create(struct nulldrv_dev *dev,
     struct nulldrv_queue *queue;
 
     queue = (struct nulldrv_queue *) nulldrv_base_create(dev, sizeof(*queue),
-            VK_OBJECT_TYPE_QUEUE);
+            VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT);
     if (!queue)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -199,7 +199,7 @@ static VkResult nulldrv_dev_create(struct nulldrv_gpu *gpu,
     VkResult ret;
 
     dev = (struct nulldrv_dev *) nulldrv_base_create(NULL, sizeof(*dev),
-            VK_OBJECT_TYPE_DEVICE);
+            VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT);
     if (!dev)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -242,7 +242,7 @@ static VkResult nulldrv_fence_create(struct nulldrv_dev *dev,
     struct nulldrv_fence *fence;
 
     fence = (struct nulldrv_fence *) nulldrv_base_create(dev, sizeof(*fence),
-            VK_OBJECT_TYPE_FENCE);
+            VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT);
     if (!fence)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -282,7 +282,7 @@ static VkResult nulldrv_img_create(struct nulldrv_dev *dev,
     struct nulldrv_img *img;
 
     img = (struct nulldrv_img *) nulldrv_base_create(dev, sizeof(*img),
-            VK_OBJECT_TYPE_IMAGE);
+            VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT);
     if (!img)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -312,7 +312,7 @@ static VkResult nulldrv_mem_alloc(struct nulldrv_dev *dev,
     struct nulldrv_mem *mem;
 
     mem = (struct nulldrv_mem *) nulldrv_base_create(dev, sizeof(*mem),
-            VK_OBJECT_TYPE_DEVICE_MEMORY);
+            VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT);
     if (!mem)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -335,7 +335,7 @@ static VkResult nulldrv_sampler_create(struct nulldrv_dev *dev,
     struct nulldrv_sampler *sampler;
 
     sampler = (struct nulldrv_sampler *) nulldrv_base_create(dev,
-            sizeof(*sampler), VK_OBJECT_TYPE_SAMPLER);
+            sizeof(*sampler), VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT);
     if (!sampler)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -352,7 +352,7 @@ static VkResult nulldrv_img_view_create(struct nulldrv_dev *dev,
     struct nulldrv_img_view *view;
 
     view = (struct nulldrv_img_view *) nulldrv_base_create(dev, sizeof(*view),
-            VK_OBJECT_TYPE_IMAGE_VIEW);
+            VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT);
     if (!view)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -401,7 +401,7 @@ static VkResult nulldrv_buf_create(struct nulldrv_dev *dev,
     struct nulldrv_buf *buf;
 
     buf = (struct nulldrv_buf *) nulldrv_base_create(dev, sizeof(*buf),
-            VK_OBJECT_TYPE_BUFFER);
+            VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT);
     if (!buf)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -423,7 +423,7 @@ static VkResult nulldrv_desc_layout_create(struct nulldrv_dev *dev,
 
     layout = (struct nulldrv_desc_layout *)
         nulldrv_base_create(dev, sizeof(*layout),
-                VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT);
+                VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT);
     if (!layout)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -440,7 +440,7 @@ static VkResult nulldrv_pipeline_layout_create(struct nulldrv_dev *dev,
 
     pipeline_layout = (struct nulldrv_pipeline_layout *)
         nulldrv_base_create(dev, sizeof(*pipeline_layout),
-                VK_OBJECT_TYPE_PIPELINE_LAYOUT);
+                VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT);
     if (!pipeline_layout)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -462,7 +462,7 @@ static VkResult graphics_pipeline_create(struct nulldrv_dev *dev,
 
     pipeline = (struct nulldrv_pipeline *)
         nulldrv_base_create(dev, sizeof(*pipeline), 
-                VK_OBJECT_TYPE_PIPELINE);
+                VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT);
     if (!pipeline)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -480,7 +480,7 @@ static VkResult nulldrv_cmd_create(struct nulldrv_dev *dev,
 
     for (uint32_t i = 0; i < info->bufferCount; i++) {
         cmd = (struct nulldrv_cmd *) nulldrv_base_create(dev, sizeof(*cmd),
-                VK_OBJECT_TYPE_COMMAND_BUFFER);
+                VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT);
         if (!cmd) {
             for (uint32_t j = 0; j < num_allocated; j++) {
                 free(cmd_ret[j]);
@@ -502,7 +502,7 @@ static VkResult nulldrv_desc_pool_create(struct nulldrv_dev *dev,
 
     pool = (struct nulldrv_desc_pool *)
         nulldrv_base_create(dev, sizeof(*pool),
-                VK_OBJECT_TYPE_DESCRIPTOR_POOL);
+                VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT);
     if (!pool)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -522,7 +522,7 @@ static VkResult nulldrv_desc_set_create(struct nulldrv_dev *dev,
 
     set = (struct nulldrv_desc_set *)
         nulldrv_base_create(dev, sizeof(*set), 
-                VK_OBJECT_TYPE_DESCRIPTOR_SET);
+                VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT);
     if (!set)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -545,7 +545,7 @@ static VkResult nulldrv_fb_create(struct nulldrv_dev *dev,
 
     struct nulldrv_framebuffer *fb;
     fb = (struct nulldrv_framebuffer *) nulldrv_base_create(dev, sizeof(*fb),
-            VK_OBJECT_TYPE_FRAMEBUFFER);
+            VK_DEBUG_REPORT_OBJECT_TYPE_FRAMEBUFFER_EXT);
     if (!fb)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -561,7 +561,7 @@ static VkResult nulldrv_render_pass_create(struct nulldrv_dev *dev,
 {
     struct nulldrv_render_pass *rp;
     rp = (struct nulldrv_render_pass *) nulldrv_base_create(dev, sizeof(*rp),
-            VK_OBJECT_TYPE_RENDER_PASS);
+            VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT);
     if (!rp)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -583,7 +583,7 @@ static VkResult nulldrv_buf_view_create(struct nulldrv_dev *dev,
     struct nulldrv_buf_view *view;
 
     view = (struct nulldrv_buf_view *) nulldrv_base_create(dev, sizeof(*view),
-            VK_OBJECT_TYPE_BUFFER_VIEW);
+            VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT);
     if (!view)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -761,7 +761,7 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(
     struct nulldrv_swap_chain *sc;
 
     sc = (struct nulldrv_swap_chain *) nulldrv_base_create(dev, sizeof(*sc),
-            VK_OBJECT_TYPE_SWAPCHAIN_KHR);
+            VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT);
     if (!sc) {
         return VK_ERROR_OUT_OF_HOST_MEMORY;
     }
@@ -802,7 +802,7 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR(
 
                 img = (struct nulldrv_img *) nulldrv_base_create(dev,
                         sizeof(*img),
-                        VK_OBJECT_TYPE_IMAGE);
+                        VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT);
                 if (!img)
                     return VK_ERROR_OUT_OF_HOST_MEMORY;
             pSwapchainImages[i] = (VkImage) img;
@@ -1559,7 +1559,7 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(
     struct nulldrv_instance *inst;
 
     inst = (struct nulldrv_instance *) nulldrv_base_create(NULL, sizeof(*inst),
-                VK_OBJECT_TYPE_INSTANCE);
+                VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT);
     if (!inst)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
diff --git a/icd/nulldrv/nulldrv.h b/icd/nulldrv/nulldrv.h
index 768d7848..d2d71bea 100644
--- a/icd/nulldrv/nulldrv.h
+++ b/icd/nulldrv/nulldrv.h
@@ -33,7 +33,7 @@
 #include <assert.h>
 
 #include <vulkan/vulkan.h>
-#include <vulkan/vk_lunarg_debug_report.h>
+#include <vulkan/vk_ext_debug_report.h>
 #include <vulkan/vk_icd.h>
 
 #include "icd.h"