From daa89b7ba150d34588fb10bd0e05464ddcb9c64f Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Fri, 3 Jul 2015 09:42:57 -0600 Subject: include: Rename vkLayer.h -> vk_layer.h and vkIcd.h -> vk_icd.h --- icd/nulldrv/nulldrv.h | 2 +- include/vkIcd.h | 32 ------- include/vkLayer.h | 181 ---------------------------------------- include/vk_debug_marker_layer.h | 2 +- include/vk_icd.h | 32 +++++++ include/vk_layer.h | 181 ++++++++++++++++++++++++++++++++++++++++ layers/basic.cpp | 2 +- layers/draw_state.h | 2 +- layers/image.cpp | 2 +- layers/layer_logging.h | 2 +- layers/layers_config.cpp | 2 +- layers/layers_msg.h | 2 +- layers/layers_table.cpp | 2 +- layers/mem_tracker.h | 2 +- layers/multi.cpp | 2 +- layers/object_track.h | 2 +- layers/param_checker.cpp | 2 +- layers/shader_checker.cpp | 2 +- layers/shader_checker.h | 2 +- loader/debug_report.c | 2 +- loader/loader.c | 2 +- loader/loader.h | 4 +- loader/table_ops.h | 2 +- vk-generate.py | 2 +- vk-layer-generate.py | 8 +- 25 files changed, 238 insertions(+), 238 deletions(-) delete mode 100644 include/vkIcd.h delete mode 100644 include/vkLayer.h create mode 100644 include/vk_icd.h create mode 100644 include/vk_layer.h diff --git a/icd/nulldrv/nulldrv.h b/icd/nulldrv/nulldrv.h index 6f3158c2..9931b391 100644 --- a/icd/nulldrv/nulldrv.h +++ b/icd/nulldrv/nulldrv.h @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include "icd.h" diff --git a/include/vkIcd.h b/include/vkIcd.h deleted file mode 100644 index 8f1bfdb7..00000000 --- a/include/vkIcd.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef VKICD_H -#define VKICD_H - -#include -#include -#include "vk_platform.h" - -/* - * The ICD must reserve space for a pointer for the loader's dispatch - * table, at the start of . - * The ICD must initialize this variable using the SET_LOADER_MAGIC_VALUE macro. - */ - -#define ICD_LOADER_MAGIC 0x01CDC0DE - -typedef union _VK_LOADER_DATA { - uint32_t loaderMagic; - void *loaderData; -} VK_LOADER_DATA; - -static inline void set_loader_magic_value(VkObject pNewObject) { - VK_LOADER_DATA *loader_info = (VK_LOADER_DATA *) pNewObject; - loader_info->loaderMagic = ICD_LOADER_MAGIC; -} - -static inline bool valid_loader_magic_value(VkObject pNewObject) { - const VK_LOADER_DATA *loader_info = (VK_LOADER_DATA *) pNewObject; - return loader_info->loaderMagic == ICD_LOADER_MAGIC; -} - -#endif // VKICD_H - diff --git a/include/vkLayer.h b/include/vkLayer.h deleted file mode 100644 index 85c41d6e..00000000 --- a/include/vkLayer.h +++ /dev/null @@ -1,181 +0,0 @@ -/* Need to define dispatch table - * Core struct can then have ptr to dispatch table at the top - * Along with object ptrs for current and next OBJ - */ -#pragma once - -#include "vulkan.h" -#include "vk_debug_report_lunarg.h" -#include "vk_debug_marker_lunarg.h" -#include "vk_wsi_lunarg.h" -#include "vk_wsi_lunarg.h" -#if defined(__GNUC__) && __GNUC__ >= 4 -# define VK_LAYER_EXPORT __attribute__((visibility("default"))) -#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) -# define VK_LAYER_EXPORT __attribute__((visibility("default"))) -#else -# define VK_LAYER_EXPORT -#endif - -typedef void * (*PFN_vkGPA)(VkObject obj, const char * pName); -typedef struct VkBaseLayerObject_ -{ - PFN_vkGPA pGPA; - VkObject nextObject; - VkObject baseObject; -} VkBaseLayerObject; - -typedef struct VkLayerDispatchTable_ -{ - PFN_vkGetDeviceProcAddr GetDeviceProcAddr; - PFN_vkCreateDevice CreateDevice; - PFN_vkDestroyDevice DestroyDevice; - PFN_vkGetDeviceQueue GetDeviceQueue; - PFN_vkQueueSubmit QueueSubmit; - PFN_vkQueueWaitIdle QueueWaitIdle; - PFN_vkDeviceWaitIdle DeviceWaitIdle; - PFN_vkAllocMemory AllocMemory; - PFN_vkFreeMemory FreeMemory; - PFN_vkMapMemory MapMemory; - PFN_vkUnmapMemory UnmapMemory; - PFN_vkFlushMappedMemoryRanges FlushMappedMemoryRanges; - PFN_vkInvalidateMappedMemoryRanges InvalidateMappedMemoryRanges; - PFN_vkDestroyObject DestroyObject; - PFN_vkGetObjectMemoryRequirements GetObjectMemoryRequirements; - PFN_vkBindObjectMemory BindObjectMemory; - PFN_vkQueueBindSparseBufferMemory QueueBindSparseBufferMemory; - PFN_vkQueueBindSparseImageMemory QueueBindSparseImageMemory; - PFN_vkCreateFence CreateFence; - PFN_vkGetFenceStatus GetFenceStatus; - PFN_vkResetFences ResetFences; - PFN_vkWaitForFences WaitForFences; - PFN_vkCreateSemaphore CreateSemaphore; - PFN_vkQueueSignalSemaphore QueueSignalSemaphore; - PFN_vkQueueWaitSemaphore QueueWaitSemaphore; - PFN_vkCreateEvent CreateEvent; - PFN_vkGetEventStatus GetEventStatus; - PFN_vkSetEvent SetEvent; - PFN_vkResetEvent ResetEvent; - PFN_vkCreateQueryPool CreateQueryPool; - PFN_vkGetQueryPoolResults GetQueryPoolResults; - PFN_vkCreateBuffer CreateBuffer; - PFN_vkCreateBufferView CreateBufferView; - PFN_vkCreateImage CreateImage; - PFN_vkGetImageSubresourceLayout GetImageSubresourceLayout; - PFN_vkCreateImageView CreateImageView; - PFN_vkCreateColorAttachmentView CreateColorAttachmentView; - PFN_vkCreateDepthStencilView CreateDepthStencilView; - PFN_vkCreateShaderModule CreateShaderModule; - PFN_vkCreateShader CreateShader; - PFN_vkCreateGraphicsPipeline CreateGraphicsPipeline; - PFN_vkCreateGraphicsPipelineDerivative CreateGraphicsPipelineDerivative; - PFN_vkCreateComputePipeline CreateComputePipeline; - PFN_vkStorePipeline StorePipeline; - PFN_vkLoadPipeline LoadPipeline; - PFN_vkLoadPipelineDerivative LoadPipelineDerivative; - PFN_vkCreatePipelineLayout CreatePipelineLayout; - PFN_vkCreateSampler CreateSampler; - PFN_vkCreateDescriptorSetLayout CreateDescriptorSetLayout; - PFN_vkCreateDescriptorPool CreateDescriptorPool; - PFN_vkResetDescriptorPool ResetDescriptorPool; - PFN_vkAllocDescriptorSets AllocDescriptorSets; - PFN_vkUpdateDescriptorSets UpdateDescriptorSets; - PFN_vkCreateDynamicViewportState CreateDynamicViewportState; - PFN_vkCreateDynamicRasterState CreateDynamicRasterState; - PFN_vkCreateDynamicColorBlendState CreateDynamicColorBlendState; - PFN_vkCreateDynamicDepthStencilState CreateDynamicDepthStencilState; - PFN_vkCreateCommandBuffer CreateCommandBuffer; - PFN_vkBeginCommandBuffer BeginCommandBuffer; - PFN_vkEndCommandBuffer EndCommandBuffer; - PFN_vkResetCommandBuffer ResetCommandBuffer; - PFN_vkCmdBindPipeline CmdBindPipeline; - PFN_vkCmdBindDynamicStateObject CmdBindDynamicStateObject; - PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets; - PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers; - PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer; - PFN_vkCmdDraw CmdDraw; - PFN_vkCmdDrawIndexed CmdDrawIndexed; - PFN_vkCmdDrawIndirect CmdDrawIndirect; - PFN_vkCmdDrawIndexedIndirect CmdDrawIndexedIndirect; - PFN_vkCmdDispatch CmdDispatch; - PFN_vkCmdDispatchIndirect CmdDispatchIndirect; - PFN_vkCmdCopyBuffer CmdCopyBuffer; - PFN_vkCmdCopyImage CmdCopyImage; - PFN_vkCmdBlitImage CmdBlitImage; - PFN_vkCmdCopyBufferToImage CmdCopyBufferToImage; - PFN_vkCmdCopyImageToBuffer CmdCopyImageToBuffer; - PFN_vkCmdUpdateBuffer CmdUpdateBuffer; - PFN_vkCmdFillBuffer CmdFillBuffer; - PFN_vkCmdClearColorImage CmdClearColorImage; - PFN_vkCmdClearDepthStencilImage CmdClearDepthStencilImage; - PFN_vkCmdClearColorAttachment CmdClearColorAttachment; - PFN_vkCmdClearDepthStencilAttachment CmdClearDepthStencilAttachment; - PFN_vkCmdResolveImage CmdResolveImage; - PFN_vkCmdSetEvent CmdSetEvent; - PFN_vkCmdResetEvent CmdResetEvent; - PFN_vkCmdWaitEvents CmdWaitEvents; - PFN_vkCmdPipelineBarrier CmdPipelineBarrier; - PFN_vkCmdBeginQuery CmdBeginQuery; - PFN_vkCmdEndQuery CmdEndQuery; - PFN_vkCmdResetQueryPool CmdResetQueryPool; - PFN_vkCmdWriteTimestamp CmdWriteTimestamp; - PFN_vkCmdCopyQueryPoolResults CmdCopyQueryPoolResults; - PFN_vkCreateFramebuffer CreateFramebuffer; - PFN_vkCreateRenderPass CreateRenderPass; - PFN_vkCmdBeginRenderPass CmdBeginRenderPass; - PFN_vkCmdEndRenderPass CmdEndRenderPass; - PFN_vkCmdExecuteCommands CmdExecuteCommands; - PFN_vkCreateSwapChainWSI CreateSwapChainWSI; - PFN_vkDestroySwapChainWSI DestroySwapChainWSI; - PFN_vkGetSwapChainInfoWSI GetSwapChainInfoWSI; - PFN_vkQueuePresentWSI QueuePresentWSI; - PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; - PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; - PFN_vkDbgStringCallback DbgStringCallback; - PFN_vkDbgStdioCallback DbgStdioCallback; - PFN_vkDbgBreakCallback DbgBreakCallback; -} VkLayerDispatchTable; - -typedef struct VkLayerInstanceDispatchTable_ -{ - PFN_vkGetInstanceProcAddr GetInstanceProcAddr; - PFN_vkCreateInstance CreateInstance; - PFN_vkDestroyInstance DestroyInstance; - PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices; - PFN_vkGetPhysicalDeviceFeatures GetPhysicalDeviceFeatures; - PFN_vkGetPhysicalDeviceFormatInfo GetPhysicalDeviceFormatInfo; - PFN_vkGetPhysicalDeviceLimits GetPhysicalDeviceLimits; - PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties; - PFN_vkGetPhysicalDevicePerformance GetPhysicalDevicePerformance; - PFN_vkGetPhysicalDeviceQueueCount GetPhysicalDeviceQueueCount; - PFN_vkGetPhysicalDeviceQueueProperties GetPhysicalDeviceQueueProperties; - PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties; - PFN_vkGetPhysicalDeviceExtensionCount GetPhysicalDeviceExtensionCount; - PFN_vkGetPhysicalDeviceExtensionProperties GetPhysicalDeviceExtensionProperties; - PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; - PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; - PFN_vkDbgStringCallback DbgStringCallback; - PFN_vkDbgStdioCallback DbgStdioCallback; - PFN_vkDbgBreakCallback DbgBreakCallback; -} VkLayerInstanceDispatchTable; - -// LL node for tree of dbg callback functions -typedef struct VkLayerDbgFunctionNode_ -{ - VkDbgMsgCallback msgCallback; - PFN_vkDbgMsgCallback pfnMsgCallback; - VkFlags msgFlags; - const void *pUserData; - struct VkLayerDbgFunctionNode_ *pNext; -} VkLayerDbgFunctionNode; - -typedef enum VkLayerDbgAction_ -{ - VK_DBG_LAYER_ACTION_IGNORE = 0x0, - VK_DBG_LAYER_ACTION_CALLBACK = 0x1, - VK_DBG_LAYER_ACTION_LOG_MSG = 0x2, - VK_DBG_LAYER_ACTION_BREAK = 0x4 -} VkLayerDbgAction; - -// ------------------------------------------------------------------------------------------------ -// API functions diff --git a/include/vk_debug_marker_layer.h b/include/vk_debug_marker_layer.h index 6de0ebf8..d9b1d7da 100644 --- a/include/vk_debug_marker_layer.h +++ b/include/vk_debug_marker_layer.h @@ -32,7 +32,7 @@ #include "vulkan.h" #include "vk_debug_marker_lunarg.h" -#include "vkLayer.h" +#include "vk_layer.h" typedef struct VkLayerDebugMarkerDispatchTable_ diff --git a/include/vk_icd.h b/include/vk_icd.h new file mode 100644 index 00000000..8f1bfdb7 --- /dev/null +++ b/include/vk_icd.h @@ -0,0 +1,32 @@ +#ifndef VKICD_H +#define VKICD_H + +#include +#include +#include "vk_platform.h" + +/* + * The ICD must reserve space for a pointer for the loader's dispatch + * table, at the start of . + * The ICD must initialize this variable using the SET_LOADER_MAGIC_VALUE macro. + */ + +#define ICD_LOADER_MAGIC 0x01CDC0DE + +typedef union _VK_LOADER_DATA { + uint32_t loaderMagic; + void *loaderData; +} VK_LOADER_DATA; + +static inline void set_loader_magic_value(VkObject pNewObject) { + VK_LOADER_DATA *loader_info = (VK_LOADER_DATA *) pNewObject; + loader_info->loaderMagic = ICD_LOADER_MAGIC; +} + +static inline bool valid_loader_magic_value(VkObject pNewObject) { + const VK_LOADER_DATA *loader_info = (VK_LOADER_DATA *) pNewObject; + return loader_info->loaderMagic == ICD_LOADER_MAGIC; +} + +#endif // VKICD_H + diff --git a/include/vk_layer.h b/include/vk_layer.h new file mode 100644 index 00000000..85c41d6e --- /dev/null +++ b/include/vk_layer.h @@ -0,0 +1,181 @@ +/* Need to define dispatch table + * Core struct can then have ptr to dispatch table at the top + * Along with object ptrs for current and next OBJ + */ +#pragma once + +#include "vulkan.h" +#include "vk_debug_report_lunarg.h" +#include "vk_debug_marker_lunarg.h" +#include "vk_wsi_lunarg.h" +#include "vk_wsi_lunarg.h" +#if defined(__GNUC__) && __GNUC__ >= 4 +# define VK_LAYER_EXPORT __attribute__((visibility("default"))) +#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) +# define VK_LAYER_EXPORT __attribute__((visibility("default"))) +#else +# define VK_LAYER_EXPORT +#endif + +typedef void * (*PFN_vkGPA)(VkObject obj, const char * pName); +typedef struct VkBaseLayerObject_ +{ + PFN_vkGPA pGPA; + VkObject nextObject; + VkObject baseObject; +} VkBaseLayerObject; + +typedef struct VkLayerDispatchTable_ +{ + PFN_vkGetDeviceProcAddr GetDeviceProcAddr; + PFN_vkCreateDevice CreateDevice; + PFN_vkDestroyDevice DestroyDevice; + PFN_vkGetDeviceQueue GetDeviceQueue; + PFN_vkQueueSubmit QueueSubmit; + PFN_vkQueueWaitIdle QueueWaitIdle; + PFN_vkDeviceWaitIdle DeviceWaitIdle; + PFN_vkAllocMemory AllocMemory; + PFN_vkFreeMemory FreeMemory; + PFN_vkMapMemory MapMemory; + PFN_vkUnmapMemory UnmapMemory; + PFN_vkFlushMappedMemoryRanges FlushMappedMemoryRanges; + PFN_vkInvalidateMappedMemoryRanges InvalidateMappedMemoryRanges; + PFN_vkDestroyObject DestroyObject; + PFN_vkGetObjectMemoryRequirements GetObjectMemoryRequirements; + PFN_vkBindObjectMemory BindObjectMemory; + PFN_vkQueueBindSparseBufferMemory QueueBindSparseBufferMemory; + PFN_vkQueueBindSparseImageMemory QueueBindSparseImageMemory; + PFN_vkCreateFence CreateFence; + PFN_vkGetFenceStatus GetFenceStatus; + PFN_vkResetFences ResetFences; + PFN_vkWaitForFences WaitForFences; + PFN_vkCreateSemaphore CreateSemaphore; + PFN_vkQueueSignalSemaphore QueueSignalSemaphore; + PFN_vkQueueWaitSemaphore QueueWaitSemaphore; + PFN_vkCreateEvent CreateEvent; + PFN_vkGetEventStatus GetEventStatus; + PFN_vkSetEvent SetEvent; + PFN_vkResetEvent ResetEvent; + PFN_vkCreateQueryPool CreateQueryPool; + PFN_vkGetQueryPoolResults GetQueryPoolResults; + PFN_vkCreateBuffer CreateBuffer; + PFN_vkCreateBufferView CreateBufferView; + PFN_vkCreateImage CreateImage; + PFN_vkGetImageSubresourceLayout GetImageSubresourceLayout; + PFN_vkCreateImageView CreateImageView; + PFN_vkCreateColorAttachmentView CreateColorAttachmentView; + PFN_vkCreateDepthStencilView CreateDepthStencilView; + PFN_vkCreateShaderModule CreateShaderModule; + PFN_vkCreateShader CreateShader; + PFN_vkCreateGraphicsPipeline CreateGraphicsPipeline; + PFN_vkCreateGraphicsPipelineDerivative CreateGraphicsPipelineDerivative; + PFN_vkCreateComputePipeline CreateComputePipeline; + PFN_vkStorePipeline StorePipeline; + PFN_vkLoadPipeline LoadPipeline; + PFN_vkLoadPipelineDerivative LoadPipelineDerivative; + PFN_vkCreatePipelineLayout CreatePipelineLayout; + PFN_vkCreateSampler CreateSampler; + PFN_vkCreateDescriptorSetLayout CreateDescriptorSetLayout; + PFN_vkCreateDescriptorPool CreateDescriptorPool; + PFN_vkResetDescriptorPool ResetDescriptorPool; + PFN_vkAllocDescriptorSets AllocDescriptorSets; + PFN_vkUpdateDescriptorSets UpdateDescriptorSets; + PFN_vkCreateDynamicViewportState CreateDynamicViewportState; + PFN_vkCreateDynamicRasterState CreateDynamicRasterState; + PFN_vkCreateDynamicColorBlendState CreateDynamicColorBlendState; + PFN_vkCreateDynamicDepthStencilState CreateDynamicDepthStencilState; + PFN_vkCreateCommandBuffer CreateCommandBuffer; + PFN_vkBeginCommandBuffer BeginCommandBuffer; + PFN_vkEndCommandBuffer EndCommandBuffer; + PFN_vkResetCommandBuffer ResetCommandBuffer; + PFN_vkCmdBindPipeline CmdBindPipeline; + PFN_vkCmdBindDynamicStateObject CmdBindDynamicStateObject; + PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets; + PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers; + PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer; + PFN_vkCmdDraw CmdDraw; + PFN_vkCmdDrawIndexed CmdDrawIndexed; + PFN_vkCmdDrawIndirect CmdDrawIndirect; + PFN_vkCmdDrawIndexedIndirect CmdDrawIndexedIndirect; + PFN_vkCmdDispatch CmdDispatch; + PFN_vkCmdDispatchIndirect CmdDispatchIndirect; + PFN_vkCmdCopyBuffer CmdCopyBuffer; + PFN_vkCmdCopyImage CmdCopyImage; + PFN_vkCmdBlitImage CmdBlitImage; + PFN_vkCmdCopyBufferToImage CmdCopyBufferToImage; + PFN_vkCmdCopyImageToBuffer CmdCopyImageToBuffer; + PFN_vkCmdUpdateBuffer CmdUpdateBuffer; + PFN_vkCmdFillBuffer CmdFillBuffer; + PFN_vkCmdClearColorImage CmdClearColorImage; + PFN_vkCmdClearDepthStencilImage CmdClearDepthStencilImage; + PFN_vkCmdClearColorAttachment CmdClearColorAttachment; + PFN_vkCmdClearDepthStencilAttachment CmdClearDepthStencilAttachment; + PFN_vkCmdResolveImage CmdResolveImage; + PFN_vkCmdSetEvent CmdSetEvent; + PFN_vkCmdResetEvent CmdResetEvent; + PFN_vkCmdWaitEvents CmdWaitEvents; + PFN_vkCmdPipelineBarrier CmdPipelineBarrier; + PFN_vkCmdBeginQuery CmdBeginQuery; + PFN_vkCmdEndQuery CmdEndQuery; + PFN_vkCmdResetQueryPool CmdResetQueryPool; + PFN_vkCmdWriteTimestamp CmdWriteTimestamp; + PFN_vkCmdCopyQueryPoolResults CmdCopyQueryPoolResults; + PFN_vkCreateFramebuffer CreateFramebuffer; + PFN_vkCreateRenderPass CreateRenderPass; + PFN_vkCmdBeginRenderPass CmdBeginRenderPass; + PFN_vkCmdEndRenderPass CmdEndRenderPass; + PFN_vkCmdExecuteCommands CmdExecuteCommands; + PFN_vkCreateSwapChainWSI CreateSwapChainWSI; + PFN_vkDestroySwapChainWSI DestroySwapChainWSI; + PFN_vkGetSwapChainInfoWSI GetSwapChainInfoWSI; + PFN_vkQueuePresentWSI QueuePresentWSI; + PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; + PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; + PFN_vkDbgStringCallback DbgStringCallback; + PFN_vkDbgStdioCallback DbgStdioCallback; + PFN_vkDbgBreakCallback DbgBreakCallback; +} VkLayerDispatchTable; + +typedef struct VkLayerInstanceDispatchTable_ +{ + PFN_vkGetInstanceProcAddr GetInstanceProcAddr; + PFN_vkCreateInstance CreateInstance; + PFN_vkDestroyInstance DestroyInstance; + PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices; + PFN_vkGetPhysicalDeviceFeatures GetPhysicalDeviceFeatures; + PFN_vkGetPhysicalDeviceFormatInfo GetPhysicalDeviceFormatInfo; + PFN_vkGetPhysicalDeviceLimits GetPhysicalDeviceLimits; + PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties; + PFN_vkGetPhysicalDevicePerformance GetPhysicalDevicePerformance; + PFN_vkGetPhysicalDeviceQueueCount GetPhysicalDeviceQueueCount; + PFN_vkGetPhysicalDeviceQueueProperties GetPhysicalDeviceQueueProperties; + PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties; + PFN_vkGetPhysicalDeviceExtensionCount GetPhysicalDeviceExtensionCount; + PFN_vkGetPhysicalDeviceExtensionProperties GetPhysicalDeviceExtensionProperties; + PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; + PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; + PFN_vkDbgStringCallback DbgStringCallback; + PFN_vkDbgStdioCallback DbgStdioCallback; + PFN_vkDbgBreakCallback DbgBreakCallback; +} VkLayerInstanceDispatchTable; + +// LL node for tree of dbg callback functions +typedef struct VkLayerDbgFunctionNode_ +{ + VkDbgMsgCallback msgCallback; + PFN_vkDbgMsgCallback pfnMsgCallback; + VkFlags msgFlags; + const void *pUserData; + struct VkLayerDbgFunctionNode_ *pNext; +} VkLayerDbgFunctionNode; + +typedef enum VkLayerDbgAction_ +{ + VK_DBG_LAYER_ACTION_IGNORE = 0x0, + VK_DBG_LAYER_ACTION_CALLBACK = 0x1, + VK_DBG_LAYER_ACTION_LOG_MSG = 0x2, + VK_DBG_LAYER_ACTION_BREAK = 0x4 +} VkLayerDbgAction; + +// ------------------------------------------------------------------------------------------------ +// API functions diff --git a/layers/basic.cpp b/layers/basic.cpp index de2755b2..b9bf17df 100644 --- a/layers/basic.cpp +++ b/layers/basic.cpp @@ -26,7 +26,7 @@ #include #include "loader_platform.h" #include "vk_dispatch_table_helper.h" -#include "vkLayer.h" +#include "vk_layer.h" #include "layers_table.h" // The following is #included again to catch certain OS-specific functions // being used: diff --git a/layers/draw_state.h b/layers/draw_state.h index c46a28a5..fb62fb10 100644 --- a/layers/draw_state.h +++ b/layers/draw_state.h @@ -21,7 +21,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "vkLayer.h" +#include "vk_layer.h" #include using namespace std; diff --git a/layers/image.cpp b/layers/image.cpp index d2c449ec..8012e9ba 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -32,7 +32,7 @@ #include #include "loader_platform.h" -#include "vkLayer.h" +#include "vk_layer.h" #include "layers_config.h" #include "vk_enum_validate_helper.h" #include "vk_struct_validate_helper.h" diff --git a/layers/layer_logging.h b/layers/layer_logging.h index 68f5f89b..8a7e2929 100644 --- a/layers/layer_logging.h +++ b/layers/layer_logging.h @@ -32,7 +32,7 @@ #include #include #include -#include "vkLayer.h" +#include "vk_layer.h" #include "layer_data.h" #include "layers_table.h" diff --git a/layers/layers_config.cpp b/layers/layers_config.cpp index 642e0b49..ad49e4d3 100644 --- a/layers/layers_config.cpp +++ b/layers/layers_config.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "loader_platform.h" #include "layers_config.h" // The following is #included again to catch certain OS-specific functions diff --git a/layers/layers_msg.h b/layers/layers_msg.h index f73e4d3d..2d0e31d6 100644 --- a/layers/layers_msg.h +++ b/layers/layers_msg.h @@ -23,7 +23,7 @@ */ #include #include -#include "vkLayer.h" +#include "vk_layer.h" static VkLayerDbgFunctionNode *g_pDbgFunctionHead = NULL; static VkFlags g_reportFlags = (VkFlags) 0; diff --git a/layers/layers_table.cpp b/layers/layers_table.cpp index 5d1b9cf9..363cd01b 100644 --- a/layers/layers_table.cpp +++ b/layers/layers_table.cpp @@ -24,7 +24,7 @@ #include #include #include "vk_dispatch_table_helper.h" -#include "vkLayer.h" +#include "vk_layer.h" #include "layers_table.h" static device_table_map tableMap; static instance_table_map tableInstanceMap; diff --git a/layers/mem_tracker.h b/layers/mem_tracker.h index c7083adb..8caf0084 100644 --- a/layers/mem_tracker.h +++ b/layers/mem_tracker.h @@ -23,7 +23,7 @@ */ #pragma once #include -#include "vkLayer.h" +#include "vk_layer.h" #ifdef __cplusplus extern "C" { diff --git a/layers/multi.cpp b/layers/multi.cpp index 28dacf95..4705b0ce 100644 --- a/layers/multi.cpp +++ b/layers/multi.cpp @@ -29,7 +29,7 @@ #include #include "loader_platform.h" #include "vk_dispatch_table_helper.h" -#include "vkLayer.h" +#include "vk_layer.h" // The following is #included again to catch certain OS-specific functions // being used: #include "loader_platform.h" diff --git a/layers/object_track.h b/layers/object_track.h index ebd7be18..62bfa487 100644 --- a/layers/object_track.h +++ b/layers/object_track.h @@ -22,7 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "vkLayer.h" +#include "vk_layer.h" #include "vk_enum_string_helper.h" // Object Tracker ERROR codes diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 3074ab11..2fb07575 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -33,7 +33,7 @@ #include #include "loader_platform.h" -#include "vkLayer.h" +#include "vk_layer.h" #include "layers_config.h" #include "vk_enum_validate_helper.h" #include "vk_struct_validate_helper.h" diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index df89d3c1..854ccc6e 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -31,7 +31,7 @@ #include #include "loader_platform.h" #include "vk_dispatch_table_helper.h" -#include "vkLayer.h" +#include "vk_layer.h" #include "layers_config.h" #include "layers_msg.h" #include "layers_table.h" diff --git a/layers/shader_checker.h b/layers/shader_checker.h index a952ac7c..4e7eddf0 100644 --- a/layers/shader_checker.h +++ b/layers/shader_checker.h @@ -21,7 +21,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "vkLayer.h" +#include "vk_layer.h" #include "vk_debug_report_lunarg.h" diff --git a/loader/debug_report.c b/loader/debug_report.c index 498faf8a..9a0396b0 100644 --- a/loader/debug_report.c +++ b/loader/debug_report.c @@ -34,7 +34,7 @@ #include #endif #include "debug_report.h" -#include "vkLayer.h" +#include "vk_layer.h" typedef void (VKAPI *PFN_stringCallback)(char *message); diff --git a/loader/loader.c b/loader/loader.c index 577024b9..d59df6c3 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -46,7 +46,7 @@ #include "gpa_helper.h" #include "table_ops.h" #include "debug_report.h" -#include "vkIcd.h" +#include "vk_icd.h" #include "cJSON.h" void loader_add_to_ext_list( diff --git a/loader/loader.h b/loader/loader.h index c89ad0fe..6fd87687 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include #if defined(__GNUC__) && __GNUC__ >= 4 diff --git a/loader/table_ops.h b/loader/table_ops.h index 39370f36..84f03396 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include "loader.h" #include "loader_platform.h" diff --git a/vk-generate.py b/vk-generate.py index d6f9c8dc..14341651 100755 --- a/vk-generate.py +++ b/vk-generate.py @@ -107,7 +107,7 @@ class DispatchTableOpsSubcommand(Subcommand): def generate_header(self): return "\n".join(["#include ", - "#include ", + "#include ", "#include "]) def _generate_init_dispatch(self, type): diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 76589b2a..276f0fed 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -575,7 +575,7 @@ class Subcommand(object): class LayerFuncsSubcommand(Subcommand): def generate_header(self): - return '#include \n#include "loader.h"' + return '#include \n#include "loader.h"' def generate_body(self): return self._generate_dispatch_entrypoints("static") @@ -595,7 +595,7 @@ class GenericLayerSubcommand(Subcommand): gen_header.append('#include ') gen_header.append('#include ') gen_header.append('#include "loader_platform.h"') - gen_header.append('#include "vkLayer.h"') + gen_header.append('#include "vk_layer.h"') gen_header.append('//The following is #included again to catch certain OS-specific functions being used:') gen_header.append('') gen_header.append('#include "loader_platform.h"') @@ -742,7 +742,7 @@ class APIDumpSubcommand(Subcommand): header_txt.append('') header_txt.append('%s' % self.lineinfo.get()) header_txt.append('#include "loader_platform.h"') - header_txt.append('#include "vkLayer.h"') + header_txt.append('#include "vk_layer.h"') header_txt.append('#include "vk_struct_string_helper_cpp.h"') header_txt.append('#include "layers_table.h"') header_txt.append('#include ') @@ -1226,7 +1226,7 @@ class ThreadingSubcommand(Subcommand): header_txt.append('#include ') header_txt.append('#include ') header_txt.append('#include "loader_platform.h"') - header_txt.append('#include "vkLayer.h"') + header_txt.append('#include "vk_layer.h"') header_txt.append('#include "threading.h"') header_txt.append('#include "layers_config.h"') header_txt.append('#include "vk_enum_validate_helper.h"') -- cgit v1.2.3