From b1d917b52b18268a484d71d0cec4ddbbc9b15cde Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 20 Jul 2016 17:49:14 +0200 Subject: [PATCH] [Coverity] Fix some enum-enum casting, by going via int. --- renderdoc/driver/d3d11/d3d11_debug.cpp | 2 +- renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp | 2 +- renderdoc/driver/vulkan/vk_debug.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp index 4cc0fc660..4a929315a 100644 --- a/renderdoc/driver/d3d11/d3d11_debug.cpp +++ b/renderdoc/driver/d3d11/d3d11_debug.cpp @@ -4447,7 +4447,7 @@ void D3D11DebugManager::InitPostVSBuffers(uint32_t eventID) if(decl.declaration == DXBC::OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY) { - topo = (D3D11_PRIMITIVE_TOPOLOGY)decl.outTopology; // enums match + topo = (D3D11_PRIMITIVE_TOPOLOGY) int(decl.outTopology); // enums match break; } } diff --git a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp index cdcb42186..a31b86793 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp @@ -1172,7 +1172,7 @@ void DXBCFile::GuessResources() desc.bindPoint = idx; desc.bindCount = 1; desc.flags = 0; - desc.retType = (ShaderInputBind::RetType)dcl.resType[0]; + desc.retType = (ShaderInputBind::RetType) int(dcl.resType[0]); // enums match desc.dimension = dcl.dim == RESOURCE_DIMENSION_TEXTURE1D ? ShaderInputBind::DIM_TEXTURE1D diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index 8e0dd364f..9f3a0ecc8 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -1842,7 +1842,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) NULL, 0, m_TexDisplayDummyImages[index], - VkImageViewType(types[type]), // image/view type enums overlap for 1D/2D/3D + VkImageViewType(int(types[type])), // image/view type enums overlap for 1D/2D/3D formats[fmt], {VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY},