diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp index 76e7a2c2c..af87ea501 100644 --- a/renderdoc/driver/vulkan/vk_common.cpp +++ b/renderdoc/driver/vulkan/vk_common.cpp @@ -1054,7 +1054,6 @@ string ToStrHelper::Get(const VkResourceType &el) TOSTR_CASE_STRINGIZE(eResFramebuffer) TOSTR_CASE_STRINGIZE(eResRenderPass) TOSTR_CASE_STRINGIZE(eResShaderModule) - TOSTR_CASE_STRINGIZE(eResShader) TOSTR_CASE_STRINGIZE(eResPipelineCache) TOSTR_CASE_STRINGIZE(eResPipelineLayout) TOSTR_CASE_STRINGIZE(eResPipeline) diff --git a/renderdoc/driver/vulkan/vk_resources.cpp b/renderdoc/driver/vulkan/vk_resources.cpp index b0601bb5d..074f0c9bb 100644 --- a/renderdoc/driver/vulkan/vk_resources.cpp +++ b/renderdoc/driver/vulkan/vk_resources.cpp @@ -40,7 +40,6 @@ WRAPPED_POOL_INST(WrappedVkQueryPool) WRAPPED_POOL_INST(WrappedVkBufferView) WRAPPED_POOL_INST(WrappedVkImageView) WRAPPED_POOL_INST(WrappedVkShaderModule) -WRAPPED_POOL_INST(WrappedVkShader) WRAPPED_POOL_INST(WrappedVkPipelineCache) WRAPPED_POOL_INST(WrappedVkPipelineLayout) WRAPPED_POOL_INST(WrappedVkRenderPass) @@ -81,7 +80,6 @@ VkResourceType IdentifyTypeByPtr(WrappedVkRes *ptr) if(WrappedVkFramebuffer::IsAlloc(ptr)) return eResFramebuffer; if(WrappedVkRenderPass::IsAlloc(ptr)) return eResRenderPass; if(WrappedVkShaderModule::IsAlloc(ptr)) return eResShaderModule; - if(WrappedVkShader::IsAlloc(ptr)) return eResShader; if(WrappedVkPipelineCache::IsAlloc(ptr)) return eResPipelineCache; if(WrappedVkPipelineLayout::IsAlloc(ptr)) return eResPipelineLayout; if(WrappedVkPipeline::IsAlloc(ptr)) return eResPipeline; diff --git a/renderdoc/driver/vulkan/vk_resources.h b/renderdoc/driver/vulkan/vk_resources.h index c11de9dcb..479c8c071 100644 --- a/renderdoc/driver/vulkan/vk_resources.h +++ b/renderdoc/driver/vulkan/vk_resources.h @@ -54,7 +54,6 @@ enum VkResourceType eResFramebuffer, eResRenderPass, eResShaderModule, - eResShader, eResPipelineCache, eResPipelineLayout, eResPipeline, @@ -283,14 +282,6 @@ struct WrappedVkShaderModule : WrappedVkNonDispRes ALLOCATE_WITH_WRAPPED_POOL(WrappedVkShaderModule, AllocPoolCount); enum { TypeEnum = eResShaderModule, }; }; -struct WrappedVkShader : WrappedVkNonDispRes -{ - WrappedVkShader(VkShader obj, ResourceId objId) : WrappedVkNonDispRes(obj, objId) {} - typedef VkShader InnerType; - static const int AllocPoolCount = 32*1024; - ALLOCATE_WITH_WRAPPED_POOL(WrappedVkShader); - enum { TypeEnum = eResShader, }; -}; struct WrappedVkPipelineCache : WrappedVkNonDispRes { WrappedVkPipelineCache(VkPipelineCache obj, ResourceId objId) : WrappedVkNonDispRes(obj, objId) {} @@ -412,7 +403,6 @@ UNWRAP_NONDISP_HELPER(VkQueryPool) UNWRAP_NONDISP_HELPER(VkBufferView) UNWRAP_NONDISP_HELPER(VkImageView) UNWRAP_NONDISP_HELPER(VkShaderModule) -UNWRAP_NONDISP_HELPER(VkShader) UNWRAP_NONDISP_HELPER(VkPipelineCache) UNWRAP_NONDISP_HELPER(VkPipelineLayout) UNWRAP_NONDISP_HELPER(VkRenderPass)