Bug 14084 - Improve type safety and remove polymorphism
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da5d526..332aeeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,12 +53,12 @@
# tests: VULKAN tests
add_subdirectory(loader)
add_subdirectory(icd)
-if(NOT WIN32)
- # TODO: Tests don't build on Windows
- if(BUILD_TESTS)
- add_subdirectory(tests)
- endif()
-endif()
-add_subdirectory(layers)
+#if(NOT WIN32)
+# # TODO: Tests don't build on Windows
+# if(BUILD_TESTS)
+# add_subdirectory(tests)
+# endif()
+#endif()
+#add_subdirectory(layers)
add_subdirectory(demos)
#add_subdirectory(tools/glave)
diff --git a/include/vk_debug_marker_lunarg.h b/include/vk_debug_marker_lunarg.h
index d0fdfdc..bce7aa3 100644
--- a/include/vk_debug_marker_lunarg.h
+++ b/include/vk_debug_marker_lunarg.h
@@ -53,16 +53,16 @@
#define VK_DEBUG_MARKER_ENUM_EXTEND(type, id) ((type)(VK_DEBUG_MARKER_EXTENSION_NUMBER * -1000 + (id)))
-#define VK_OBJECT_INFO_TYPE_DBG_OBJECT_TAG VK_DEBUG_MARKER_ENUM_EXTEND(VkObjectInfoType, 0)
-#define VK_OBJECT_INFO_TYPE_DBG_OBJECT_NAME VK_DEBUG_MARKER_ENUM_EXTEND(VkObjectInfoType, 1)
+#define VK_OBJECT_INFO_TYPE_DBG_OBJECT_TAG VK_DEBUG_MARKER_ENUM_EXTEND(VkDbgObjectInfoType, 0)
+#define VK_OBJECT_INFO_TYPE_DBG_OBJECT_NAME VK_DEBUG_MARKER_ENUM_EXTEND(VkDbgObjectInfoType, 1)
// ------------------------------------------------------------------------------------------------
// API functions
typedef void (VKAPI *PFN_vkCmdDbgMarkerBegin)(VkCmdBuffer cmdBuffer, const char* pMarker);
typedef void (VKAPI *PFN_vkCmdDbgMarkerEnd)(VkCmdBuffer cmdBuffer);
-typedef VkResult (VKAPI *PFN_vkDbgSetObjectTag)(VkDevice device, VkObjectType objType, VkObject object, size_t tagSize, const void* pTag);
-typedef VkResult (VKAPI *PFN_vkDbgSetObjectName)(VkDevice device, VkObjectType objType, VkObject object, size_t nameSize, const char* pName);
+typedef VkResult (VKAPI *PFN_vkDbgSetObjectTag)(VkDevice device, VkDbgObjectType objType, uint64_t object, size_t tagSize, const void* pTag);
+typedef VkResult (VKAPI *PFN_vkDbgSetObjectName)(VkDevice device, VkDbgObjectType objType, uint64_t object, size_t nameSize, const char* pName);
#ifdef VK_PROTOTYPES
@@ -76,15 +76,15 @@
VkResult VKAPI vkDbgSetObjectTag(
VkDevice device,
- VkObjectType objType,
- VkObject object,
+ VkDbgObjectType objType,
+ uint64_t object,
size_t tagSize,
const void* pTag);
VkResult VKAPI vkDbgSetObjectName(
VkDevice device,
- VkObjectType objType,
- VkObject object,
+ VkDbgObjectType objType,
+ uint64_t object,
size_t nameSize,
const char* pName);
diff --git a/include/vk_debug_report_lunarg.h b/include/vk_debug_report_lunarg.h
index 72770e0..8654a48 100644
--- a/include/vk_debug_report_lunarg.h
+++ b/include/vk_debug_report_lunarg.h
@@ -46,10 +46,47 @@
* DebugReport Vulkan Extension API
***************************************************************************************************
*/
+typedef enum {
+ VK_OBJECT_TYPE_INSTANCE = 0,
+ VK_OBJECT_TYPE_PHYSICAL_DEVICE = 1,
+ VK_OBJECT_TYPE_DEVICE = 2,
+ VK_OBJECT_TYPE_QUEUE = 3,
+ VK_OBJECT_TYPE_COMMAND_BUFFER = 4,
+ VK_OBJECT_TYPE_DEVICE_MEMORY = 5,
+ VK_OBJECT_TYPE_BUFFER = 6,
+ VK_OBJECT_TYPE_BUFFER_VIEW = 7,
+ VK_OBJECT_TYPE_IMAGE = 8,
+ VK_OBJECT_TYPE_IMAGE_VIEW = 9,
+ VK_OBJECT_TYPE_ATTACHMENT_VIEW = 10,
+ VK_OBJECT_TYPE_SHADER_MODULE = 12,
+ VK_OBJECT_TYPE_SHADER = 13,
+ VK_OBJECT_TYPE_PIPELINE = 14,
+ VK_OBJECT_TYPE_PIPELINE_LAYOUT = 15,
+ VK_OBJECT_TYPE_SAMPLER = 16,
+ VK_OBJECT_TYPE_DESCRIPTOR_SET = 17,
+ VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT = 18,
+ VK_OBJECT_TYPE_DESCRIPTOR_POOL = 19,
+ VK_OBJECT_TYPE_DYNAMIC_VP_STATE = 20,
+ VK_OBJECT_TYPE_DYNAMIC_RS_STATE = 21,
+ VK_OBJECT_TYPE_DYNAMIC_CB_STATE = 22,
+ VK_OBJECT_TYPE_DYNAMIC_DS_STATE = 23,
+ VK_OBJECT_TYPE_FENCE = 24,
+ VK_OBJECT_TYPE_SEMAPHORE = 25,
+ VK_OBJECT_TYPE_EVENT = 26,
+ VK_OBJECT_TYPE_QUERY_POOL = 27,
+ VK_OBJECT_TYPE_FRAMEBUFFER = 28,
+ VK_OBJECT_TYPE_RENDER_PASS = 29,
+ VK_OBJECT_TYPE_PIPELINE_CACHE = 30,
+ VK_OBJECT_TYPE_SWAP_CHAIN_WSI = 31,
+ VK_OBJECT_TYPE_BEGIN_RANGE = VK_OBJECT_TYPE_INSTANCE,
+ VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_SWAP_CHAIN_WSI,
+ VK_OBJECT_TYPE_NUM = (VK_OBJECT_TYPE_SWAP_CHAIN_WSI - VK_OBJECT_TYPE_INSTANCE + 1),
+ VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF
+} VkDbgObjectType;
#define DEBUG_REPORT_EXTENSION_NAME "DEBUG_REPORT"
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDbgMsgCallback, VkObject)
+VK_DEFINE_NONDISP_HANDLE(VkDbgMsgCallback)
// ------------------------------------------------------------------------------------------------
// Enumerations
@@ -72,14 +109,14 @@
#define VK_DEBUG_REPORT_ENUM_EXTEND(type, id) ((type)(VK_DEBUG_REPORT_EXTENSION_NUMBER * -1000 + (id)))
-#define VK_OBJECT_TYPE_MSG_CALLBACK VK_DEBUG_REPORT_ENUM_EXTEND(VkObjectType, 0)
+#define VK_OBJECT_TYPE_MSG_CALLBACK VK_DEBUG_REPORT_ENUM_EXTEND(VkDbgObjectType, 0)
// ------------------------------------------------------------------------------------------------
// Vulkan function pointers
typedef void (*PFN_vkDbgMsgCallback)(
VkFlags msgFlags,
- VkObjectType objType,
- VkObject srcObject,
+ VkDbgObjectType objType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
@@ -91,9 +128,9 @@
typedef VkResult (VKAPI *PFN_vkDbgCreateMsgCallback)(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, const void* pUserData, VkDbgMsgCallback* pMsgCallback);
typedef VkResult (VKAPI *PFN_vkDbgDestroyMsgCallback)(VkInstance instance, VkDbgMsgCallback msgCallback);
-typedef void (VKAPI *PFN_vkDbgStringCallback)(VkFlags msgFlags, VkObjectType objType, VkObject srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData);
-typedef void (VKAPI *PFN_vkDbgStdioCallback)(VkFlags msgFlags, VkObjectType objType, VkObject srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData);
-typedef void (VKAPI *PFN_vkDbgBreakCallback)(VkFlags msgFlags, VkObjectType objType, VkObject srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData);
+typedef void (VKAPI *PFN_vkDbgStringCallback)(VkFlags msgFlags, VkDbgObjectType objType, uint64_t srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData);
+typedef void (VKAPI *PFN_vkDbgStdioCallback)(VkFlags msgFlags, VkDbgObjectType objType, uint64_t srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData);
+typedef void (VKAPI *PFN_vkDbgBreakCallback)(VkFlags msgFlags, VkDbgObjectType objType, uint64_t srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData);
#ifdef VK_PROTOTYPES
@@ -112,8 +149,8 @@
// DebugReport utility callback functions
void VKAPI vkDbgStringCallback(
VkFlags msgFlags,
- VkObjectType objType,
- VkObject srcObject,
+ VkDbgObjectType objType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
@@ -122,8 +159,8 @@
void VKAPI vkDbgStdioCallback(
VkFlags msgFlags,
- VkObjectType objType,
- VkObject srcObject,
+ VkDbgObjectType objType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
@@ -132,8 +169,8 @@
void VKAPI vkDbgBreakCallback(
VkFlags msgFlags,
- VkObjectType objType,
- VkObject srcObject,
+ VkDbgObjectType objType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
diff --git a/include/vk_icd.h b/include/vk_icd.h
index 8f1bfdb..0f64c72 100644
--- a/include/vk_icd.h
+++ b/include/vk_icd.h
@@ -18,12 +18,12 @@
void *loaderData;
} VK_LOADER_DATA;
-static inline void set_loader_magic_value(VkObject pNewObject) {
+static inline void set_loader_magic_value(void* 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) {
+static inline bool valid_loader_magic_value(void* pNewObject) {
const VK_LOADER_DATA *loader_info = (VK_LOADER_DATA *) pNewObject;
return loader_info->loaderMagic == ICD_LOADER_MAGIC;
}
diff --git a/include/vk_layer.h b/include/vk_layer.h
index d9e4387..8cb5f3f 100644
--- a/include/vk_layer.h
+++ b/include/vk_layer.h
@@ -17,12 +17,13 @@
# define VK_LAYER_EXPORT
#endif
-typedef void * (*PFN_vkGPA)(VkObject obj, const char * pName);
+typedef void * (*PFN_vkGPA)(void* obj, const char * pName);
+
typedef struct VkBaseLayerObject_
{
PFN_vkGPA pGPA;
- VkObject nextObject;
- VkObject baseObject;
+ void* nextObject;
+ void* baseObject;
} VkBaseLayerObject;
typedef struct VkLayerDispatchTable_
@@ -40,34 +41,46 @@
PFN_vkUnmapMemory UnmapMemory;
PFN_vkFlushMappedMemoryRanges FlushMappedMemoryRanges;
PFN_vkInvalidateMappedMemoryRanges InvalidateMappedMemoryRanges;
- PFN_vkDestroyObject DestroyObject;
- PFN_vkGetObjectMemoryRequirements GetObjectMemoryRequirements;
- PFN_vkBindObjectMemory BindObjectMemory;
PFN_vkGetImageSparseMemoryRequirements GetImageSparseMemoryRequirements;
+ PFN_vkGetImageMemoryRequirements GetImageMemoryRequirements;
+ PFN_vkGetBufferMemoryRequirements GetBufferMemoryRequirements;
+ PFN_vkBindImageMemory BindImageMemory;
+ PFN_vkBindBufferMemory BindBufferMemory;
PFN_vkQueueBindSparseBufferMemory QueueBindSparseBufferMemory;
PFN_vkQueueBindSparseImageOpaqueMemory QueueBindSparseImageOpaqueMemory;
PFN_vkQueueBindSparseImageMemory QueueBindSparseImageMemory;
PFN_vkCreateFence CreateFence;
+ PFN_vkDestroyFence DestroyFence;
PFN_vkGetFenceStatus GetFenceStatus;
PFN_vkResetFences ResetFences;
PFN_vkWaitForFences WaitForFences;
PFN_vkCreateSemaphore CreateSemaphore;
+ PFN_vkDestroySemaphore DestroySemaphore;
PFN_vkQueueSignalSemaphore QueueSignalSemaphore;
PFN_vkQueueWaitSemaphore QueueWaitSemaphore;
PFN_vkCreateEvent CreateEvent;
+ PFN_vkDestroyEvent DestroyEvent;
PFN_vkGetEventStatus GetEventStatus;
PFN_vkSetEvent SetEvent;
PFN_vkResetEvent ResetEvent;
PFN_vkCreateQueryPool CreateQueryPool;
+ PFN_vkDestroyQueryPool DestroyQueryPool;
PFN_vkGetQueryPoolResults GetQueryPoolResults;
PFN_vkCreateBuffer CreateBuffer;
+ PFN_vkDestroyBuffer DestroyBuffer;
PFN_vkCreateBufferView CreateBufferView;
+ PFN_vkDestroyBufferView DestroyBufferView;
PFN_vkCreateImage CreateImage;
+ PFN_vkDestroyImage DestroyImage;
PFN_vkGetImageSubresourceLayout GetImageSubresourceLayout;
PFN_vkCreateImageView CreateImageView;
+ PFN_vkDestroyImageView DestroyImageView;
PFN_vkCreateAttachmentView CreateAttachmentView;
+ PFN_vkDestroyAttachmentView DestroyAttachmentView;
PFN_vkCreateShaderModule CreateShaderModule;
+ PFN_vkDestroyShaderModule DestroyShaderModule;
PFN_vkCreateShader CreateShader;
+ PFN_vkDestroyShader DestroyShader;
PFN_vkCreatePipelineCache CreatePipelineCache;
PFN_vkDestroyPipelineCache DestroyPipelineCache;
PFN_vkGetPipelineCacheSize GetPipelineCacheSize;
@@ -75,23 +88,36 @@
PFN_vkMergePipelineCaches MergePipelineCaches;
PFN_vkCreateGraphicsPipelines CreateGraphicsPipelines;
PFN_vkCreateComputePipelines CreateComputePipelines;
+ PFN_vkDestroyPipeline DestroyPipeline;
PFN_vkCreatePipelineLayout CreatePipelineLayout;
+ PFN_vkDestroyPipelineLayout DestroyPipelineLayout;
PFN_vkCreateSampler CreateSampler;
+ PFN_vkDestroySampler DestroySampler;
PFN_vkCreateDescriptorSetLayout CreateDescriptorSetLayout;
+ PFN_vkDestroyDescriptorSetLayout DestroyDescriptorSetLayout;
PFN_vkCreateDescriptorPool CreateDescriptorPool;
+ PFN_vkDestroyDescriptorPool DestroyDescriptorPool;
PFN_vkResetDescriptorPool ResetDescriptorPool;
PFN_vkAllocDescriptorSets AllocDescriptorSets;
PFN_vkUpdateDescriptorSets UpdateDescriptorSets;
PFN_vkCreateDynamicViewportState CreateDynamicViewportState;
+ PFN_vkDestroyDynamicViewportState DestroyDynamicViewportState;
PFN_vkCreateDynamicRasterState CreateDynamicRasterState;
+ PFN_vkDestroyDynamicRasterState DestroyDynamicRasterState;
PFN_vkCreateDynamicColorBlendState CreateDynamicColorBlendState;
+ PFN_vkDestroyDynamicColorBlendState DestroyDynamicColorBlendState;
PFN_vkCreateDynamicDepthStencilState CreateDynamicDepthStencilState;
+ PFN_vkDestroyDynamicDepthStencilState DestroyDynamicDepthStencilState;
PFN_vkCreateCommandBuffer CreateCommandBuffer;
+ PFN_vkDestroyCommandBuffer DestroyCommandBuffer;
PFN_vkBeginCommandBuffer BeginCommandBuffer;
PFN_vkEndCommandBuffer EndCommandBuffer;
PFN_vkResetCommandBuffer ResetCommandBuffer;
PFN_vkCmdBindPipeline CmdBindPipeline;
- PFN_vkCmdBindDynamicStateObject CmdBindDynamicStateObject;
+ PFN_vkCmdBindDynamicViewportState CmdBindDynamicViewportState;
+ PFN_vkCmdBindDynamicRasterState CmdBindDynamicRasterState;
+ PFN_vkCmdBindDynamicColorBlendState CmdBindDynamicColorBlendState;
+ PFN_vkCmdBindDynamicDepthStencilState CmdBindDynamicDepthStencilState;
PFN_vkCmdBindDescriptorSets CmdBindDescriptorSets;
PFN_vkCmdBindVertexBuffers CmdBindVertexBuffers;
PFN_vkCmdBindIndexBuffer CmdBindIndexBuffer;
@@ -123,7 +149,9 @@
PFN_vkCmdWriteTimestamp CmdWriteTimestamp;
PFN_vkCmdCopyQueryPoolResults CmdCopyQueryPoolResults;
PFN_vkCreateFramebuffer CreateFramebuffer;
+ PFN_vkDestroyFramebuffer DestroyFramebuffer;
PFN_vkCreateRenderPass CreateRenderPass;
+ PFN_vkDestroyRenderPass DestroyRenderPass;
PFN_vkCmdBeginRenderPass CmdBeginRenderPass;
PFN_vkCmdNextSubpass CmdNextSubpass;
PFN_vkCmdEndRenderPass CmdEndRenderPass;
diff --git a/include/vk_wsi_lunarg.h b/include/vk_wsi_lunarg.h
index bbd887d..4a86962 100644
--- a/include/vk_wsi_lunarg.h
+++ b/include/vk_wsi_lunarg.h
@@ -41,8 +41,8 @@
// ------------------------------------------------------------------------------------------------
// Objects
-VK_DEFINE_DISP_SUBCLASS_HANDLE(VkDisplayWSI, VkObject)
-VK_DEFINE_DISP_SUBCLASS_HANDLE(VkSwapChainWSI, VkObject)
+VK_DEFINE_HANDLE(VkDisplayWSI)
+VK_DEFINE_HANDLE(VkSwapChainWSI)
// ------------------------------------------------------------------------------------------------
// Enumeration constants
@@ -59,14 +59,6 @@
// Extend VkImageLayout enum with extension specific constants
#define VK_IMAGE_LAYOUT_PRESENT_SOURCE_WSI VK_WSI_LUNARG_ENUM(VkImageLayout, 0)
-// Extend VkObjectType enum for new objects
-#define VK_OBJECT_TYPE_DISPLAY_WSI VK_WSI_LUNARG_ENUM(VkObjectType, 0)
-#define VK_OBJECT_TYPE_SWAP_CHAIN_WSI VK_WSI_LUNARG_ENUM(VkObjectType, 1)
-
-// ------------------------------------------------------------------------------------------------
-// Enumerations
-
-
typedef enum VkSwapChainInfoTypeWSI_
{
// Info type for vkGetSwapChainInfo()
diff --git a/include/vulkan.h b/include/vulkan.h
index d334443..072ebb4 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -46,58 +46,66 @@
***************************************************************************************************
*/
-#if defined (__cplusplus) && (VK_UINTPTRLEAST64_MAX == UINTPTR_MAX)
- #define VK_TYPE_SAFE_COMPATIBLE_HANDLES 1
-#endif
+#define VK_DEFINE_HANDLE(obj) typedef struct obj##_T* obj;
-#if defined(VK_TYPE_SAFE_COMPATIBLE_HANDLES) && !defined(VK_DISABLE_TYPE_SAFE_HANDLES)
- #define VK_DEFINE_PTR_HANDLE(_obj) struct _obj##_T { char _dummy; }; typedef _obj##_T* _obj;
- #define VK_DEFINE_PTR_SUBCLASS_HANDLE(_obj, _base) struct _obj##_T : public _base##_T {}; typedef _obj##_T* _obj;
- #define VK_DEFINE_BASE_HANDLE(_obj) VK_DEFINE_PTR_HANDLE(_obj)
- #define VK_DEFINE_DISP_SUBCLASS_HANDLE(_obj, _base) VK_DEFINE_PTR_SUBCLASS_HANDLE(_obj, _base)
- #define VK_DEFINE_NONDISP_SUBCLASS_HANDLE(_obj, _base) VK_DEFINE_PTR_SUBCLASS_HANDLE(_obj, _base)
+#if defined(__cplusplus)
+ #if (_MSC_VER >= 1800 || __cplusplus >= 201103L)
+ // The bool operator only works if there are no implicit conversions from an obj to
+ // a bool-compatible type, which can then be used to unintentially violate type safety.
+ // C++11 and above supports the "explicit" keyword on conversion operators to stop this
+ // from happening. Otherwise users of C++ below C++11 won't get direct access to evaluating
+ // the object handle as a bool in expressions like:
+ // if (obj) vkDestroy(obj);
+ #define VK_NONDISP_HANDLE_OPERATOR_BOOL() explicit operator bool() const { return handle != 0; }
+ #else
+ #define VK_NONDISP_HANDLE_OPERATOR_BOOL()
+ #endif
+ #define VK_DEFINE_NONDISP_HANDLE(obj) \
+ struct obj { \
+ obj() { } \
+ obj(uint64_t x) { handle = x; } \
+ obj& operator =(uint64_t x) { handle = x; return *this; } \
+ bool operator==(const obj& other) const { return handle == other.handle; } \
+ bool operator!=(const obj& other) const { return handle != other.handle; } \
+ bool operator!() const { return !handle; } \
+ VK_NONDISP_HANDLE_OPERATOR_BOOL() \
+ uint64_t handle; \
+ };
#else
- #define VK_DEFINE_BASE_HANDLE(_obj) typedef VkUintPtrLeast64 _obj;
- #define VK_DEFINE_DISP_SUBCLASS_HANDLE(_obj, _base) typedef uintptr_t _obj;
- #define VK_DEFINE_NONDISP_SUBCLASS_HANDLE(_obj, _base) typedef VkUintPtrLeast64 _obj;
+ #define VK_DEFINE_NONDISP_HANDLE(obj) typedef struct obj##_T { uint64_t handle; } obj;
#endif
-VK_DEFINE_BASE_HANDLE(VkObject)
-
-VK_DEFINE_DISP_SUBCLASS_HANDLE(VkInstance, VkObject)
-VK_DEFINE_DISP_SUBCLASS_HANDLE(VkPhysicalDevice, VkObject)
-VK_DEFINE_DISP_SUBCLASS_HANDLE(VkDevice, VkObject)
-VK_DEFINE_DISP_SUBCLASS_HANDLE(VkQueue, VkObject)
-VK_DEFINE_DISP_SUBCLASS_HANDLE(VkCmdBuffer, VkObject)
-
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkNonDispatchable, VkObject)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDeviceMemory, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkBuffer, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkBufferView, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkImage, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkImageView, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkAttachmentView, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkShaderModule, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkShader, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkRenderPass, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkPipeline, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkPipelineCache, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkPipelineLayout, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkSampler, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDescriptorSet, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDescriptorSetLayout, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDescriptorPool, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicStateObject, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicVpState, VkDynamicStateObject)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicRsState, VkDynamicStateObject)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicCbState, VkDynamicStateObject)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicDsState, VkDynamicStateObject)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkFence, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkSemaphore, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkEvent, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkQueryPool, VkNonDispatchable)
-VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkFramebuffer, VkNonDispatchable)
+VK_DEFINE_HANDLE(VkInstance)
+VK_DEFINE_HANDLE(VkPhysicalDevice)
+VK_DEFINE_HANDLE(VkDevice)
+VK_DEFINE_HANDLE(VkQueue)
+VK_DEFINE_HANDLE(VkCmdBuffer)
+VK_DEFINE_NONDISP_HANDLE(VkFence)
+VK_DEFINE_NONDISP_HANDLE(VkDeviceMemory)
+VK_DEFINE_NONDISP_HANDLE(VkBuffer)
+VK_DEFINE_NONDISP_HANDLE(VkImage)
+VK_DEFINE_NONDISP_HANDLE(VkSemaphore)
+VK_DEFINE_NONDISP_HANDLE(VkEvent)
+VK_DEFINE_NONDISP_HANDLE(VkQueryPool)
+VK_DEFINE_NONDISP_HANDLE(VkBufferView)
+VK_DEFINE_NONDISP_HANDLE(VkImageView)
+VK_DEFINE_NONDISP_HANDLE(VkAttachmentView)
+VK_DEFINE_NONDISP_HANDLE(VkShaderModule)
+VK_DEFINE_NONDISP_HANDLE(VkShader)
+VK_DEFINE_NONDISP_HANDLE(VkPipelineCache)
+VK_DEFINE_NONDISP_HANDLE(VkPipelineLayout)
+VK_DEFINE_NONDISP_HANDLE(VkPipeline)
+VK_DEFINE_NONDISP_HANDLE(VkDescriptorSetLayout)
+VK_DEFINE_NONDISP_HANDLE(VkSampler)
+VK_DEFINE_NONDISP_HANDLE(VkDescriptorPool)
+VK_DEFINE_NONDISP_HANDLE(VkDescriptorSet)
+VK_DEFINE_NONDISP_HANDLE(VkDynamicViewportState)
+VK_DEFINE_NONDISP_HANDLE(VkDynamicRasterState)
+VK_DEFINE_NONDISP_HANDLE(VkDynamicColorBlendState)
+VK_DEFINE_NONDISP_HANDLE(VkDynamicDepthStencilState)
+VK_DEFINE_NONDISP_HANDLE(VkRenderPass)
+VK_DEFINE_NONDISP_HANDLE(VkFramebuffer)
#define VK_MAX_PHYSICAL_DEVICE_NAME 256
#define VK_MAX_EXTENSION_NAME 256
@@ -307,16 +315,6 @@
VK_ENUM_RANGE(PIPELINE_BIND_POINT, COMPUTE, GRAPHICS)
} VkPipelineBindPoint;
-typedef enum VkStateBindPoint_
-{
- VK_STATE_BIND_POINT_VIEWPORT = 0x00000000,
- VK_STATE_BIND_POINT_RASTER = 0x00000001,
- VK_STATE_BIND_POINT_COLOR_BLEND = 0x00000002,
- VK_STATE_BIND_POINT_DEPTH_STENCIL = 0x00000003,
-
- VK_ENUM_RANGE(STATE_BIND_POINT, VIEWPORT, DEPTH_STENCIL)
-} VkStateBindPoint;
-
typedef enum VkPrimitiveTopology_
{
VK_PRIMITIVE_TOPOLOGY_POINT_LIST = 0x00000000,
@@ -754,10 +752,10 @@
VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO = 8,
VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO = 9,
VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 10,
- VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO = 11,
- VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO = 12,
- VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO = 13,
- VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO = 14,
+ VK_STRUCTURE_TYPE_DYNAMIC_VIEWPORT_STATE_CREATE_INFO = 11,
+ VK_STRUCTURE_TYPE_DYNAMIC_RASTER_STATE_CREATE_INFO = 12,
+ VK_STRUCTURE_TYPE_DYNAMIC_COLOR_BLEND_STATE_CREATE_INFO = 13,
+ VK_STRUCTURE_TYPE_DYNAMIC_DEPTH_STENCIL_STATE_CREATE_INFO = 14,
VK_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO = 15,
VK_STRUCTURE_TYPE_EVENT_CREATE_INFO = 16,
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO = 17,
@@ -799,48 +797,6 @@
VK_ENUM_RANGE(STRUCTURE_TYPE, APPLICATION_INFO, RENDER_PASS_BEGIN_INFO)
} VkStructureType;
-// Object type enumerant
-typedef enum VkObjectType_
-{
- VK_OBJECT_TYPE_INSTANCE = 0,
- VK_OBJECT_TYPE_PHYSICAL_DEVICE = 1,
- VK_OBJECT_TYPE_DEVICE = 2,
- VK_OBJECT_TYPE_QUEUE = 3,
- VK_OBJECT_TYPE_COMMAND_BUFFER = 4,
- VK_OBJECT_TYPE_DEVICE_MEMORY = 5,
- VK_OBJECT_TYPE_BUFFER = 6,
- VK_OBJECT_TYPE_BUFFER_VIEW = 7,
- VK_OBJECT_TYPE_IMAGE = 8,
- VK_OBJECT_TYPE_IMAGE_VIEW = 9,
- VK_OBJECT_TYPE_ATTACHMENT_VIEW = 10,
-
- VK_OBJECT_TYPE_SHADER_MODULE = 12,
- VK_OBJECT_TYPE_SHADER = 13,
- VK_OBJECT_TYPE_PIPELINE = 14,
- VK_OBJECT_TYPE_PIPELINE_LAYOUT = 15,
- VK_OBJECT_TYPE_SAMPLER = 16,
- VK_OBJECT_TYPE_DESCRIPTOR_SET = 17,
- VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT = 18,
- VK_OBJECT_TYPE_DESCRIPTOR_POOL = 19,
- VK_OBJECT_TYPE_DYNAMIC_VP_STATE = 20,
- VK_OBJECT_TYPE_DYNAMIC_RS_STATE = 21,
- VK_OBJECT_TYPE_DYNAMIC_CB_STATE = 22,
- VK_OBJECT_TYPE_DYNAMIC_DS_STATE = 23,
- VK_OBJECT_TYPE_FENCE = 24,
- VK_OBJECT_TYPE_SEMAPHORE = 25,
- VK_OBJECT_TYPE_EVENT = 26,
- VK_OBJECT_TYPE_QUERY_POOL = 27,
- VK_OBJECT_TYPE_FRAMEBUFFER = 28,
- VK_OBJECT_TYPE_PIPELINE_CACHE = 29,
- VK_OBJECT_TYPE_RENDER_PASS = 30,
-
- // Valid ranges for core Vulkan:
- VK_OBJECT_TYPE_BEGIN_RANGE = VK_OBJECT_TYPE_INSTANCE,
- VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_RENDER_PASS,
- VK_NUM_OBJECT_TYPE = (VK_OBJECT_TYPE_END_RANGE - VK_OBJECT_TYPE_BEGIN_RANGE + 1),
- VK_MAX_ENUM(VkObjectType)
-} VkObjectType;
-
// ------------------------------------------------------------------------------------------------
// Error and return codes
@@ -2071,16 +2027,16 @@
VkBorderColor borderColor;
} VkSamplerCreateInfo;
-typedef struct VkDynamicVpStateCreateInfo_
+typedef struct VkDynamicViewportStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
uint32_t viewportAndScissorCount; // number of entries in pViewports and pScissors
const VkViewport* pViewports;
const VkRect2D* pScissors;
-} VkDynamicVpStateCreateInfo;
+} VkDynamicViewportStateCreateInfo;
-typedef struct VkDynamicRsStateCreateInfo_
+typedef struct VkDynamicRasterStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
@@ -2088,16 +2044,16 @@
float depthBiasClamp;
float slopeScaledDepthBias;
float lineWidth; // optional (GL45) - Width of lines
-} VkDynamicRsStateCreateInfo;
+} VkDynamicRasterStateCreateInfo;
-typedef struct VkDynamicCbStateCreateInfo_
+typedef struct VkDynamicColorBlendStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
float blendConst[4];
-} VkDynamicCbStateCreateInfo;
+} VkDynamicColorBlendStateCreateInfo;
-typedef struct VkDynamicDsStateCreateInfo_
+typedef struct VkDynamicDepthStencilStateCreateInfo_
{
VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
@@ -2107,7 +2063,7 @@
uint32_t stencilWriteMask;
uint32_t stencilFrontRef;
uint32_t stencilBackRef;
-} VkDynamicDsStateCreateInfo;
+} VkDynamicDepthStencilStateCreateInfo;
typedef struct VkCmdBufferCreateInfo_
{
@@ -2330,35 +2286,47 @@
typedef VkResult (VKAPI *PFN_vkUnmapMemory)(VkDevice device, VkDeviceMemory mem);
typedef VkResult (VKAPI *PFN_vkFlushMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges);
typedef VkResult (VKAPI *PFN_vkInvalidateMappedMemoryRanges)(VkDevice device, uint32_t memRangeCount, const VkMappedMemoryRange* pMemRanges);
-typedef VkResult (VKAPI *PFN_vkDestroyObject)(VkDevice device, VkObjectType objType, VkObject object);
-typedef VkResult (VKAPI *PFN_vkGetObjectMemoryRequirements)(VkDevice device, VkObjectType objType, VkObject object, VkMemoryRequirements* pMemoryRequirements);
-typedef VkResult (VKAPI *PFN_vkBindObjectMemory)(VkDevice device, VkObjectType objType, VkObject object, VkDeviceMemory mem, VkDeviceSize offset);
+typedef VkResult (VKAPI *PFN_vkBindBufferMemory)(VkDevice device, VkBuffer buffer, VkDeviceMemory mem, VkDeviceSize memOffset);
+typedef VkResult (VKAPI *PFN_vkBindImageMemory)(VkDevice device, VkImage image, VkDeviceMemory mem, VkDeviceSize memOffset);
+typedef VkResult (VKAPI *PFN_vkGetBufferMemoryRequirements)(VkDevice device, VkBuffer buffer, VkMemoryRequirements* pMemoryRequirements);
+typedef VkResult (VKAPI *PFN_vkGetImageMemoryRequirements)(VkDevice device, VkImage image, VkMemoryRequirements* pMemoryRequirements);
typedef VkResult (VKAPI *PFN_vkGetImageSparseMemoryRequirements)(VkDevice device, VkImage image, uint32_t* pNumRequirements, VkSparseImageMemoryRequirements* pSparseMemoryRequirements);
typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceSparseImageFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, uint32_t samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pNumProperties, VkSparseImageFormatProperties* pProperties);
typedef VkResult (VKAPI *PFN_vkQueueBindSparseBufferMemory)(VkQueue queue, VkBuffer buffer, uint32_t numBindings, const VkSparseMemoryBindInfo* pBindInfo);
typedef VkResult (VKAPI *PFN_vkQueueBindSparseImageOpaqueMemory)(VkQueue queue, VkImage image, uint32_t numBindings, const VkSparseMemoryBindInfo* pBindInfo);
typedef VkResult (VKAPI *PFN_vkQueueBindSparseImageMemory)(VkQueue queue, VkImage image, uint32_t numBindings, const VkSparseImageMemoryBindInfo* pBindInfo);
typedef VkResult (VKAPI *PFN_vkCreateFence)(VkDevice device, const VkFenceCreateInfo* pCreateInfo, VkFence* pFence);
+typedef VkResult (VKAPI *PFN_vkDestroyFence)(VkDevice device, VkFence fence);
typedef VkResult (VKAPI *PFN_vkResetFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences);
typedef VkResult (VKAPI *PFN_vkGetFenceStatus)(VkDevice device, VkFence fence);
typedef VkResult (VKAPI *PFN_vkWaitForFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t timeout);
typedef VkResult (VKAPI *PFN_vkCreateSemaphore)(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, VkSemaphore* pSemaphore);
+typedef VkResult (VKAPI *PFN_vkDestroySemaphore)(VkDevice device, VkSemaphore semaphore);
typedef VkResult (VKAPI *PFN_vkQueueSignalSemaphore)(VkQueue queue, VkSemaphore semaphore);
typedef VkResult (VKAPI *PFN_vkQueueWaitSemaphore)(VkQueue queue, VkSemaphore semaphore);
typedef VkResult (VKAPI *PFN_vkCreateEvent)(VkDevice device, const VkEventCreateInfo* pCreateInfo, VkEvent* pEvent);
+typedef VkResult (VKAPI *PFN_vkDestroyEvent)(VkDevice device, VkEvent event);
typedef VkResult (VKAPI *PFN_vkGetEventStatus)(VkDevice device, VkEvent event);
typedef VkResult (VKAPI *PFN_vkSetEvent)(VkDevice device, VkEvent event);
typedef VkResult (VKAPI *PFN_vkResetEvent)(VkDevice device, VkEvent event);
typedef VkResult (VKAPI *PFN_vkCreateQueryPool)(VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, VkQueryPool* pQueryPool);
+typedef VkResult (VKAPI *PFN_vkDestroyQueryPool)(VkDevice device, VkQueryPool queryPool);
typedef VkResult (VKAPI *PFN_vkGetQueryPoolResults)(VkDevice device, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, size_t* pDataSize, void* pData, VkQueryResultFlags flags);
typedef VkResult (VKAPI *PFN_vkCreateBuffer)(VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkBuffer* pBuffer);
+typedef VkResult (VKAPI *PFN_vkDestroyBuffer)(VkDevice device, VkBuffer buffer);
typedef VkResult (VKAPI *PFN_vkCreateBufferView)(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, VkBufferView* pView);
+typedef VkResult (VKAPI *PFN_vkDestroyBufferView)(VkDevice device, VkBufferView bufferView);
typedef VkResult (VKAPI *PFN_vkCreateImage)(VkDevice device, const VkImageCreateInfo* pCreateInfo, VkImage* pImage);
+typedef VkResult (VKAPI *PFN_vkDestroyImage)(VkDevice device, VkImage image);
typedef VkResult (VKAPI *PFN_vkGetImageSubresourceLayout)(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout);
typedef VkResult (VKAPI *PFN_vkCreateImageView)(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, VkImageView* pView);
+typedef VkResult (VKAPI *PFN_vkDestroyImageView)(VkDevice device, VkImageView imageView);
typedef VkResult (VKAPI *PFN_vkCreateAttachmentView)(VkDevice device, const VkAttachmentViewCreateInfo* pCreateInfo, VkAttachmentView* pView);
+typedef VkResult (VKAPI *PFN_vkDestroyAttachmentView)(VkDevice device, VkAttachmentView attachmentView);
typedef VkResult (VKAPI *PFN_vkCreateShaderModule)(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, VkShaderModule* pShaderModule);
+typedef VkResult (VKAPI *PFN_vkDestroyShaderModule)(VkDevice device, VkShaderModule shaderModule);
typedef VkResult (VKAPI *PFN_vkCreateShader)(VkDevice device, const VkShaderCreateInfo* pCreateInfo, VkShader* pShader);
+typedef VkResult (VKAPI *PFN_vkDestroyShader)(VkDevice device, VkShader shader);
typedef VkResult (VKAPI *PFN_vkCreatePipelineCache)(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, VkPipelineCache* pPipelineCache);
typedef VkResult (VKAPI *PFN_vkDestroyPipelineCache)(VkDevice device, VkPipelineCache pipelineCache);
typedef size_t (VKAPI *PFN_vkGetPipelineCacheSize)(VkDevice device, VkPipelineCache pipelineCache);
@@ -2366,23 +2334,36 @@
typedef VkResult (VKAPI *PFN_vkMergePipelineCaches)(VkDevice device, VkPipelineCache destCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches);
typedef VkResult (VKAPI *PFN_vkCreateGraphicsPipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo* pCreateInfos, VkPipeline* pPipelines);
typedef VkResult (VKAPI *PFN_vkCreateComputePipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkComputePipelineCreateInfo* pCreateInfos, VkPipeline* pPipelines);
+typedef VkResult (VKAPI *PFN_vkDestroyPipeline)(VkDevice device, VkPipeline pipeline);
typedef VkResult (VKAPI *PFN_vkCreatePipelineLayout)(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, VkPipelineLayout* pPipelineLayout);
+typedef VkResult (VKAPI *PFN_vkDestroyPipelineLayout)(VkDevice device, VkPipelineLayout pipelineLayout);
typedef VkResult (VKAPI *PFN_vkCreateSampler)(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, VkSampler* pSampler);
+typedef VkResult (VKAPI *PFN_vkDestroySampler)(VkDevice device, VkSampler sampler);
typedef VkResult (VKAPI *PFN_vkCreateDescriptorSetLayout)(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayout* pSetLayout);
+typedef VkResult (VKAPI *PFN_vkDestroyDescriptorSetLayout)(VkDevice device, VkDescriptorSetLayout descriptorSetLayout);
typedef VkResult (VKAPI *PFN_vkCreateDescriptorPool)(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool);
+typedef VkResult (VKAPI *PFN_vkDestroyDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool);
typedef VkResult (VKAPI *PFN_vkResetDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool);
typedef VkResult (VKAPI *PFN_vkAllocDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, uint32_t count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets, uint32_t* pCount);
typedef VkResult (VKAPI *PFN_vkUpdateDescriptorSets)(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies);
-typedef VkResult (VKAPI *PFN_vkCreateDynamicViewportState)(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpState* pState);
-typedef VkResult (VKAPI *PFN_vkCreateDynamicRasterState)(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsState* pState);
-typedef VkResult (VKAPI *PFN_vkCreateDynamicColorBlendState)(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, VkDynamicCbState* pState);
-typedef VkResult (VKAPI *PFN_vkCreateDynamicDepthStencilState)(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, VkDynamicDsState* pState);
+typedef VkResult (VKAPI *PFN_vkCreateDynamicViewportState)(VkDevice device, const VkDynamicViewportStateCreateInfo* pCreateInfo, VkDynamicViewportState* pState);
+typedef VkResult (VKAPI *PFN_vkDestroyDynamicViewportState)(VkDevice device, VkDynamicViewportState dynamicViewportState);
+typedef VkResult (VKAPI *PFN_vkCreateDynamicRasterState)(VkDevice device, const VkDynamicRasterStateCreateInfo* pCreateInfo, VkDynamicRasterState* pState);
+typedef VkResult (VKAPI *PFN_vkDestroyDynamicRasterState)(VkDevice device, VkDynamicRasterState dynamicRasterState);
+typedef VkResult (VKAPI *PFN_vkCreateDynamicColorBlendState)(VkDevice device, const VkDynamicColorBlendStateCreateInfo* pCreateInfo, VkDynamicColorBlendState* pState);
+typedef VkResult (VKAPI *PFN_vkDestroyDynamicColorBlendState)(VkDevice device, VkDynamicColorBlendState dynamicColorBlendState);
+typedef VkResult (VKAPI *PFN_vkCreateDynamicDepthStencilState)(VkDevice device, const VkDynamicDepthStencilStateCreateInfo* pCreateInfo, VkDynamicDepthStencilState* pState);
+typedef VkResult (VKAPI *PFN_vkDestroyDynamicDepthStencilState)(VkDevice device, VkDynamicDepthStencilState dynamicDepthStencilState);
typedef VkResult (VKAPI *PFN_vkCreateCommandBuffer)(VkDevice device, const VkCmdBufferCreateInfo* pCreateInfo, VkCmdBuffer* pCmdBuffer);
+typedef VkResult (VKAPI *PFN_vkDestroyCommandBuffer)(VkDevice device, VkCmdBuffer commandBuffer);
typedef VkResult (VKAPI *PFN_vkBeginCommandBuffer)(VkCmdBuffer cmdBuffer, const VkCmdBufferBeginInfo* pBeginInfo);
typedef VkResult (VKAPI *PFN_vkEndCommandBuffer)(VkCmdBuffer cmdBuffer);
typedef VkResult (VKAPI *PFN_vkResetCommandBuffer)(VkCmdBuffer cmdBuffer);
typedef void (VKAPI *PFN_vkCmdBindPipeline)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline);
-typedef void (VKAPI *PFN_vkCmdBindDynamicStateObject)(VkCmdBuffer cmdBuffer, VkStateBindPoint stateBindPoint, VkDynamicStateObject state);
+typedef void (VKAPI *PFN_vkCmdBindDynamicViewportState)(VkCmdBuffer cmdBuffer, VkDynamicViewportState dynamicViewportState);
+typedef void (VKAPI *PFN_vkCmdBindDynamicRasterState)(VkCmdBuffer cmdBuffer, VkDynamicRasterState dynamicRasterState);
+typedef void (VKAPI *PFN_vkCmdBindDynamicColorBlendState)(VkCmdBuffer cmdBuffer, VkDynamicColorBlendState dynamicColorBlendState);
+typedef void (VKAPI *PFN_vkCmdBindDynamicDepthStencilState)(VkCmdBuffer cmdBuffer, VkDynamicDepthStencilState dynamicDepthStencilState);
typedef void (VKAPI *PFN_vkCmdBindDescriptorSets)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets);
typedef void (VKAPI *PFN_vkCmdBindIndexBuffer)(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType);
typedef void (VKAPI *PFN_vkCmdBindVertexBuffers)(VkCmdBuffer cmdBuffer, uint32_t startBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets);
@@ -2414,7 +2395,9 @@
typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkTimestampType timestampType, VkBuffer destBuffer, VkDeviceSize destOffset);
typedef void (VKAPI *PFN_vkCmdCopyQueryPoolResults)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize destStride, VkQueryResultFlags flags);
typedef VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer);
+typedef VkResult (VKAPI *PFN_vkDestroyFramebuffer)(VkDevice device, VkFramebuffer framebuffer);
typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass);
+typedef VkResult (VKAPI *PFN_vkDestroyRenderPass)(VkDevice device, VkRenderPass renderPass);
typedef void (VKAPI *PFN_vkCmdBeginRenderPass)(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents);
typedef void (VKAPI *PFN_vkCmdNextSubpass)(VkCmdBuffer cmdBuffer, VkRenderPassContents contents);
typedef void (VKAPI *PFN_vkCmdEndRenderPass)(VkCmdBuffer cmdBuffer);
@@ -2562,26 +2545,28 @@
uint32_t memRangeCount,
const VkMappedMemoryRange* pMemRanges);
-// Generic API object functions
-
-VkResult VKAPI vkDestroyObject(
- VkDevice device,
- VkObjectType objType,
- VkObject object);
-
// Memory management API functions
-VkResult VKAPI vkBindObjectMemory(
+VkResult VKAPI vkBindBufferMemory(
VkDevice device,
- VkObjectType objType,
- VkObject object,
+ VkBuffer buffer,
VkDeviceMemory mem,
VkDeviceSize memOffset);
-VkResult VKAPI vkGetObjectMemoryRequirements(
+VkResult VKAPI vkBindImageMemory(
VkDevice device,
- VkObjectType objType,
- VkObject object,
+ VkImage image,
+ VkDeviceMemory mem,
+ VkDeviceSize memOffset);
+
+VkResult VKAPI vkGetBufferMemoryRequirements(
+ VkDevice device,
+ VkBuffer buffer,
+ VkMemoryRequirements* pMemoryRequirements);
+
+VkResult VKAPI vkGetImageMemoryRequirements(
+ VkDevice device,
+ VkImage image,
VkMemoryRequirements* pMemoryRequirements);
VkResult VKAPI vkGetImageSparseMemoryRequirements(
@@ -2625,6 +2610,10 @@
const VkFenceCreateInfo* pCreateInfo,
VkFence* pFence);
+VkResult VKAPI vkDestroyFence(
+ VkDevice device,
+ VkFence fence);
+
VkResult VKAPI vkResetFences(
VkDevice device,
uint32_t fenceCount,
@@ -2648,6 +2637,10 @@
const VkSemaphoreCreateInfo* pCreateInfo,
VkSemaphore* pSemaphore);
+VkResult VKAPI vkDestroySemaphore(
+ VkDevice device,
+ VkSemaphore semaphore);
+
VkResult VKAPI vkQueueSignalSemaphore(
VkQueue queue,
VkSemaphore semaphore);
@@ -2663,6 +2656,10 @@
const VkEventCreateInfo* pCreateInfo,
VkEvent* pEvent);
+VkResult VKAPI vkDestroyEvent(
+ VkDevice device,
+ VkEvent event);
+
VkResult VKAPI vkGetEventStatus(
VkDevice device,
VkEvent event);
@@ -2682,6 +2679,10 @@
const VkQueryPoolCreateInfo* pCreateInfo,
VkQueryPool* pQueryPool);
+VkResult VKAPI vkDestroyQueryPool(
+ VkDevice device,
+ VkQueryPool queryPool);
+
VkResult VKAPI vkGetQueryPoolResults(
VkDevice device,
VkQueryPool queryPool,
@@ -2698,6 +2699,10 @@
const VkBufferCreateInfo* pCreateInfo,
VkBuffer* pBuffer);
+VkResult VKAPI vkDestroyBuffer(
+ VkDevice device,
+ VkBuffer buffer);
+
// Buffer view functions
VkResult VKAPI vkCreateBufferView(
@@ -2705,6 +2710,10 @@
const VkBufferViewCreateInfo* pCreateInfo,
VkBufferView* pView);
+VkResult VKAPI vkDestroyBufferView(
+ VkDevice device,
+ VkBufferView bufferView);
+
// Image functions
VkResult VKAPI vkCreateImage(
@@ -2712,6 +2721,10 @@
const VkImageCreateInfo* pCreateInfo,
VkImage* pImage);
+VkResult VKAPI vkDestroyImage(
+ VkDevice device,
+ VkImage image);
+
VkResult VKAPI vkGetImageSubresourceLayout(
VkDevice device,
VkImage image,
@@ -2725,11 +2738,19 @@
const VkImageViewCreateInfo* pCreateInfo,
VkImageView* pView);
+VkResult VKAPI vkDestroyImageView(
+ VkDevice device,
+ VkImageView imageView);
+
VkResult VKAPI vkCreateAttachmentView(
VkDevice device,
const VkAttachmentViewCreateInfo* pCreateInfo,
VkAttachmentView* pView);
+VkResult VKAPI vkDestroyAttachmentView(
+ VkDevice device,
+ VkAttachmentView AttachmentView);
+
// Shader functions
VkResult VKAPI vkCreateShaderModule(
@@ -2737,11 +2758,19 @@
const VkShaderModuleCreateInfo* pCreateInfo,
VkShaderModule* pShaderModule);
+VkResult VKAPI vkDestroyShaderModule(
+ VkDevice device,
+ VkShaderModule shaderModule);
+
VkResult VKAPI vkCreateShader(
VkDevice device,
const VkShaderCreateInfo* pCreateInfo,
VkShader* pShader);
+VkResult VKAPI vkDestroyShader(
+ VkDevice device,
+ VkShader shader);
+
// Pipeline functions
VkResult VKAPI vkCreatePipelineCache(
VkDevice device,
@@ -2750,7 +2779,7 @@
VkResult VKAPI vkDestroyPipelineCache(
VkDevice device,
- VkPipelineCache pipelineCache);
+ VkPipelineCache pipeline);
size_t VKAPI vkGetPipelineCacheSize(
VkDevice device,
@@ -2781,6 +2810,10 @@
const VkComputePipelineCreateInfo* pCreateInfos,
VkPipeline* pPipelines);
+VkResult VKAPI vkDestroyPipeline(
+ VkDevice device,
+ VkPipeline pipeline);
+
// Pipeline layout functions
VkResult VKAPI vkCreatePipelineLayout(
@@ -2788,6 +2821,10 @@
const VkPipelineLayoutCreateInfo* pCreateInfo,
VkPipelineLayout* pPipelineLayout);
+VkResult VKAPI vkDestroyPipelineLayout(
+ VkDevice device,
+ VkPipelineLayout pipelineLayout);
+
// Sampler functions
VkResult VKAPI vkCreateSampler(
@@ -2795,6 +2832,10 @@
const VkSamplerCreateInfo* pCreateInfo,
VkSampler* pSampler);
+VkResult VKAPI vkDestroySampler(
+ VkDevice device,
+ VkSampler sampler);
+
// Descriptor set functions
VkResult VKAPI vkCreateDescriptorSetLayout(
@@ -2802,6 +2843,10 @@
const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
VkDescriptorSetLayout* pSetLayout);
+VkResult VKAPI vkDestroyDescriptorSetLayout(
+ VkDevice device,
+ VkDescriptorSetLayout descriptorSetLayout);
+
VkResult VKAPI vkCreateDescriptorPool(
VkDevice device,
VkDescriptorPoolUsage poolUsage,
@@ -2809,6 +2854,10 @@
const VkDescriptorPoolCreateInfo* pCreateInfo,
VkDescriptorPool* pDescriptorPool);
+VkResult VKAPI vkDestroyDescriptorPool(
+ VkDevice device,
+ VkDescriptorPool descriptorPool);
+
VkResult VKAPI vkResetDescriptorPool(
VkDevice device,
VkDescriptorPool descriptorPool);
@@ -2833,23 +2882,39 @@
VkResult VKAPI vkCreateDynamicViewportState(
VkDevice device,
- const VkDynamicVpStateCreateInfo* pCreateInfo,
- VkDynamicVpState* pState);
+ const VkDynamicViewportStateCreateInfo* pCreateInfo,
+ VkDynamicViewportState* pState);
+
+VkResult VKAPI vkDestroyDynamicViewportState(
+ VkDevice device,
+ VkDynamicViewportState dynamicViewportState);
VkResult VKAPI vkCreateDynamicRasterState(
VkDevice device,
- const VkDynamicRsStateCreateInfo* pCreateInfo,
- VkDynamicRsState* pState);
+ const VkDynamicRasterStateCreateInfo* pCreateInfo,
+ VkDynamicRasterState* pState);
+
+VkResult VKAPI vkDestroyDynamicRasterState(
+ VkDevice device,
+ VkDynamicRasterState dynamicRasterState);
VkResult VKAPI vkCreateDynamicColorBlendState(
VkDevice device,
- const VkDynamicCbStateCreateInfo* pCreateInfo,
- VkDynamicCbState* pState);
+ const VkDynamicColorBlendStateCreateInfo* pCreateInfo,
+ VkDynamicColorBlendState* pState);
+
+VkResult VKAPI vkDestroyDynamicColorBlendState(
+ VkDevice device,
+ VkDynamicColorBlendState dynamicColorBlendState);
VkResult VKAPI vkCreateDynamicDepthStencilState(
VkDevice device,
- const VkDynamicDsStateCreateInfo* pCreateInfo,
- VkDynamicDsState* pState);
+ const VkDynamicDepthStencilStateCreateInfo* pCreateInfo,
+ VkDynamicDepthStencilState* pState);
+
+VkResult VKAPI vkDestroyDynamicDepthStencilState(
+ VkDevice device,
+ VkDynamicDepthStencilState dynamicDepthStencilState);
// Command buffer functions
@@ -2858,6 +2923,10 @@
const VkCmdBufferCreateInfo* pCreateInfo,
VkCmdBuffer* pCmdBuffer);
+VkResult VKAPI vkDestroyCommandBuffer(
+ VkDevice device,
+ VkCmdBuffer commandBuffer);
+
VkResult VKAPI vkBeginCommandBuffer(
VkCmdBuffer cmdBuffer,
const VkCmdBufferBeginInfo* pBeginInfo);
@@ -2875,10 +2944,21 @@
VkPipelineBindPoint pipelineBindPoint,
VkPipeline pipeline);
-void VKAPI vkCmdBindDynamicStateObject(
- VkCmdBuffer cmdBuffer,
- VkStateBindPoint stateBindPoint,
- VkDynamicStateObject dynamicState);
+void VKAPI vkCmdBindDynamicViewportState(
+ VkCmdBuffer cmdBuffer,
+ VkDynamicViewportState dynamicViewportState);
+
+void VKAPI vkCmdBindDynamicRasterState(
+ VkCmdBuffer cmdBuffer,
+ VkDynamicRasterState dynamicRasterState);
+
+void VKAPI vkCmdBindDynamicColorBlendState(
+ VkCmdBuffer cmdBuffer,
+ VkDynamicColorBlendState dynamicColorBlendState);
+
+void VKAPI vkCmdBindDynamicDepthStencilState(
+ VkCmdBuffer cmdBuffer,
+ VkDynamicDepthStencilState dynamicDepthStencilState);
void VKAPI vkCmdBindDescriptorSets(
VkCmdBuffer cmdBuffer,
@@ -3107,6 +3187,10 @@
const VkFramebufferCreateInfo* pCreateInfo,
VkFramebuffer* pFramebuffer);
+VkResult VKAPI vkDestroyFramebuffer(
+ VkDevice device,
+ VkFramebuffer framebuffer);
+
VkResult VKAPI vkCreateRenderPass(
VkDevice device,
const VkRenderPassCreateInfo* pCreateInfo,
@@ -3121,6 +3205,10 @@
VkCmdBuffer cmdBuffer,
VkRenderPassContents contents);
+VkResult VKAPI vkDestroyRenderPass(
+ VkDevice device,
+ VkRenderPass renderPass);
+
void VKAPI vkCmdEndRenderPass(
VkCmdBuffer cmdBuffer);
diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
index be0a09c..765e5d0 100644
--- a/layers/vk_layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -223,8 +223,8 @@
static inline void log_msg(
debug_report_data *debug_data,
VkFlags msgFlags,
- VkObjectType objectType,
- VkObject srcObject,
+ VkDbgObjectType objectType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
@@ -248,8 +248,8 @@
static inline void VKAPI log_callback(
VkFlags msgFlags,
- VkObjectType objType,
- VkObject srcObject,
+ VkDbgObjectType objType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
diff --git a/layers/vk_layer_table.h b/layers/vk_layer_table.h
index 24f0bd4..2778403 100644
--- a/layers/vk_layer_table.h
+++ b/layers/vk_layer_table.h
@@ -34,18 +34,18 @@
typedef void *dispatch_key;
-static inline dispatch_key get_dispatch_key(VkObject object)
+static inline dispatch_key get_dispatch_key(void* object)
{
return (dispatch_key) *(VkLayerDispatchTable **) object;
}
-VkLayerDispatchTable *device_dispatch_table(VkObject object);
+VkLayerDispatchTable *device_dispatch_table(void* object);
-VkLayerInstanceDispatchTable *instance_dispatch_table(VkObject object);
+VkLayerInstanceDispatchTable *instance_dispatch_table(void* object);
-VkLayerDispatchTable *get_dispatch_table(device_table_map &map, VkObject object);
+VkLayerDispatchTable *get_dispatch_table(device_table_map &map, void* object);
-VkLayerInstanceDispatchTable *get_dispatch_table(instance_table_map &map, VkObject object);
+VkLayerInstanceDispatchTable *get_dispatch_table(instance_table_map &map, void* object);
void destroy_device_dispatch_table(dispatch_key key);
void destroy_instance_dispatch_table(dispatch_key key);
diff --git a/loader/debug_report.c b/loader/debug_report.c
index 89340e6..4d6314a 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -108,7 +108,7 @@
VkResult result = inst->disp->DbgDestroyMsgCallback(instance, msg_callback);
while (pTrav) {
- if (pTrav->msgCallback == msg_callback) {
+ if (pTrav->msgCallback.handle == msg_callback.handle) {
pPrev->pNext = pTrav->pNext;
if (inst->DbgFunctionHead == pTrav)
inst->DbgFunctionHead = pTrav->pNext;
@@ -128,6 +128,7 @@
* This is the instance chain terminator function
* for DbgCreateMsgCallback
*/
+
VkResult loader_DbgCreateMsgCallback(
VkInstance instance,
VkFlags msgFlags,
@@ -180,7 +181,7 @@
if (icd) {
storage_idx = 0;
for (icd = inst->icds; icd; icd = icd->next) {
- if (icd_info[storage_idx]) {
+ if (icd_info[storage_idx].handle) {
icd->DbgDestroyMsgCallback(
icd->instance,
icd_info[storage_idx]);
@@ -191,7 +192,7 @@
return res;
}
- *pMsgCallback = (VkDbgMsgCallback) icd_info;
+ *(VkDbgMsgCallback **)pMsgCallback = icd_info;
return VK_SUCCESS;
}
@@ -221,10 +222,10 @@
if (inst == VK_NULL_HANDLE)
return VK_ERROR_INVALID_HANDLE;
- icd_info = (VkDbgMsgCallback *) msgCallback;
+ icd_info = *(VkDbgMsgCallback **) &msgCallback;
storage_idx = 0;
for (icd = inst->icds; icd; icd = icd->next) {
- if (icd_info[storage_idx]) {
+ if (icd_info[storage_idx].handle) {
icd->DbgDestroyMsgCallback(
icd->instance,
icd_info[storage_idx]);
@@ -267,8 +268,8 @@
// DebugReport utility callback functions
static void VKAPI StringCallback(
VkFlags msgFlags,
- VkObjectType objType,
- VkObject srcObject,
+ VkDbgObjectType objType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
@@ -302,8 +303,8 @@
static void VKAPI StdioCallback(
VkFlags msgFlags,
- VkObjectType objType,
- VkObject srcObject,
+ VkDbgObjectType objType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
@@ -320,8 +321,8 @@
static void VKAPI BreakCallback(
VkFlags msgFlags,
- VkObjectType objType,
- VkObject srcObject,
+ VkDbgObjectType objType,
+ uint64_t srcObject,
size_t location,
int32_t msgCode,
const char* pLayerPrefix,
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 6da2fcc..04f97da 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -91,12 +91,14 @@
return (void*) vkFlushMappedMemoryRanges;
if (!strcmp(name, "InvalidateMappedMemoryRanges"))
return (void*) vkInvalidateMappedMemoryRanges;
- if (!strcmp(name, "DestroyObject"))
- return (void*) vkDestroyObject;
- if (!strcmp(name, "GetObjectMemoryRequirements"))
- return (void*) vkGetObjectMemoryRequirements;
- if (!strcmp(name, "BindObjectMemory"))
- return (void*) vkBindObjectMemory;
+ if (!strcmp(name, "GetImageMemoryRequirements"))
+ return (void*) vkGetImageMemoryRequirements;
+ if (!strcmp(name, "GetBufferMemoryRequirements"))
+ return (void*) vkGetBufferMemoryRequirements;
+ if (!strcmp(name, "BindImageMemory"))
+ return (void*) vkBindImageMemory;
+ if (!strcmp(name, "BindBufferMemory"))
+ return (void*) vkBindBufferMemory;
if (!strcmp(name, "QueueBindSparseBufferMemory"))
return (void*) vkQueueBindSparseBufferMemory;
if (!strcmp(name, "QueueBindSparseImageMemory"))
@@ -107,6 +109,8 @@
return (void*) vkGetImageSparseMemoryRequirements;
if (!strcmp(name, "CreateFence"))
return (void*) vkCreateFence;
+ if (!strcmp(name, "DestroyFence"))
+ return (void*) vkDestroyFence;
if (!strcmp(name, "ResetFences"))
return (void*) vkResetFences;
if (!strcmp(name, "GetFenceStatus"))
@@ -115,12 +119,16 @@
return (void*) vkWaitForFences;
if (!strcmp(name, "CreateSemaphore"))
return (void*) vkCreateSemaphore;
+ if (!strcmp(name, "DestroySemaphore"))
+ return (void*) vkDestroySemaphore;
if (!strcmp(name, "QueueSignalSemaphore"))
return (void*) vkQueueSignalSemaphore;
if (!strcmp(name, "QueueWaitSemaphore"))
return (void*) vkQueueWaitSemaphore;
if (!strcmp(name, "CreateEvent"))
return (void*) vkCreateEvent;
+ if (!strcmp(name, "DestroyEvent"))
+ return (void*) vkDestroyEvent;
if (!strcmp(name, "GetEventStatus"))
return (void*) vkGetEventStatus;
if (!strcmp(name, "SetEvent"))
@@ -129,24 +137,40 @@
return (void*) vkResetEvent;
if (!strcmp(name, "CreateQueryPool"))
return (void*) vkCreateQueryPool;
+ if (!strcmp(name, "DestroyQueryPool"))
+ return (void*) vkDestroyQueryPool;
if (!strcmp(name, "GetQueryPoolResults"))
return (void*) vkGetQueryPoolResults;
if (!strcmp(name, "CreateBuffer"))
return (void*) vkCreateBuffer;
+ if (!strcmp(name, "DestroyBuffer"))
+ return (void*) vkDestroyBuffer;
if (!strcmp(name, "CreateBufferView"))
return (void*) vkCreateBufferView;
+ if (!strcmp(name, "DestroyBufferView"))
+ return (void*) vkDestroyBufferView;
if (!strcmp(name, "CreateImage"))
return (void*) vkCreateImage;
+ if (!strcmp(name, "DestroyImage"))
+ return (void*) vkDestroyImage;
if (!strcmp(name, "GetImageSubresourceLayout"))
return (void*) vkGetImageSubresourceLayout;
if (!strcmp(name, "CreateImageView"))
return (void*) vkCreateImageView;
+ if (!strcmp(name, "DestroyImageView"))
+ return (void*) vkDestroyImageView;
if (!strcmp(name, "CreateAttachmentView"))
return (void*) vkCreateAttachmentView;
+ if (!strcmp(name, "DestroyAttachmentView"))
+ return (void*) vkDestroyAttachmentView;
if (!strcmp(name, "CreateShaderModule"))
return (void*) vkCreateShaderModule;
+ if (!strcmp(name, "DestroyShaderModule"))
+ return (void*) vkDestroyShaderModule;
if (!strcmp(name, "CreateShader"))
return (void*) vkCreateShader;
+ if (!strcmp(name, "DestroyShader"))
+ return (void*) vkDestroyShader;
if (!strcmp(name, "CreatePipelineCache"))
return (void*) vkCreatePipelineCache;
if (!strcmp(name, "DestroyPipelineCache"))
@@ -161,14 +185,24 @@
return (void*) vkCreateGraphicsPipelines;
if (!strcmp(name, "CreateComputePipelines"))
return (void*) vkCreateComputePipelines;
+ if (!strcmp(name, "DestroyPipeline"))
+ return (void*) vkDestroyPipeline;
if (!strcmp(name, "CreatePipelineLayout"))
return (void*) vkCreatePipelineLayout;
+ if (!strcmp(name, "DestroyPipelineLayout"))
+ return (void*) vkDestroyPipelineLayout;
if (!strcmp(name, "CreateSampler"))
return (void*) vkCreateSampler;
+ if (!strcmp(name, "DestroySampler"))
+ return (void*) vkDestroySampler;
if (!strcmp(name, "CreateDescriptorSetLayout"))
return (void*) vkCreateDescriptorSetLayout;
+ if (!strcmp(name, "DestroyDescriptorSetLayout"))
+ return (void*) vkDestroyDescriptorSetLayout;
if (!strcmp(name, "CreateDescriptorPool"))
return (void*) vkCreateDescriptorPool;
+ if (!strcmp(name, "DestroyDescriptorPool"))
+ return (void*) vkDestroyDescriptorPool;
if (!strcmp(name, "ResetDescriptorPool"))
return (void*) vkResetDescriptorPool;
if (!strcmp(name, "AllocDescriptorSets"))
@@ -177,14 +211,24 @@
return (void*) vkUpdateDescriptorSets;
if (!strcmp(name, "CreateDynamicViewportState"))
return (void*) vkCreateDynamicViewportState;
+ if (!strcmp(name, "DestroyDynamicViewportState"))
+ return (void*) vkDestroyDynamicViewportState;
if (!strcmp(name, "CreateDynamicRasterState"))
return (void*) vkCreateDynamicRasterState;
+ if (!strcmp(name, "DestroyDynamicRasterState"))
+ return (void*) vkDestroyDynamicRasterState;
if (!strcmp(name, "CreateDynamicColorBlendState"))
return (void*) vkCreateDynamicColorBlendState;
+ if (!strcmp(name, "DestroyDynamicColorBlendState"))
+ return (void*) vkDestroyDynamicColorBlendState;
if (!strcmp(name, "CreateDynamicDepthStencilState"))
return (void*) vkCreateDynamicDepthStencilState;
+ if (!strcmp(name, "DestroyDynamicDepthStencilState"))
+ return (void*) vkDestroyDynamicDepthStencilState;
if (!strcmp(name, "CreateCommandBuffer"))
return (void*) vkCreateCommandBuffer;
+ if (!strcmp(name, "DestroyCommandBuffer"))
+ return (void*) vkDestroyCommandBuffer;
if (!strcmp(name, "BeginCommandBuffer"))
return (void*) vkBeginCommandBuffer;
if (!strcmp(name, "EndCommandBuffer"))
@@ -193,8 +237,14 @@
return (void*) vkResetCommandBuffer;
if (!strcmp(name, "CmdBindPipeline"))
return (void*) vkCmdBindPipeline;
- if (!strcmp(name, "CmdBindDynamicStateObject"))
- return (void*) vkCmdBindDynamicStateObject;
+ if (!strcmp(name, "CmdBindDynamicViewportState"))
+ return (void*) vkCmdBindDynamicViewportState;
+ if (!strcmp(name, "CmdBindDynamicRasterState"))
+ return (void*) vkCmdBindDynamicRasterState;
+ if (!strcmp(name, "CmdBindDynamicColorBlendState"))
+ return (void*) vkCmdBindDynamicColorBlendState;
+ if (!strcmp(name, "CmdBindDynamicDepthStencilState"))
+ return (void*) vkCmdBindDynamicDepthStencilState;
if (!strcmp(name, "CmdBindDescriptorSets"))
return (void*) vkCmdBindDescriptorSets;
if (!strcmp(name, "CmdBindVertexBuffers"))
@@ -257,8 +307,12 @@
return (void*) vkCmdCopyQueryPoolResults;
if (!strcmp(name, "CreateFramebuffer"))
return (void*) vkCreateFramebuffer;
+ if (!strcmp(name, "DestroyFramebuffer"))
+ return (void*) vkDestroyFramebuffer;
if (!strcmp(name, "CreateRenderPass"))
return (void*) vkCreateRenderPass;
+ if (!strcmp(name, "DestroyRenderPass"))
+ return (void*) vkDestroyRenderPass;
if (!strcmp(name, "CmdBeginRenderPass"))
return (void*) vkCmdBeginRenderPass;
if (!strcmp(name, "CmdNextSubpass"))
diff --git a/loader/loader.c b/loader/loader.c
index 06384b6..c9333de 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -951,10 +951,10 @@
static void loader_scanned_icd_add(const char *filename)
{
loader_platform_dl_handle handle;
- void *fp_create_inst;
- void *fp_get_global_ext_props;
- void *fp_get_device_ext_props;
- PFN_vkGPA fp_get_proc_addr;
+ PFN_vkCreateInstance fp_create_inst;
+ PFN_vkGetGlobalExtensionProperties fp_get_global_ext_props;
+ PFN_vkGetPhysicalDeviceExtensionProperties fp_get_device_ext_props;
+ PFN_vkGetDeviceProcAddr fp_get_proc_addr;
struct loader_scanned_icds *new_node;
// Used to call: dlopen(filename, RTLD_LAZY);
@@ -2060,8 +2060,8 @@
}
// NOTE inst is unwrapped at this point in time
- VkObject baseObj = (VkObject) inst;
- VkObject nextObj = (VkObject) inst;
+ void* baseObj = (void*) inst;
+ void* nextObj = (void*) inst;
VkBaseLayerObject *nextInstObj;
PFN_vkGetInstanceProcAddr nextGPA = loader_gpa_instance_internal;
@@ -2097,10 +2097,10 @@
* the given baseObject.
*/
nextInstObj = (wrappedInstance + layer_idx);
- nextInstObj->pGPA = nextGPA;
+ nextInstObj->pGPA = (PFN_vkGPA) nextGPA;
nextInstObj->baseObject = baseObj;
nextInstObj->nextObject = nextObj;
- nextObj = (VkObject) nextInstObj;
+ nextObj = (void*) nextInstObj;
char funcStr[256];
snprintf(funcStr, 256, "%sGetInstanceProcAddr", layer_prop->info.layerName);
@@ -2217,8 +2217,8 @@
}
/* activate any layer libraries */
- VkObject nextObj = (VkObject) device;
- VkObject baseObj = nextObj;
+ void* nextObj = (void*) device;
+ void* baseObj = nextObj;
VkBaseLayerObject *nextGpuObj;
PFN_vkGetDeviceProcAddr nextGPA = loader_GetDeviceChainProcAddr;
VkBaseLayerObject *wrappedGpus;
@@ -2238,10 +2238,10 @@
loader_platform_dl_handle lib_handle;
nextGpuObj = (wrappedGpus + i);
- nextGpuObj->pGPA = nextGPA;
+ nextGpuObj->pGPA = (PFN_vkGPA)nextGPA;
nextGpuObj->baseObject = baseObj;
nextGpuObj->nextObject = nextObj;
- nextObj = (VkObject) nextGpuObj;
+ nextObj = (void*) nextGpuObj;
char funcStr[256];
snprintf(funcStr, 256, "%sGetDeviceProcAddr", layer_prop->info.layerName);
@@ -2261,7 +2261,7 @@
}
loader_init_device_dispatch_table(&dev->loader_dispatch, nextGPA,
- (VkPhysicalDevice) nextObj, (VkPhysicalDevice) baseObj);
+ (VkDevice) nextObj, (VkDevice) baseObj);
free(wrappedGpus);
return dev->activated_layer_list.count;
@@ -2824,7 +2824,7 @@
}
PFN_vkGetDeviceProcAddr get_proc_addr = icd->GetDeviceProcAddr;
loader_init_device_dispatch_table(&dev->loader_dispatch, get_proc_addr,
- icd->gpus[gpu_index], icd->gpus[gpu_index]);
+ (VkDevice) icd->gpus[gpu_index], (VkDevice) icd->gpus[gpu_index]);
dev->loader_dispatch.CreateDevice = scratch_vkCreateDevice;
loader_init_dispatch(*pDevice, &dev->loader_dispatch);
diff --git a/loader/loader.h b/loader/loader.h
index 24c0d3b..d5395d6 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -298,22 +298,22 @@
return (struct loader_instance *) instance;
}
-static inline void loader_set_dispatch(VkObject obj, const void *data)
+static inline void loader_set_dispatch(void* obj, const void *data)
{
*((const void **) obj) = data;
}
-static inline VkLayerDispatchTable *loader_get_dispatch(const VkObject obj)
+static inline VkLayerDispatchTable *loader_get_dispatch(const void* obj)
{
return *((VkLayerDispatchTable **) obj);
}
-static inline VkLayerInstanceDispatchTable *loader_get_instance_dispatch(const VkObject obj)
+static inline VkLayerInstanceDispatchTable *loader_get_instance_dispatch(const void* obj)
{
return *((VkLayerInstanceDispatchTable **) obj);
}
-static inline void loader_init_dispatch(VkObject obj, const void *data)
+static inline void loader_init_dispatch(void* obj, const void *data)
{
#ifdef DEBUG
assert(valid_loader_magic_value(obj) &&
diff --git a/loader/table_ops.h b/loader/table_ops.h
index d6ddbfc..df8c2b4 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -49,34 +49,46 @@
table->UnmapMemory = (PFN_vkUnmapMemory) gpa(dev, "vkUnmapMemory");
table->FlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges) gpa(dev, "vkFlushMappedMemoryRanges");
table->InvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges) gpa(dev, "vkInvalidateMappedMemoryRanges");
- table->DestroyObject = (PFN_vkDestroyObject) gpa(dev, "vkDestroyObject");
- table->GetObjectMemoryRequirements = (PFN_vkGetObjectMemoryRequirements) gpa(dev, "vkGetObjectMemoryRequirements");
- table->BindObjectMemory = (PFN_vkBindObjectMemory) gpa(dev, "vkBindObjectMemory");
+ table->GetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements) gpa(dev, "vkGetBufferMemoryRequirements");
+ table->GetImageMemoryRequirements = (PFN_vkGetImageMemoryRequirements) gpa(dev, "vkGetImageMemoryRequirements");
+ table->BindBufferMemory = (PFN_vkBindBufferMemory) gpa(dev, "vkBindBufferMemory");
+ table->BindImageMemory = (PFN_vkBindImageMemory) gpa(dev, "vkBindImageMemory");
table->QueueBindSparseBufferMemory = (PFN_vkQueueBindSparseBufferMemory) gpa(dev, "vkQueueBindSparseBufferMemory");
table->QueueBindSparseImageMemory = (PFN_vkQueueBindSparseImageMemory) gpa(dev, "vkQueueBindSparseImageMemory");
table->QueueBindSparseImageOpaqueMemory = (PFN_vkQueueBindSparseImageOpaqueMemory) gpa(dev, "vkQueueBindSparseImageOpaqueMemory");
table->GetImageSparseMemoryRequirements = (PFN_vkGetImageSparseMemoryRequirements) gpa(dev, "vkGetImageSparseMemoryRequirements");
table->CreateFence = (PFN_vkCreateFence) gpa(dev, "vkCreateFence");
+ table->DestroyFence = (PFN_vkDestroyFence) gpa(dev, "vkDestroyFence");
table->ResetFences = (PFN_vkResetFences) gpa(dev, "vkResetFences");
table->GetFenceStatus = (PFN_vkGetFenceStatus) gpa(dev, "vkGetFenceStatus");
table->WaitForFences = (PFN_vkWaitForFences) gpa(dev, "vkWaitForFences");
table->CreateSemaphore = (PFN_vkCreateSemaphore) gpa(dev, "vkCreateSemaphore");
+ table->DestroySemaphore = (PFN_vkDestroySemaphore) gpa(dev, "vkDestroySemaphore");
table->QueueSignalSemaphore = (PFN_vkQueueSignalSemaphore) gpa(dev, "vkQueueSignalSemaphore");
table->QueueWaitSemaphore = (PFN_vkQueueWaitSemaphore) gpa(dev, "vkQueueWaitSemaphore");
table->CreateEvent = (PFN_vkCreateEvent) gpa(dev, "vkCreateEvent");
+ table->DestroyEvent = (PFN_vkDestroyEvent) gpa(dev, "vkDestroyEvent");
table->GetEventStatus = (PFN_vkGetEventStatus) gpa(dev, "vkGetEventStatus");
table->SetEvent = (PFN_vkSetEvent) gpa(dev, "vkSetEvent");
table->ResetEvent = (PFN_vkResetEvent) gpa(dev, "vkResetEvent");
table->CreateQueryPool = (PFN_vkCreateQueryPool) gpa(dev, "vkCreateQueryPool");
+ table->DestroyQueryPool = (PFN_vkDestroyQueryPool) gpa(dev, "vkDestroyQueryPool");
table->GetQueryPoolResults = (PFN_vkGetQueryPoolResults) gpa(dev, "vkGetQueryPoolResults");
table->CreateBuffer = (PFN_vkCreateBuffer) gpa(dev, "vkCreateBuffer");
+ table->DestroyBuffer = (PFN_vkDestroyBuffer) gpa(dev, "vkDestroyBuffer");
table->CreateBufferView = (PFN_vkCreateBufferView) gpa(dev, "vkCreateBufferView");
+ table->DestroyBufferView = (PFN_vkDestroyBufferView) gpa(dev, "vkDestroyBufferView");
table->CreateImage = (PFN_vkCreateImage) gpa(dev, "vkCreateImage");
+ table->DestroyImage = (PFN_vkDestroyImage) gpa(dev, "vkDestroyImage");
table->GetImageSubresourceLayout = (PFN_vkGetImageSubresourceLayout) gpa(dev, "vkGetImageSubresourceLayout");
table->CreateImageView = (PFN_vkCreateImageView) gpa(dev, "vkCreateImageView");
+ table->DestroyImageView = (PFN_vkDestroyImageView) gpa(dev, "vkDestroyImageView");
table->CreateAttachmentView = (PFN_vkCreateAttachmentView) gpa(dev, "vkCreateAttachmentView");
+ table->DestroyAttachmentView = (PFN_vkDestroyAttachmentView) gpa(dev, "vkDestroyAttachmentView");
table->CreateShaderModule = (PFN_vkCreateShaderModule) gpa(dev, "vkCreateShaderModule");
+ table->DestroyShaderModule = (PFN_vkDestroyShaderModule) gpa(dev, "vkDestroyShaderModule");
table->CreateShader = (PFN_vkCreateShader) gpa(dev, "vkCreateShader");
+ table->DestroyShader = (PFN_vkDestroyShader) gpa(dev, "vkDestroyShader");
table->CreatePipelineCache = (PFN_vkCreatePipelineCache) gpa(dev, "vkCreatePipelineCache");
table->DestroyPipelineCache = (PFN_vkDestroyPipelineCache) gpa(dev, "vkDestroyPipelineCache");
table->GetPipelineCacheSize = (PFN_vkGetPipelineCacheSize) gpa(dev, "vkGetPipelineCacheSize");
@@ -84,23 +96,36 @@
table->MergePipelineCaches = (PFN_vkMergePipelineCaches) gpa(dev, "vkMergePipelineCaches");
table->CreateGraphicsPipelines = (PFN_vkCreateGraphicsPipelines) gpa(dev, "vkCreateGraphicsPipelines");
table->CreateComputePipelines = (PFN_vkCreateComputePipelines) gpa(dev, "vkCreateComputePipelines");
+ table->DestroyPipeline = (PFN_vkDestroyPipeline) gpa(dev, "vkDestroyPipeline");
table->CreatePipelineLayout = (PFN_vkCreatePipelineLayout) gpa(dev, "vkCreatePipelineLayout");
+ table->DestroyPipelineLayout = (PFN_vkDestroyPipelineLayout) gpa(dev, "vkDestroyPipelineLayout");
table->CreateSampler = (PFN_vkCreateSampler) gpa(dev, "vkCreateSampler");
+ table->DestroySampler = (PFN_vkDestroySampler) gpa(dev, "vkDestroySampler");
table->CreateDescriptorSetLayout = (PFN_vkCreateDescriptorSetLayout) gpa(dev, "vkCreateDescriptorSetLayout");
+ table->DestroyDescriptorSetLayout = (PFN_vkDestroyDescriptorSetLayout) gpa(dev, "vkDestroyDescriptorSetLayout");
table->CreateDescriptorPool = (PFN_vkCreateDescriptorPool) gpa(dev, "vkCreateDescriptorPool");
+ table->DestroyDescriptorPool = (PFN_vkDestroyDescriptorPool) gpa(dev, "vkDestroyDescriptorPool");
table->ResetDescriptorPool = (PFN_vkResetDescriptorPool) gpa(dev, "vkResetDescriptorPool");
table->AllocDescriptorSets = (PFN_vkAllocDescriptorSets) gpa(dev, "vkAllocDescriptorSets");
table->UpdateDescriptorSets = (PFN_vkUpdateDescriptorSets) gpa(dev, "vkUpdateDescriptorSets");
table->CreateDynamicViewportState = (PFN_vkCreateDynamicViewportState) gpa(dev, "vkCreateDynamicViewportState");
+ table->DestroyDynamicViewportState = (PFN_vkDestroyDynamicViewportState) gpa(dev, "vkDestroyDynamicViewportState");
table->CreateDynamicRasterState = (PFN_vkCreateDynamicRasterState) gpa(dev, "vkCreateDynamicRasterState");
+ table->DestroyDynamicRasterState = (PFN_vkDestroyDynamicRasterState) gpa(dev, "vkDestroyDynamicRasterState");
table->CreateDynamicColorBlendState = (PFN_vkCreateDynamicColorBlendState) gpa(dev, "vkCreateDynamicColorBlendState");
+ table->DestroyDynamicColorBlendState = (PFN_vkDestroyDynamicColorBlendState) gpa(dev, "vkDestroyDynamicColorBlendState");
table->CreateDynamicDepthStencilState = (PFN_vkCreateDynamicDepthStencilState) gpa(dev, "vkCreateDynamicDepthStencilState");
+ table->DestroyDynamicDepthStencilState = (PFN_vkDestroyDynamicDepthStencilState) gpa(dev, "vkDestroyDynamicDepthStencilState");
table->CreateCommandBuffer = (PFN_vkCreateCommandBuffer) gpa(dev, "vkCreateCommandBuffer");
+ table->DestroyCommandBuffer = (PFN_vkDestroyCommandBuffer) gpa(dev, "vkDestroyCommandBuffer");
table->BeginCommandBuffer = (PFN_vkBeginCommandBuffer) gpa(dev, "vkBeginCommandBuffer");
table->EndCommandBuffer = (PFN_vkEndCommandBuffer) gpa(dev, "vkEndCommandBuffer");
table->ResetCommandBuffer = (PFN_vkResetCommandBuffer) gpa(dev, "vkResetCommandBuffer");
table->CmdBindPipeline = (PFN_vkCmdBindPipeline) gpa(dev, "vkCmdBindPipeline");
- table->CmdBindDynamicStateObject = (PFN_vkCmdBindDynamicStateObject) gpa(dev, "vkCmdBindDynamicStateObject");
+ table->CmdBindDynamicViewportState = (PFN_vkCmdBindDynamicViewportState) gpa(dev, "vkCmdBindDynamicViewportState");
+ table->CmdBindDynamicRasterState = (PFN_vkCmdBindDynamicRasterState) gpa(dev, "vkCmdBindDynamicRasterState");
+ table->CmdBindDynamicColorBlendState = (PFN_vkCmdBindDynamicColorBlendState) gpa(dev, "vkCmdBindDynamicColorBlendState");
+ table->CmdBindDynamicDepthStencilState = (PFN_vkCmdBindDynamicDepthStencilState) gpa(dev, "vkCmdBindDynamicDepthStencilState");
table->CmdBindDescriptorSets = (PFN_vkCmdBindDescriptorSets) gpa(dev, "vkCmdBindDescriptorSets");
table->CmdBindVertexBuffers = (PFN_vkCmdBindVertexBuffers) gpa(dev, "vkCmdBindVertexBuffers");
table->CmdBindIndexBuffer = (PFN_vkCmdBindIndexBuffer) gpa(dev, "vkCmdBindIndexBuffer");
@@ -132,7 +157,9 @@
table->CmdWriteTimestamp = (PFN_vkCmdWriteTimestamp) gpa(dev, "vkCmdWriteTimestamp");
table->CmdCopyQueryPoolResults = (PFN_vkCmdCopyQueryPoolResults) gpa(dev, "vkCmdCopyQueryPoolResults");
table->CreateFramebuffer = (PFN_vkCreateFramebuffer) gpa(dev, "vkCreateFramebuffer");
+ table->DestroyFramebuffer = (PFN_vkDestroyFramebuffer) gpa(dev, "vkDestroyFramebuffer");
table->CreateRenderPass = (PFN_vkCreateRenderPass) gpa(dev, "vkCreateRenderPass");
+ table->DestroyRenderPass = (PFN_vkDestroyRenderPass) gpa(dev, "vkDestroyRenderPass");
table->CmdBeginRenderPass = (PFN_vkCmdBeginRenderPass) gpa(dev, "vkCmdBeginRenderPass");
table->CmdNextSubpass = (PFN_vkCmdNextSubpass) gpa(dev, "vkCmdNextSubpass");
table->CmdEndRenderPass = (PFN_vkCmdEndRenderPass) gpa(dev, "vkCmdEndRenderPass");
@@ -180,12 +207,14 @@
return (void *) table->FlushMappedMemoryRanges;
if (!strcmp(name, "InvalidateMappedMemoryRanges"))
return (void *) table->InvalidateMappedMemoryRanges;
- if (!strcmp(name, "DestroyObject"))
- return (void *) table->DestroyObject;
- if (!strcmp(name, "GetObjectMemoryRequirements"))
- return (void *) table->GetObjectMemoryRequirements;
- if (!strcmp(name, "BindObjectMemory"))
- return (void *) table->BindObjectMemory;
+ if (!strcmp(name, "GetBufferMemoryRequirements"))
+ return (void *) table->GetBufferMemoryRequirements;
+ if (!strcmp(name, "GetImageMemoryRequirements"))
+ return (void *) table->GetImageMemoryRequirements;
+ if (!strcmp(name, "BindBufferMemory"))
+ return (void *) table->BindBufferMemory;
+ if (!strcmp(name, "BindImageMemory"))
+ return (void *) table->BindImageMemory;
if (!strcmp(name, "QueueBindSparseBufferMemory"))
return (void *) table->QueueBindSparseBufferMemory;
if (!strcmp(name, "QueueBindSparseImageMemory"))
@@ -196,6 +225,8 @@
return (void *) table->GetImageSparseMemoryRequirements;
if (!strcmp(name, "CreateFence"))
return (void *) table->CreateFence;
+ if (!strcmp(name, "DestroyFence"))
+ return (void *) table->DestroyFence;
if (!strcmp(name, "ResetFences"))
return (void *) table->ResetFences;
if (!strcmp(name, "GetFenceStatus"))
@@ -204,12 +235,16 @@
return (void *) table->WaitForFences;
if (!strcmp(name, "CreateSemaphore"))
return (void *) table->CreateSemaphore;
+ if (!strcmp(name, "DestroySemaphore"))
+ return (void *) table->DestroySemaphore;
if (!strcmp(name, "QueueSignalSemaphore"))
return (void *) table->QueueSignalSemaphore;
if (!strcmp(name, "QueueWaitSemaphore"))
return (void *) table->QueueWaitSemaphore;
if (!strcmp(name, "CreateEvent"))
return (void *) table->CreateEvent;
+ if (!strcmp(name, "DestroyEvent"))
+ return (void *) table->DestroyEvent;
if (!strcmp(name, "GetEventStatus"))
return (void *) table->GetEventStatus;
if (!strcmp(name, "SetEvent"))
@@ -218,24 +253,40 @@
return (void *) table->ResetEvent;
if (!strcmp(name, "CreateQueryPool"))
return (void *) table->CreateQueryPool;
+ if (!strcmp(name, "DestroyQueryPool"))
+ return (void *) table->DestroyQueryPool;
if (!strcmp(name, "GetQueryPoolResults"))
return (void *) table->GetQueryPoolResults;
if (!strcmp(name, "CreateBuffer"))
return (void *) table->CreateBuffer;
+ if (!strcmp(name, "DestroyBuffer"))
+ return (void *) table->DestroyBuffer;
if (!strcmp(name, "CreateBufferView"))
return (void *) table->CreateBufferView;
+ if (!strcmp(name, "DestroyBufferView"))
+ return (void *) table->DestroyBufferView;
if (!strcmp(name, "CreateImage"))
return (void *) table->CreateImage;
+ if (!strcmp(name, "DestroyImage"))
+ return (void *) table->DestroyImage;
if (!strcmp(name, "GetImageSubresourceLayout"))
return (void *) table->GetImageSubresourceLayout;
if (!strcmp(name, "CreateImageView"))
return (void *) table->CreateImageView;
+ if (!strcmp(name, "DestroyImageView"))
+ return (void *) table->DestroyImageView;
if (!strcmp(name, "CreateAttachmentView"))
return (void *) table->CreateAttachmentView;
+ if (!strcmp(name, "DestroyAttachmentView"))
+ return (void *) table->DestroyAttachmentView;
if (!strcmp(name, "CreateShaderModule"))
return (void *) table->CreateShaderModule;
+ if (!strcmp(name, "DestroyShaderModule"))
+ return (void *) table->DestroyShaderModule;
if (!strcmp(name, "CreateShader"))
return (void *) table->CreateShader;
+ if (!strcmp(name, "DestroyShader"))
+ return (void *) table->DestroyShader;
if (!strcmp(name, "CreatePipelineCache"))
return (void*) vkCreatePipelineCache;
if (!strcmp(name, "DestroyPipelineCache"))
@@ -250,14 +301,24 @@
return (void*) vkCreateGraphicsPipelines;
if (!strcmp(name, "CreateComputePipelines"))
return (void*) vkCreateComputePipelines;
+ if (!strcmp(name, "DestroyPipeline"))
+ return (void *) table->DestroyPipeline;
if (!strcmp(name, "CreatePipelineLayout"))
return (void *) table->CreatePipelineLayout;
+ if (!strcmp(name, "DestroyPipelineLayout"))
+ return (void *) table->DestroyPipelineLayout;
if (!strcmp(name, "CreateSampler"))
return (void *) table->CreateSampler;
+ if (!strcmp(name, "DestroySampler"))
+ return (void *) table->DestroySampler;
if (!strcmp(name, "CreateDescriptorSetLayout"))
return (void *) table->CreateDescriptorSetLayout;
+ if (!strcmp(name, "DestroyDescriptorSetLayout"))
+ return (void *) table->DestroyDescriptorSetLayout;
if (!strcmp(name, "CreateDescriptorPool"))
return (void *) table->CreateDescriptorPool;
+ if (!strcmp(name, "DestroyDescriptorPool"))
+ return (void *) table->DestroyDescriptorPool;
if (!strcmp(name, "ResetDescriptorPool"))
return (void *) table->ResetDescriptorPool;
if (!strcmp(name, "AllocDescriptorSets"))
@@ -266,14 +327,24 @@
return (void *) table->UpdateDescriptorSets;
if (!strcmp(name, "CreateDynamicViewportState"))
return (void *) table->CreateDynamicViewportState;
+ if (!strcmp(name, "DestroyDynamicViewportState"))
+ return (void *) table->DestroyDynamicViewportState;
if (!strcmp(name, "CreateDynamicRasterState"))
return (void *) table->CreateDynamicRasterState;
+ if (!strcmp(name, "DestroyDynamicRasterState"))
+ return (void *) table->DestroyDynamicRasterState;
if (!strcmp(name, "CreateDynamicColorBlendState"))
return (void *) table->CreateDynamicColorBlendState;
+ if (!strcmp(name, "DestroyDynamicColorBlendState"))
+ return (void *) table->DestroyDynamicColorBlendState;
if (!strcmp(name, "CreateDynamicDepthStencilState"))
return (void *) table->CreateDynamicDepthStencilState;
+ if (!strcmp(name, "DestroyDynamicDepthStencilState"))
+ return (void *) table->DestroyDynamicDepthStencilState;
if (!strcmp(name, "CreateCommandBuffer"))
return (void *) table->CreateCommandBuffer;
+ if (!strcmp(name, "DestroyCommandBuffer"))
+ return (void *) table->DestroyCommandBuffer;
if (!strcmp(name, "BeginCommandBuffer"))
return (void *) table->BeginCommandBuffer;
if (!strcmp(name, "EndCommandBuffer"))
@@ -282,8 +353,14 @@
return (void *) table->ResetCommandBuffer;
if (!strcmp(name, "CmdBindPipeline"))
return (void *) table->CmdBindPipeline;
- if (!strcmp(name, "CmdBindDynamicStateObject"))
- return (void *) table->CmdBindDynamicStateObject;
+ if (!strcmp(name, "CmdBindDynamicViewportState"))
+ return (void *) table->CmdBindDynamicViewportState;
+ if (!strcmp(name, "CmdBindDynamicRasterState"))
+ return (void *) table->CmdBindDynamicRasterState;
+ if (!strcmp(name, "CmdBindDynamicColorBlendState"))
+ return (void *) table->CmdBindDynamicColorBlendState;
+ if (!strcmp(name, "CmdBindDynamicDepthStencilState"))
+ return (void *) table->CmdBindDynamicDepthStencilState;
if (!strcmp(name, "CmdBindDescriptorSets"))
return (void *) table->CmdBindDescriptorSets;
if (!strcmp(name, "CmdBindVertexBuffers"))
@@ -346,8 +423,12 @@
return (void *) table->CmdCopyQueryPoolResults;
if (!strcmp(name, "CreateFramebuffer"))
return (void *) table->CreateFramebuffer;
+ if (!strcmp(name, "DestroyFramebuffer"))
+ return (void *) table->DestroyFramebuffer;
if (!strcmp(name, "CreateRenderPass"))
return (void *) table->CreateRenderPass;
+ if (!strcmp(name, "DestroyRenderPass"))
+ return (void *) table->DestroyRenderPass;
if (!strcmp(name, "CmdBeginRenderPass"))
return (void *) table->CmdBeginRenderPass;
if (!strcmp(name, "CmdNextSubpass"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index baa7bd1..dbd134f 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -420,31 +420,40 @@
return disp->InvalidateMappedMemoryRanges(device, memRangeCount, pMemRanges);
}
-LOADER_EXPORT VkResult VKAPI vkDestroyObject(VkDevice device, VkObjectType objType, VkObject object)
+LOADER_EXPORT VkResult VKAPI vkGetBufferMemoryRequirements(VkDevice device, VkBuffer buffer, VkMemoryRequirements* pMemoryRequirements)
{
const VkLayerDispatchTable *disp;
disp = loader_get_dispatch(device);
- return disp->DestroyObject(device, objType, object);
+ return disp->GetBufferMemoryRequirements(device, buffer, pMemoryRequirements);
}
-LOADER_EXPORT VkResult VKAPI vkGetObjectMemoryRequirements(VkDevice device, VkObjectType objType, VkObject object, VkMemoryRequirements* pMemoryRequirements)
+LOADER_EXPORT VkResult VKAPI vkGetImageMemoryRequirements(VkDevice device, VkImage image, VkMemoryRequirements* pMemoryRequirements)
{
const VkLayerDispatchTable *disp;
disp = loader_get_dispatch(device);
- return disp->GetObjectMemoryRequirements(device, objType, object, pMemoryRequirements);
+ return disp->GetImageMemoryRequirements(device, image, pMemoryRequirements);
}
-LOADER_EXPORT VkResult VKAPI vkBindObjectMemory(VkDevice device, VkObjectType objType, VkObject object, VkDeviceMemory mem, VkDeviceSize offset)
+LOADER_EXPORT VkResult VKAPI vkBindBufferMemory(VkDevice device, VkBuffer buffer, VkDeviceMemory mem, VkDeviceSize offset)
{
const VkLayerDispatchTable *disp;
disp = loader_get_dispatch(device);
- return disp->BindObjectMemory(device, objType, object, mem, offset);
+ return disp->BindBufferMemory(device, buffer, mem, offset);
+}
+
+LOADER_EXPORT VkResult VKAPI vkBindImageMemory(VkDevice device, VkImage image, VkDeviceMemory mem, VkDeviceSize offset)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->BindImageMemory(device, image, mem, offset);
}
LOADER_EXPORT VkResult VKAPI vkGetImageSparseMemoryRequirements(VkDevice device, VkImage image, uint32_t* pNumRequirements, VkSparseImageMemoryRequirements* pSparseMemoryRequirements)
@@ -501,6 +510,15 @@
return disp->CreateFence(device, pCreateInfo, pFence);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyFence(VkDevice device, VkFence fence)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyFence(device, fence);
+}
+
LOADER_EXPORT VkResult VKAPI vkResetFences(VkDevice device, uint32_t fenceCount, const VkFence* pFences)
{
const VkLayerDispatchTable *disp;
@@ -537,6 +555,15 @@
return disp->CreateSemaphore(device, pCreateInfo, pSemaphore);
}
+LOADER_EXPORT VkResult VKAPI vkDestroySemaphore(VkDevice device, VkSemaphore semaphore)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroySemaphore(device, semaphore);
+}
+
LOADER_EXPORT VkResult VKAPI vkQueueSignalSemaphore(VkQueue queue, VkSemaphore semaphore)
{
const VkLayerDispatchTable *disp;
@@ -564,6 +591,15 @@
return disp->CreateEvent(device, pCreateInfo, pEvent);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyEvent(VkDevice device, VkEvent event)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyEvent(device, event);
+}
+
LOADER_EXPORT VkResult VKAPI vkGetEventStatus(VkDevice device, VkEvent event)
{
const VkLayerDispatchTable *disp;
@@ -600,6 +636,15 @@
return disp->CreateQueryPool(device, pCreateInfo, pQueryPool);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyQueryPool(VkDevice device, VkQueryPool queryPool)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyQueryPool(device, queryPool);
+}
+
LOADER_EXPORT VkResult VKAPI vkGetQueryPoolResults(VkDevice device, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, size_t* pDataSize, void* pData, VkQueryResultFlags flags)
{
const VkLayerDispatchTable *disp;
@@ -618,6 +663,15 @@
return disp->CreateBuffer(device, pCreateInfo, pBuffer);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyBuffer(device, buffer);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, VkBufferView* pView)
{
const VkLayerDispatchTable *disp;
@@ -627,6 +681,15 @@
return disp->CreateBufferView(device, pCreateInfo, pView);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyBufferView(VkDevice device, VkBufferView bufferView)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyBufferView(device, bufferView);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, VkImage* pImage)
{
const VkLayerDispatchTable *disp;
@@ -636,6 +699,15 @@
return disp->CreateImage(device, pCreateInfo, pImage);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyImage(VkDevice device, VkImage image)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyImage(device, image);
+}
+
LOADER_EXPORT VkResult VKAPI vkGetImageSubresourceLayout(VkDevice device, VkImage image, const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout)
{
const VkLayerDispatchTable *disp;
@@ -654,6 +726,15 @@
return disp->CreateImageView(device, pCreateInfo, pView);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyImageView(VkDevice device, VkImageView imageView)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyImageView(device, imageView);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateAttachmentView(VkDevice device, const VkAttachmentViewCreateInfo* pCreateInfo, VkAttachmentView* pView)
{
const VkLayerDispatchTable *disp;
@@ -663,6 +744,15 @@
return disp->CreateAttachmentView(device, pCreateInfo, pView);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyAttachmentView(VkDevice device, VkAttachmentView attachmentView)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyAttachmentView(device, attachmentView);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateShaderModule(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, VkShaderModule* pShader)
{
const VkLayerDispatchTable *disp;
@@ -672,6 +762,15 @@
return disp->CreateShaderModule(device, pCreateInfo, pShader);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyShaderModule(device, shaderModule);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateShader(VkDevice device, const VkShaderCreateInfo* pCreateInfo, VkShader* pShader)
{
const VkLayerDispatchTable *disp;
@@ -681,6 +780,15 @@
return disp->CreateShader(device, pCreateInfo, pShader);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyShader(VkDevice device, VkShader shader)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyShader(device, shader);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreatePipelineCache(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, VkPipelineCache* pPipelineCache)
{
const VkLayerDispatchTable *disp;
@@ -744,6 +852,15 @@
return disp->CreateComputePipelines(device, pipelineCache, count, pCreateInfos, pPipelines);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyPipeline(VkDevice device, VkPipeline pipeline)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyPipeline(device, pipeline);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, VkPipelineLayout* pPipelineLayout)
{
const VkLayerDispatchTable *disp;
@@ -753,6 +870,15 @@
return disp->CreatePipelineLayout(device, pCreateInfo, pPipelineLayout);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyPipelineLayout(VkDevice device, VkPipelineLayout pipelineLayout)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyPipelineLayout(device, pipelineLayout);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, VkSampler* pSampler)
{
const VkLayerDispatchTable *disp;
@@ -762,6 +888,16 @@
return disp->CreateSampler(device, pCreateInfo, pSampler);
}
+LOADER_EXPORT VkResult VKAPI vkDestroySampler(VkDevice device, VkSampler sampler)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroySampler(device, sampler);
+}
+
+
LOADER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayout* pSetLayout)
{
const VkLayerDispatchTable *disp;
@@ -771,6 +907,15 @@
return disp->CreateDescriptorSetLayout(device, pCreateInfo, pSetLayout);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLayout descriptorSetLayout)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyDescriptorSetLayout(device, descriptorSetLayout);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool)
{
const VkLayerDispatchTable *disp;
@@ -780,6 +925,16 @@
return disp->CreateDescriptorPool(device, poolUsage, maxSets, pCreateInfo, pDescriptorPool);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyDescriptorPool(device, descriptorPool);
+}
+
+
LOADER_EXPORT VkResult VKAPI vkResetDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool)
{
const VkLayerDispatchTable *disp;
@@ -807,7 +962,7 @@
return disp->UpdateDescriptorSets(device, writeCount, pDescriptorWrites, copyCount, pDescriptorCopies);
}
-LOADER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpState* pState)
+LOADER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, const VkDynamicViewportStateCreateInfo* pCreateInfo, VkDynamicViewportState* pState)
{
const VkLayerDispatchTable *disp;
@@ -816,7 +971,16 @@
return disp->CreateDynamicViewportState(device, pCreateInfo, pState);
}
-LOADER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsState* pState)
+LOADER_EXPORT VkResult VKAPI vkDestroyDynamicViewportState(VkDevice device, VkDynamicViewportState dynamicViewportState)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyDynamicViewportState(device, dynamicViewportState);
+}
+
+LOADER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const VkDynamicRasterStateCreateInfo* pCreateInfo, VkDynamicRasterState* pState)
{
const VkLayerDispatchTable *disp;
@@ -825,7 +989,16 @@
return disp->CreateDynamicRasterState(device, pCreateInfo, pState);
}
-LOADER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, VkDynamicCbState* pState)
+LOADER_EXPORT VkResult VKAPI vkDestroyDynamicRasterState(VkDevice device, VkDynamicRasterState dynamicRasterState)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyDynamicRasterState(device, dynamicRasterState);
+}
+
+LOADER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, const VkDynamicColorBlendStateCreateInfo* pCreateInfo, VkDynamicColorBlendState* pState)
{
const VkLayerDispatchTable *disp;
@@ -834,7 +1007,16 @@
return disp->CreateDynamicColorBlendState(device, pCreateInfo, pState);
}
-LOADER_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, VkDynamicDsState* pState)
+LOADER_EXPORT VkResult VKAPI vkDestroyDynamicColorBlendState(VkDevice device, VkDynamicColorBlendState dynamicColorBlendState)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyDynamicColorBlendState(device, dynamicColorBlendState);
+}
+
+LOADER_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState(VkDevice device, const VkDynamicDepthStencilStateCreateInfo* pCreateInfo, VkDynamicDepthStencilState* pState)
{
const VkLayerDispatchTable *disp;
@@ -843,6 +1025,15 @@
return disp->CreateDynamicDepthStencilState(device, pCreateInfo, pState);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyDynamicDepthStencilState(VkDevice device, VkDynamicDepthStencilState dynamicDepthStencilState)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyDynamicDepthStencilState(device, dynamicDepthStencilState);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateCommandBuffer(VkDevice device, const VkCmdBufferCreateInfo* pCreateInfo, VkCmdBuffer* pCmdBuffer)
{
const VkLayerDispatchTable *disp;
@@ -858,6 +1049,15 @@
return res;
}
+LOADER_EXPORT VkResult VKAPI vkDestroyCommandBuffer(VkDevice device, VkCmdBuffer cmdBuffer)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyCommandBuffer(device, cmdBuffer);
+}
+
LOADER_EXPORT VkResult VKAPI vkBeginCommandBuffer(VkCmdBuffer cmdBuffer, const VkCmdBufferBeginInfo* pBeginInfo)
{
const VkLayerDispatchTable *disp;
@@ -894,13 +1094,40 @@
disp->CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline);
}
-LOADER_EXPORT void VKAPI vkCmdBindDynamicStateObject(VkCmdBuffer cmdBuffer, VkStateBindPoint stateBindPoint, VkDynamicStateObject state)
+LOADER_EXPORT void VKAPI vkCmdBindDynamicViewportState(VkCmdBuffer cmdBuffer, VkDynamicViewportState state)
{
const VkLayerDispatchTable *disp;
disp = loader_get_dispatch(cmdBuffer);
- disp->CmdBindDynamicStateObject(cmdBuffer, stateBindPoint, state);
+ disp->CmdBindDynamicViewportState(cmdBuffer, state);
+}
+
+LOADER_EXPORT void VKAPI vkCmdBindDynamicRasterState(VkCmdBuffer cmdBuffer, VkDynamicRasterState state)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(cmdBuffer);
+
+ disp->CmdBindDynamicRasterState(cmdBuffer, state);
+}
+
+LOADER_EXPORT void VKAPI vkCmdBindDynamicColorBlendState(VkCmdBuffer cmdBuffer, VkDynamicColorBlendState state)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(cmdBuffer);
+
+ disp->CmdBindDynamicColorBlendState(cmdBuffer, state);
+}
+
+LOADER_EXPORT void VKAPI vkCmdBindDynamicDepthStencilState(VkCmdBuffer cmdBuffer, VkDynamicDepthStencilState state)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(cmdBuffer);
+
+ disp->CmdBindDynamicDepthStencilState(cmdBuffer, state);
}
LOADER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets)
@@ -1182,6 +1409,15 @@
return disp->CreateFramebuffer(device, pCreateInfo, pFramebuffer);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyFramebuffer(VkDevice device, VkFramebuffer framebuffer)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyFramebuffer(device, framebuffer);
+}
+
LOADER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass)
{
const VkLayerDispatchTable *disp;
@@ -1191,6 +1427,15 @@
return disp->CreateRenderPass(device, pCreateInfo, pRenderPass);
}
+LOADER_EXPORT VkResult VKAPI vkDestroyRenderPass(VkDevice device, VkRenderPass renderPass)
+{
+ const VkLayerDispatchTable *disp;
+
+ disp = loader_get_dispatch(device);
+
+ return disp->DestroyRenderPass(device, renderPass);
+}
+
LOADER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents)
{
const VkLayerDispatchTable *disp;
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index a692cda..fc27779 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -106,12 +106,19 @@
VkCmdBuffer m_cmdBuffer;
VkRenderPass m_renderPass;
VkFramebuffer m_framebuffer;
+<<<<<<< HEAD
std::vector<VkClearValue> m_renderPassClearValues;
VkRenderPassBeginInfo m_renderPassBeginInfo;
VkDynamicRsState m_stateRaster;
VkDynamicCbState m_colorBlend;
VkDynamicVpState m_stateViewport;
VkDynamicDsState m_stateDepthStencil;
+=======
+ VkDynamicRasterState m_stateRaster;
+ VkDynamicColorBlendState m_colorBlend;
+ VkDynamicViewportState m_stateViewport;
+ VkDynamicDepthStencilState m_stateDepthStencil;
+>>>>>>> Bug 14084 - Improve type safety and remove polymorphism
vector<VkImageObj*> m_renderTargets;
float m_width, m_height;
VkFormat m_render_target_fmt;
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index 2c16b5e..70483e7 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -790,14 +790,14 @@
NON_DISPATCHABLE_HANDLE_DTOR(DynamicViewportState, vkDestroyObject, VK_OBJECT_TYPE_DYNAMIC_VP_STATE)
-void DynamicViewportState::init(const Device &dev, const VkDynamicVpStateCreateInfo &info)
+void DynamicViewportState::init(const Device &dev, const VkDynamicViewportStateCreateInfo &info)
{
NON_DISPATCHABLE_HANDLE_INIT(vkCreateDynamicViewportState, dev, &info);
}
NON_DISPATCHABLE_HANDLE_DTOR(DynamicRasterState, vkDestroyObject, VK_OBJECT_TYPE_DYNAMIC_RS_STATE)
-void DynamicRasterState::init(const Device &dev, const VkDynamicRsStateCreateInfo &info)
+void DynamicRasterState::init(const Device &dev, const VkDynamicRasterStateCreateInfo &info)
{
NON_DISPATCHABLE_HANDLE_INIT(vkCreateDynamicRasterState, dev, &info);
}
@@ -811,7 +811,7 @@
NON_DISPATCHABLE_HANDLE_DTOR(DynamicDepthStencilState, vkDestroyObject, VK_OBJECT_TYPE_DYNAMIC_DS_STATE)
-void DynamicDepthStencilState::init(const Device &dev, const VkDynamicDsStateCreateInfo &info)
+void DynamicDepthStencilState::init(const Device &dev, const VkDynamicDepthStencilStateCreateInfo &info)
{
NON_DISPATCHABLE_HANDLE_INIT(vkCreateDynamicDepthStencilState, dev, &info);
}
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 592948d..8480890 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -542,36 +542,36 @@
explicit DescriptorSet(const Device &dev, VkDescriptorSet set) : NonDispHandle(dev.handle(), set) {}
};
-class DynamicViewportState : public internal::NonDispHandle<VkDynamicVpState> {
+class DynamicViewportState : public internal::NonDispHandle<VkDynamicViewportState> {
public:
~DynamicViewportState();
// vkCreateDynamicViewportState()
- void init(const Device &dev, const VkDynamicVpStateCreateInfo &info);
+ void init(const Device &dev, const VkDynamicViewportStateCreateInfo &info);
};
-class DynamicRasterState : public internal::NonDispHandle<VkDynamicRsState> {
+class DynamicRasterState : public internal::NonDispHandle<VkDynamicRasterState> {
public:
~DynamicRasterState();
// vkCreateDynamicRasterState()
- void init(const Device &dev, const VkDynamicRsStateCreateInfo &info);
+ void init(const Device &dev, const VkDynamicRasterStateCreateInfo &info);
};
-class DynamicColorBlendState : public internal::NonDispHandle<VkDynamicCbState> {
+class DynamicColorBlendState : public internal::NonDispHandle<VkDynamicColorBlendState> {
public:
~DynamicColorBlendState();
// vkCreateDynamicColorBlendState()
- void init(const Device &dev, const VkDynamicCbStateCreateInfo &info);
+ void init(const Device &dev, const VkDynamicColorBlendStateCreateInfo &info);
};
-class DynamicDepthStencilState : public internal::NonDispHandle<VkDynamicDsState> {
+class DynamicDepthStencilState : public internal::NonDispHandle<VkDynamicDepthStencilState> {
public:
~DynamicDepthStencilState();
// vkCreateDynamicDepthStencilState()
- void init(const Device &dev, const VkDynamicDsStateCreateInfo &info);
+ void init(const Device &dev, const VkDynamicDepthStencilStateCreateInfo &info);
};
class CmdBuffer : public internal::Handle<VkCmdBuffer> {
diff --git a/vulkan.py b/vulkan.py
index 123fccf..dd81631 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -189,7 +189,6 @@
"VkDevice",
"VkQueue",
"VkDeviceMemory",
- "VkObject",
"VkBuffer",
"VkBufferView",
"VkImage",
@@ -203,11 +202,10 @@
"VkDescriptorSetLayout",
"VkPipelineLayout",
"VkDescriptorPool",
- "VkDynamicStateObject",
- "VkDynamicVpState",
- "VkDynamicRsState",
- "VkDynamicCbState",
- "VkDynamicDsState",
+ "VkDynamicViewportState",
+ "VkDynamicRasterState",
+ "VkDynamicColorBlendState",
+ "VkDynamicDepthStencilState",
"VkCmdBuffer",
"VkFence",
"VkSemaphore",
@@ -349,21 +347,25 @@
Param("uint32_t", "memRangeCount"),
Param("const VkMappedMemoryRange*", "pMemRanges")]),
- Proto("VkResult", "DestroyObject",
+ Proto("VkResult", "GetBufferMemoryRequirements",
[Param("VkDevice", "device"),
- Param("VkObjectType", "objType"),
- Param("VkObject", "object")]),
-
- Proto("VkResult", "GetObjectMemoryRequirements",
- [Param("VkDevice", "device"),
- Param("VkObjectType", "objType"),
- Param("VkObject", "object"),
+ Param("VkBuffer", "buffer"),
Param("VkMemoryRequirements*", "pMemoryRequirements")]),
- Proto("VkResult", "BindObjectMemory",
+ Proto("VkResult", "GetImageMemoryRequirements",
[Param("VkDevice", "device"),
- Param("VkObjectType", "objType"),
- Param("VkObject", "object"),
+ Param("VkImage", "image"),
+ Param("VkMemoryRequirements*", "pMemoryRequirements")]),
+
+ Proto("VkResult", "BindBufferMemory",
+ [Param("VkDevice", "device"),
+ Param("VkBuffer", "buffer"),
+ Param("VkDeviceMemory", "mem"),
+ Param("VkDeviceSize", "offset")]),
+
+ Proto("VkResult", "BindImageMemory",
+ [Param("VkDevice", "device"),
+ Param("VkImage", "image"),
Param("VkDeviceMemory", "mem"),
Param("VkDeviceSize", "offset")]),
@@ -406,6 +408,10 @@
Param("const VkFenceCreateInfo*", "pCreateInfo"),
Param("VkFence*", "pFence")]),
+ Proto("VkResult", "DestroyFence",
+ [Param("VkDevice", "device"),
+ Param("VkFence", "fence")]),
+
Proto("VkResult", "ResetFences",
[Param("VkDevice", "device"),
Param("uint32_t", "fenceCount"),
@@ -427,6 +433,10 @@
Param("const VkSemaphoreCreateInfo*", "pCreateInfo"),
Param("VkSemaphore*", "pSemaphore")]),
+ Proto("VkResult", "DestroySemaphore",
+ [Param("VkDevice", "device"),
+ Param("VkSemaphore", "semaphore")]),
+
Proto("VkResult", "QueueSignalSemaphore",
[Param("VkQueue", "queue"),
Param("VkSemaphore", "semaphore")]),
@@ -440,6 +450,10 @@
Param("const VkEventCreateInfo*", "pCreateInfo"),
Param("VkEvent*", "pEvent")]),
+ Proto("VkResult", "DestroyEvent",
+ [Param("VkDevice", "device"),
+ Param("VkEvent", "event")]),
+
Proto("VkResult", "GetEventStatus",
[Param("VkDevice", "device"),
Param("VkEvent", "event")]),
@@ -457,6 +471,10 @@
Param("const VkQueryPoolCreateInfo*", "pCreateInfo"),
Param("VkQueryPool*", "pQueryPool")]),
+ Proto("VkResult", "DestroyQueryPool",
+ [Param("VkDevice", "device"),
+ Param("VkQueryPool", "queryPool")]),
+
Proto("VkResult", "GetQueryPoolResults",
[Param("VkDevice", "device"),
Param("VkQueryPool", "queryPool"),
@@ -471,16 +489,28 @@
Param("const VkBufferCreateInfo*", "pCreateInfo"),
Param("VkBuffer*", "pBuffer")]),
+ Proto("VkResult", "DestroyBuffer",
+ [Param("VkDevice", "device"),
+ Param("VkBuffer", "buffer")]),
+
Proto("VkResult", "CreateBufferView",
[Param("VkDevice", "device"),
Param("const VkBufferViewCreateInfo*", "pCreateInfo"),
Param("VkBufferView*", "pView")]),
+ Proto("VkResult", "DestroyBufferView",
+ [Param("VkDevice", "device"),
+ Param("VkBufferView", "bufferView")]),
+
Proto("VkResult", "CreateImage",
[Param("VkDevice", "device"),
Param("const VkImageCreateInfo*", "pCreateInfo"),
Param("VkImage*", "pImage")]),
+ Proto("VkResult", "DestroyImage",
+ [Param("VkDevice", "device"),
+ Param("VkImage", "image")]),
+
Proto("VkResult", "GetImageSubresourceLayout",
[Param("VkDevice", "device"),
Param("VkImage", "image"),
@@ -492,21 +522,37 @@
Param("const VkImageViewCreateInfo*", "pCreateInfo"),
Param("VkImageView*", "pView")]),
+ Proto("VkResult", "DestroyImageView",
+ [Param("VkDevice", "device"),
+ Param("VkImageView", "imageView")]),
+
Proto("VkResult", "CreateAttachmentView",
[Param("VkDevice", "device"),
Param("const VkAttachmentViewCreateInfo*", "pCreateInfo"),
Param("VkAttachmentView*", "pView")]),
+ Proto("VkResult", "DestroyAttachmentView",
+ [Param("VkDevice", "device"),
+ Param("VkAttachmentView", "attachmentView")]),
+
Proto("VkResult", "CreateShaderModule",
[Param("VkDevice", "device"),
Param("const VkShaderModuleCreateInfo*", "pCreateInfo"),
Param("VkShaderModule*", "pShaderModule")]),
+ Proto("VkResult", "DestroyShaderModule",
+ [Param("VkDevice", "device"),
+ Param("VkShaderModule", "shaderModule")]),
+
Proto("VkResult", "CreateShader",
[Param("VkDevice", "device"),
Param("const VkShaderCreateInfo*", "pCreateInfo"),
Param("VkShader*", "pShader")]),
+ Proto("VkResult", "DestroyShader",
+ [Param("VkDevice", "device"),
+ Param("VkShader", "shader")]),
+
Proto("VkResult", "CreatePipelineCache",
[Param("VkDevice", "device"),
Param("const VkPipelineCacheCreateInfo*", "pCreateInfo"),
@@ -545,21 +591,37 @@
Param("const VkComputePipelineCreateInfo*", "pCreateInfos"),
Param("VkPipeline*", "pPipelines")]),
+ Proto("VkResult", "DestroyPipeline",
+ [Param("VkDevice", "device"),
+ Param("VkPipeline", "pipeline")]),
+
Proto("VkResult", "CreatePipelineLayout",
[Param("VkDevice", "device"),
Param("const VkPipelineLayoutCreateInfo*", "pCreateInfo"),
Param("VkPipelineLayout*", "pPipelineLayout")]),
+ Proto("VkResult", "DestroyPipelineLayout",
+ [Param("VkDevice", "device"),
+ Param("VkPipelineLayout", "pipelineLayout")]),
+
Proto("VkResult", "CreateSampler",
[Param("VkDevice", "device"),
Param("const VkSamplerCreateInfo*", "pCreateInfo"),
Param("VkSampler*", "pSampler")]),
+ Proto("VkResult", "DestroySampler",
+ [Param("VkDevice", "device"),
+ Param("VkSampler", "sampler")]),
+
Proto("VkResult", "CreateDescriptorSetLayout",
[Param("VkDevice", "device"),
Param("const VkDescriptorSetLayoutCreateInfo*", "pCreateInfo"),
Param("VkDescriptorSetLayout*", "pSetLayout")]),
+ Proto("VkResult", "DestroyDescriptorSetLayout",
+ [Param("VkDevice", "device"),
+ Param("VkDescriptorSetLayout", "descriptorSetLayout")]),
+
Proto("VkResult", "CreateDescriptorPool",
[Param("VkDevice", "device"),
Param("VkDescriptorPoolUsage", "poolUsage"),
@@ -567,6 +629,10 @@
Param("const VkDescriptorPoolCreateInfo*", "pCreateInfo"),
Param("VkDescriptorPool*", "pDescriptorPool")]),
+ Proto("VkResult", "DestroyDescriptorPool",
+ [Param("VkDevice", "device"),
+ Param("VkDescriptorPool", "descriptorPool")]),
+
Proto("VkResult", "ResetDescriptorPool",
[Param("VkDevice", "device"),
Param("VkDescriptorPool", "descriptorPool")]),
@@ -589,29 +655,49 @@
Proto("VkResult", "CreateDynamicViewportState",
[Param("VkDevice", "device"),
- Param("const VkDynamicVpStateCreateInfo*", "pCreateInfo"),
- Param("VkDynamicVpState*", "pState")]),
+ Param("const VkDynamicViewportStateCreateInfo*", "pCreateInfo"),
+ Param("VkDynamicViewportState*", "pState")]),
+
+ Proto("VkResult", "DestroyDynamicViewportState",
+ [Param("VkDevice", "device"),
+ Param("VkDynamicViewportState", "dynamicViewportState")]),
Proto("VkResult", "CreateDynamicRasterState",
[Param("VkDevice", "device"),
- Param("const VkDynamicRsStateCreateInfo*", "pCreateInfo"),
- Param("VkDynamicRsState*", "pState")]),
+ Param("const VkDynamicRasterStateCreateInfo*", "pCreateInfo"),
+ Param("VkDynamicRasterState*", "pState")]),
+
+ Proto("VkResult", "DestroyDynamicRasterState",
+ [Param("VkDevice", "device"),
+ Param("VkDynamicRasterState", "dynamicRasterState")]),
Proto("VkResult", "CreateDynamicColorBlendState",
[Param("VkDevice", "device"),
- Param("const VkDynamicCbStateCreateInfo*", "pCreateInfo"),
- Param("VkDynamicCbState*", "pState")]),
+ Param("const VkDynamicColorBlendStateCreateInfo*", "pCreateInfo"),
+ Param("VkDynamicColorBlendState*", "pState")]),
+
+ Proto("VkResult", "DestroyDynamicColorBlendState",
+ [Param("VkDevice", "device"),
+ Param("VkDynamicColorBlendState", "dynamicColorBlendState")]),
Proto("VkResult", "CreateDynamicDepthStencilState",
[Param("VkDevice", "device"),
- Param("const VkDynamicDsStateCreateInfo*", "pCreateInfo"),
- Param("VkDynamicDsState*", "pState")]),
+ Param("const VkDynamicDepthStencilStateCreateInfo*", "pCreateInfo"),
+ Param("VkDynamicDepthStencilState*", "pState")]),
+
+ Proto("VkResult", "DestroyDynamicDepthStencilState",
+ [Param("VkDevice", "device"),
+ Param("VkDynamicDepthStencilState", "dynamicDepthStencilState")]),
Proto("VkResult", "CreateCommandBuffer",
[Param("VkDevice", "device"),
Param("const VkCmdBufferCreateInfo*", "pCreateInfo"),
Param("VkCmdBuffer*", "pCmdBuffer")]),
+ Proto("VkResult", "DestroyCommandBuffer",
+ [Param("VkDevice", "device"),
+ Param("VkCmdBuffer", "cmdBuffer")]),
+
Proto("VkResult", "BeginCommandBuffer",
[Param("VkCmdBuffer", "cmdBuffer"),
Param("const VkCmdBufferBeginInfo*", "pBeginInfo")]),
@@ -627,10 +713,21 @@
Param("VkPipelineBindPoint", "pipelineBindPoint"),
Param("VkPipeline", "pipeline")]),
- Proto("void", "CmdBindDynamicStateObject",
+ Proto("void", "CmdBindDynamicViewportState",
[Param("VkCmdBuffer", "cmdBuffer"),
- Param("VkStateBindPoint", "stateBindPoint"),
- Param("VkDynamicStateObject", "state")]),
+ Param("VkDynamicViewportState", "dynamicViewportState")]),
+
+ Proto("void", "CmdBindDynamicRasterState",
+ [Param("VkCmdBuffer", "cmdBuffer"),
+ Param("VkDynamicRasterState", "dynamicRasterState")]),
+
+ Proto("void", "CmdBindDynamicColorBlendState",
+ [Param("VkCmdBuffer", "cmdBuffer"),
+ Param("VkDynamicColorBlendState", "dynamicColorBlendState")]),
+
+ Proto("void", "CmdBindDynamicDepthStencilState",
+ [Param("VkCmdBuffer", "cmdBuffer"),
+ Param("VkDynamicDepthStencilState", "dynamicDepthStencilState")]),
Proto("void", "CmdBindDescriptorSets",
[Param("VkCmdBuffer", "cmdBuffer"),
@@ -649,7 +746,6 @@
Param("const VkBuffer*", "pBuffers"),
Param("const VkDeviceSize*", "pOffsets")]),
-
Proto("void", "CmdBindIndexBuffer",
[Param("VkCmdBuffer", "cmdBuffer"),
Param("VkBuffer", "buffer"),
@@ -860,11 +956,19 @@
Param("const VkFramebufferCreateInfo*", "pCreateInfo"),
Param("VkFramebuffer*", "pFramebuffer")]),
+ Proto("VkResult", "DestroyFramebuffer",
+ [Param("VkDevice", "device"),
+ Param("VkFramebuffer", "framebuffer")]),
+
Proto("VkResult", "CreateRenderPass",
[Param("VkDevice", "device"),
Param("const VkRenderPassCreateInfo*", "pCreateInfo"),
Param("VkRenderPass*", "pRenderPass")]),
+ Proto("VkResult", "DestroyRenderPass",
+ [Param("VkDevice", "device"),
+ Param("VkRenderPass", "renderPass")]),
+
Proto("void", "CmdBeginRenderPass",
[Param("VkCmdBuffer", "cmdBuffer"),
Param("const VkRenderPassBeginInfo*", "pRenderPassBegin"),
@@ -933,7 +1037,6 @@
"VkDevice",
"VkQueue",
"VkDeviceMemory",
- "VkObject"
]
object_list = [
@@ -961,16 +1064,14 @@
]
object_dynamic_state_list = [
- "VkDynamicVpState",
- "VkDynamicRsState",
- "VkDynamicCbState",
- "VkDynamicDsState"
+ "VkDynamicViewportState",
+ "VkDynamicRasterState",
+ "VkDynamicColorBlendState",
+ "VkDynamicDepthStencilState"
]
object_type_list = object_root_list + object_base_list + object_list + object_dynamic_state_list
-object_parent_list = ["VkObject", "VkDynamicStateObject"]
-
headers = []
objects = []
protos = []