From 5e6d1e9a676e9d6d69836d84fd7921ad1167cf9a Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Fri, 10 Apr 2015 16:24:50 -0600 Subject: [PATCH] vulkan: Naming beautification - remove "Object" from the name of VkDynamic*State objects. (no other leaf classes have "Object" in the name). - fix some minor spacing issues git-svn-id: https://cvs.khronos.org/svn/repos/oglc/trunk/nextgen/XGL@30120 e7fa87d3-cd2b-0410-9028-fcbf551c1848 --- demos/cube.c | 8 ++++---- demos/tri.c | 8 ++++---- icd/nulldrv/nulldrv.c | 8 ++++---- include/vulkan.h | 26 +++++++++++++------------- layers/draw_state.cpp | 8 ++++---- layers/mem_tracker.cpp | 8 ++++---- layers/object_track.h | 16 ++++++++-------- layers/param_checker.cpp | 8 ++++---- vulkan.py | 24 ++++++++++++------------ 9 files changed, 57 insertions(+), 57 deletions(-) diff --git a/demos/cube.c b/demos/cube.c index 5faae4b..2fcc207 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -247,10 +247,10 @@ struct demo { VkDescriptorSetLayout desc_layout; VkPipeline pipeline; - VkDynamicVpStateObject viewport; - VkDynamicRsStateObject raster; - VkDynamicCbStateObject color_blend; - VkDynamicDsStateObject depth_stencil; + VkDynamicVpState viewport; + VkDynamicRsState raster; + VkDynamicCbState color_blend; + VkDynamicDsState depth_stencil; mat4x4 projection_matrix; mat4x4 view_matrix; diff --git a/demos/tri.c b/demos/tri.c index f81ffbd..005532d 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -82,10 +82,10 @@ struct demo { VkDescriptorSetLayout desc_layout; VkPipeline pipeline; - VkDynamicVpStateObject viewport; - VkDynamicRsStateObject raster; - VkDynamicCbStateObject color_blend; - VkDynamicDsStateObject depth_stencil; + VkDynamicVpState viewport; + VkDynamicRsState raster; + VkDynamicCbState color_blend; + VkDynamicDsState depth_stencil; VkDescriptorPool desc_pool; VkDescriptorSet desc_set; diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 12e7364..4d72b51 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -1819,7 +1819,7 @@ ICD_EXPORT VkResult VKAPI vkCreateShader( ICD_EXPORT VkResult VKAPI vkCreateDynamicViewportState( VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, - VkDynamicVpStateObject* pState) + VkDynamicVpState* pState) { NULLDRV_LOG_FUNC; struct nulldrv_dev *dev = nulldrv_dev(device); @@ -1831,7 +1831,7 @@ ICD_EXPORT VkResult VKAPI vkCreateDynamicViewportState( ICD_EXPORT VkResult VKAPI vkCreateDynamicRasterState( VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, - VkDynamicRsStateObject* pState) + VkDynamicRsState* pState) { NULLDRV_LOG_FUNC; struct nulldrv_dev *dev = nulldrv_dev(device); @@ -1843,7 +1843,7 @@ ICD_EXPORT VkResult VKAPI vkCreateDynamicRasterState( ICD_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState( VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, - VkDynamicCbStateObject* pState) + VkDynamicCbState* pState) { NULLDRV_LOG_FUNC; struct nulldrv_dev *dev = nulldrv_dev(device); @@ -1855,7 +1855,7 @@ ICD_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState( ICD_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState( VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, - VkDynamicDsStateObject* pState) + VkDynamicDsState* pState) { NULLDRV_LOG_FUNC; struct nulldrv_dev *dev = nulldrv_dev(device); diff --git a/include/vulkan.h b/include/vulkan.h index 09a1461..8cf7b10 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -33,7 +33,7 @@ #include "vk_platform.h" // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 71, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 72, 0) #ifdef __cplusplus extern "C" @@ -75,10 +75,10 @@ VK_DEFINE_SUBCLASS_HANDLE(VkDescriptorSetLayout, VkObject) VK_DEFINE_SUBCLASS_HANDLE(VkDescriptorSetLayoutChain, VkObject) VK_DEFINE_SUBCLASS_HANDLE(VkDescriptorPool, VkObject) VK_DEFINE_SUBCLASS_HANDLE(VkDynamicStateObject, VkObject) -VK_DEFINE_SUBCLASS_HANDLE(VkDynamicVpStateObject, VkDynamicStateObject) -VK_DEFINE_SUBCLASS_HANDLE(VkDynamicRsStateObject, VkDynamicStateObject) -VK_DEFINE_SUBCLASS_HANDLE(VkDynamicCbStateObject, VkDynamicStateObject) -VK_DEFINE_SUBCLASS_HANDLE(VkDynamicDsStateObject, VkDynamicStateObject) +VK_DEFINE_SUBCLASS_HANDLE(VkDynamicVpState, VkDynamicStateObject) +VK_DEFINE_SUBCLASS_HANDLE(VkDynamicRsState, VkDynamicStateObject) +VK_DEFINE_SUBCLASS_HANDLE(VkDynamicCbState, VkDynamicStateObject) +VK_DEFINE_SUBCLASS_HANDLE(VkDynamicDsState, VkDynamicStateObject) VK_DEFINE_SUBCLASS_HANDLE(VkCmdBuffer, VkObject) VK_DEFINE_SUBCLASS_HANDLE(VkFence, VkObject) VK_DEFINE_SUBCLASS_HANDLE(VkSemaphore, VkObject) @@ -2336,10 +2336,10 @@ typedef VkResult (VKAPI *PFN_vkResetDescriptorPool)(VkDescriptorPool descriptorP typedef VkResult (VKAPI *PFN_vkAllocDescriptorSets)(VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, uint32_t count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets, uint32_t* pCount); typedef void (VKAPI *PFN_vkClearDescriptorSets)(VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet* pDescriptorSets); typedef void (VKAPI *PFN_vkUpdateDescriptors)(VkDescriptorSet descriptorSet, uint32_t updateCount, const void** pUpdateArray); -typedef VkResult (VKAPI *PFN_vkCreateDynamicViewportState)(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpStateObject* pState); -typedef VkResult (VKAPI *PFN_vkCreateDynamicRasterState)(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsStateObject* pState); -typedef VkResult (VKAPI *PFN_vkCreateDynamicColorBlendState)(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, VkDynamicCbStateObject* pState); -typedef VkResult (VKAPI *PFN_vkCreateDynamicDepthStencilState)(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, VkDynamicDsStateObject* pState); +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_vkCreateCommandBuffer)(VkDevice device, const VkCmdBufferCreateInfo* pCreateInfo, VkCmdBuffer* pCmdBuffer); typedef VkResult (VKAPI *PFN_vkBeginCommandBuffer)(VkCmdBuffer cmdBuffer, const VkCmdBufferBeginInfo* pBeginInfo); typedef VkResult (VKAPI *PFN_vkEndCommandBuffer)(VkCmdBuffer cmdBuffer); @@ -2776,22 +2776,22 @@ void VKAPI vkUpdateDescriptors( VkResult VKAPI vkCreateDynamicViewportState( VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, - VkDynamicVpStateObject* pState); + VkDynamicVpState* pState); VkResult VKAPI vkCreateDynamicRasterState( VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, - VkDynamicRsStateObject* pState); + VkDynamicRsState* pState); VkResult VKAPI vkCreateDynamicColorBlendState( VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, - VkDynamicCbStateObject* pState); + VkDynamicCbState* pState); VkResult VKAPI vkCreateDynamicDepthStencilState( VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, - VkDynamicDsStateObject* pState); + VkDynamicDsState* pState); // Command buffer functions diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 1de84b1..58db632 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -1824,28 +1824,28 @@ VK_LAYER_EXPORT void VKAPI vkUpdateDescriptors(VkDescriptorSet descriptorSet, ui nextTable.UpdateDescriptors(descriptorSet, updateCount, ppUpdateArray); } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpStateObject* pState) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpState* pState) { VkResult result = nextTable.CreateDynamicViewportState(device, pCreateInfo, pState); insertDynamicState(*pState, (GENERIC_HEADER*)pCreateInfo, VK_STATE_BIND_VIEWPORT); return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsStateObject* pState) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsState* pState) { VkResult result = nextTable.CreateDynamicRasterState(device, pCreateInfo, pState); insertDynamicState(*pState, (GENERIC_HEADER*)pCreateInfo, VK_STATE_BIND_RASTER); return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, VkDynamicCbStateObject* pState) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, VkDynamicCbState* pState) { VkResult result = nextTable.CreateDynamicColorBlendState(device, pCreateInfo, pState); insertDynamicState(*pState, (GENERIC_HEADER*)pCreateInfo, VK_STATE_BIND_COLOR_BLEND); return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, VkDynamicDsStateObject* pState) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, VkDynamicDsState* pState) { VkResult result = nextTable.CreateDynamicDepthStencilState(device, pCreateInfo, pState); insertDynamicState(*pState, (GENERIC_HEADER*)pCreateInfo, VK_STATE_BIND_DEPTH_STENCIL); diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 1b32f88..8ed7e05 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -1381,7 +1381,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerC } VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, - VkDynamicVpStateObject* pState) + VkDynamicVpState* pState) { VkResult result = nextTable.CreateDynamicViewportState(device, pCreateInfo, pState); if (result == VK_SUCCESS) { @@ -1393,7 +1393,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, con } VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, - VkDynamicRsStateObject* pState) + VkDynamicRsState* pState) { VkResult result = nextTable.CreateDynamicRasterState(device, pCreateInfo, pState); if (result == VK_SUCCESS) { @@ -1405,7 +1405,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const } VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, - VkDynamicCbStateObject* pState) + VkDynamicCbState* pState) { VkResult result = nextTable.CreateDynamicColorBlendState(device, pCreateInfo, pState); if (result == VK_SUCCESS) { @@ -1417,7 +1417,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, c } VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, - VkDynamicDsStateObject* pState) + VkDynamicDsState* pState) { VkResult result = nextTable.CreateDynamicDepthStencilState(device, pCreateInfo, pState); if (result == VK_SUCCESS) { diff --git a/layers/object_track.h b/layers/object_track.h index c6b7939..d24e0de 100644 --- a/layers/object_track.h +++ b/layers/object_track.h @@ -59,10 +59,10 @@ typedef enum _OBJECT_STATUS typedef enum _VK_OBJECT_TYPE { VkObjectTypeSampler, - VkObjectTypeDynamicDsStateObject, + VkObjectTypeDynamicDsState, VkObjectTypeDescriptorSet, VkObjectTypeDescriptorPool, - VkObjectTypeDynamicCbStateObject, + VkObjectTypeDynamicCbState, VkObjectTypeImageView, VkObjectTypeSemaphore, VkObjectTypeShader, @@ -81,10 +81,10 @@ typedef enum _VK_OBJECT_TYPE VkObjectTypeBufferView, VkObjectTypeDepthStencilView, VkObjectTypeInstance, - VkObjectTypeDynamicVpStateObject, + VkObjectTypeDynamicVpState, VkObjectTypeColorAttachmentView, VkObjectTypeGpuMemory, - VkObjectTypeDynamicRsStateObject, + VkObjectTypeDynamicRsState, VkObjectTypeFence, VkObjectTypeCmdBuffer, VkObjectTypePresentableImageMemory, @@ -133,7 +133,7 @@ static const char* string_VK_OBJECT_TYPE(VK_OBJECT_TYPE type) { return "IMAGE_VIEW"; case VkObjectTypeBuffer: return "BUFFER"; - case VkObjectTypeDynamicRsStateObject: + case VkObjectTypeDynamicRsState: return "DYNAMIC_RS_STATE_OBJECT"; case VkObjectTypeEvent: return "EVENT"; @@ -141,11 +141,11 @@ static const char* string_VK_OBJECT_TYPE(VK_OBJECT_TYPE type) { return "DEPTH_STENCIL_VIEW"; case VkObjectTypeShader: return "SHADER"; - case VkObjectTypeDynamicDsStateObject: + case VkObjectTypeDynamicDsState: return "DYNAMIC_DS_STATE_OBJECT"; - case VkObjectTypeDynamicVpStateObject: + case VkObjectTypeDynamicVpState: return "DYNAMIC_VP_STATE_OBJECT"; - case VkObjectTypeDynamicCbStateObject: + case VkObjectTypeDynamicCbState: return "DYNAMIC_CB_STATE_OBJECT"; case VkObjectTypeInstance: return "INSTANCE"; diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 4c2b440..dafe7ba 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -1011,7 +1011,7 @@ VK_LAYER_EXPORT void VKAPI vkUpdateDescriptors(VkDescriptorSet descriptorSet, ui nextTable.UpdateDescriptors(descriptorSet, updateCount, ppUpdateArray); } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpStateObject* pState) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpState* pState) { char str[1024]; if (!pCreateInfo) { @@ -1026,7 +1026,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, con return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsStateObject* pState) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsState* pState) { char str[1024]; if (!pCreateInfo) { @@ -1041,7 +1041,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicRasterState(VkDevice device, const return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, VkDynamicCbStateObject* pState) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, VkDynamicCbState* pState) { char str[1024]; if (!pCreateInfo) { @@ -1056,7 +1056,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, c return result; } -VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, VkDynamicDsStateObject* pState) +VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, VkDynamicDsState* pState) { char str[1024]; if (!pCreateInfo) { diff --git a/vulkan.py b/vulkan.py index 220b4a6..ff62e8e 100755 --- a/vulkan.py +++ b/vulkan.py @@ -204,10 +204,10 @@ core = Extension( "VkDescriptorSetLayoutChain", "VkDescriptorPool", "VkDynamicStateObject", - "VkDynamicVpStateObject", - "VkDynamicRsStateObject", - "VkDynamicCbStateObject", - "VkDynamicDsStateObject", + "VkDynamicVpState", + "VkDynamicRsState", + "VkDynamicCbState", + "VkDynamicDsState", "VkCmdBuffer", "VkFence", "VkSemaphore", @@ -565,22 +565,22 @@ core = Extension( Proto("VkResult", "CreateDynamicViewportState", [Param("VkDevice", "device"), Param("const VkDynamicVpStateCreateInfo*", "pCreateInfo"), - Param("VkDynamicVpStateObject*", "pState")]), + Param("VkDynamicVpState*", "pState")]), Proto("VkResult", "CreateDynamicRasterState", [Param("VkDevice", "device"), Param("const VkDynamicRsStateCreateInfo*", "pCreateInfo"), - Param("VkDynamicRsStateObject*", "pState")]), + Param("VkDynamicRsState*", "pState")]), Proto("VkResult", "CreateDynamicColorBlendState", [Param("VkDevice", "device"), Param("const VkDynamicCbStateCreateInfo*", "pCreateInfo"), - Param("VkDynamicCbStateObject*", "pState")]), + Param("VkDynamicCbState*", "pState")]), Proto("VkResult", "CreateDynamicDepthStencilState", [Param("VkDevice", "device"), Param("const VkDynamicDsStateCreateInfo*", "pCreateInfo"), - Param("VkDynamicDsStateObject*", "pState")]), + Param("VkDynamicDsState*", "pState")]), Proto("VkResult", "CreateCommandBuffer", [Param("VkDevice", "device"), @@ -950,10 +950,10 @@ object_list = [ ] object_dynamic_state_list = [ - "VkDynamicVpStateObject", - "VkDynamicRsStateObject", - "VkDynamicCbStateObject", - "VkDynamicDsStateObject" + "VkDynamicVpState", + "VkDynamicRsState", + "VkDynamicCbState", + "VkDynamicDsState" ] object_type_list = object_root_list + object_base_list + object_list + object_dynamic_state_list -- 2.7.4