commit bfd2c6693cd6c5ffe81cdfec72761c5b0f79d36c
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Jun 01 14:46:33 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Jun 18 10:18:19 2015 -0600
tree 81f2f5fc440dd9bfcc0dfa91aeaf8307371d88a1
parent 500b89b181970029d1e4f198ef8f6add323bc397

shader_checker: Use DEBUG_REPORT helper functions

Include and use DEBUG_REPORT layer helper functions
for create, destroy and GetInstanceProcAddr.

layers/shader_checker.cpp

diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index 5b66c63..20f1aae 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -939,6 +939,26 @@
     return res;
 }
 
+VkResult VKAPI vkCreateInstance(
+    const VkInstanceCreateInfo*                 pCreateInfo,
+    VkInstance*                                 pInstance)
+{
+
+    loader_platform_thread_once(&g_initOnce, initLayer);
+    /*
+     * For layers, the pInstance has already been filled out
+     * by the loader so that dispatch table is available.
+     */
+    VkLayerInstanceDispatchTable *pTable = initLayerInstanceTable((const VkBaseLayerObject *) (*pInstance));
+
+    VkResult result = pTable->CreateInstance(pCreateInfo, pInstance);
+
+    if (result == VK_SUCCESS) {
+        enable_debug_report(pCreateInfo->extensionCount, pCreateInfo->pEnabledExtensions);
+    }
+    return result;
+}
+
 /* hook DestroyInstance to remove tableInstanceMap entry */
 VK_LAYER_EXPORT VkResult VKAPI vkDestroyInstance(VkInstance instance)
 {
@@ -948,6 +968,25 @@
     return res;
 }
 
+VK_LAYER_EXPORT VkResult VKAPI vkDbgCreateMsgCallback(
+        VkInstance instance,
+        VkFlags msgFlags,
+        const PFN_vkDbgMsgCallback pfnMsgCallback,
+        void* pUserData,
+        VkDbgMsgCallback* pMsgCallback)
+{
+    VkLayerInstanceDispatchTable *pTable = tableInstanceMap[(VkBaseLayerObject *)instance];
+    return layer_create_msg_callback(instance, pTable, msgFlags, pfnMsgCallback, pUserData, pMsgCallback);
+}
+
+VK_LAYER_EXPORT VkResult VKAPI vkDbgDestroyMsgCallback(
+        VkInstance instance,
+        VkDbgMsgCallback msgCallback)
+{
+    VkLayerInstanceDispatchTable *pTable = tableInstanceMap[(VkBaseLayerObject *)instance];
+    return layer_destroy_msg_callback(instance, pTable, msgCallback);
+}
+
 VK_LAYER_EXPORT void * VKAPI vkGetDeviceProcAddr(VkDevice device, const char* pName)
 {
     if (device == NULL)
@@ -978,6 +1017,8 @@
 
 VK_LAYER_EXPORT void * VKAPI vkGetInstanceProcAddr(VkInstance inst, const char* pName)
 {
+    void *fptr;
+
     if (inst == NULL)
         return NULL;
 
@@ -991,10 +1032,15 @@
     if (!strncmp(#fn, pName, sizeof(#fn))) \
         return (void *) fn
 
+    ADD_HOOK(vkCreateInstance);
     ADD_HOOK(vkDestroyInstance);
     ADD_HOOK(vkGetGlobalExtensionInfo);
 #undef ADD_HOOK
 
+    fptr = msg_callback_get_proc_addr(pName);
+    if (fptr)
+        return fptr;
+
     VkLayerInstanceDispatchTable* pTable = tableInstanceMap[(VkBaseLayerObject *) inst];
     if (pTable->GetInstanceProcAddr == NULL)
         return NULL;