From 2bda634c7b6991361ca7ab3e7a63c6f80bf45a18 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 9 Jun 2016 13:09:07 -0700 Subject: [PATCH] Coverity: Fix mistakes where both branches were incorrectly the same --- renderdoc/driver/shaders/dxbc/dxbc_debug.cpp | 4 ++-- renderdoc/driver/vulkan/vk_common.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp index da2947ab1..3a3a6a590 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp @@ -305,8 +305,8 @@ ShaderVariable abs(const ShaderVariable &v, const VarType type) DoubleGet(v, src); double dst[2]; - dst[0] = src[0] > 0 ? src[0] : src[0]; - dst[1] = src[1] > 0 ? src[1] : src[1]; + dst[0] = src[0] > 0 ? src[0] : -src[0]; + dst[1] = src[1] > 0 ? src[1] : -src[1]; DoubleSet(r, dst); break; diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp index 92bddd462..982bf67e5 100644 --- a/renderdoc/driver/vulkan/vk_common.cpp +++ b/renderdoc/driver/vulkan/vk_common.cpp @@ -836,7 +836,7 @@ VkFormat MakeVkFormat(ResourceFormat fmt) case eSpecial_R11G11B10: ret = VK_FORMAT_B10G11R11_UFLOAT_PACK32; break; case eSpecial_R5G6B5: ret = VK_FORMAT_B5G6R5_UNORM_PACK16; break; case eSpecial_R5G5B5A1: - ret = fmt.bgraOrder ? VK_FORMAT_B5G5R5A1_UNORM_PACK16 : VK_FORMAT_B5G5R5A1_UNORM_PACK16; + ret = fmt.bgraOrder ? VK_FORMAT_B5G5R5A1_UNORM_PACK16 : VK_FORMAT_R5G5B5A1_UNORM_PACK16; break; case eSpecial_R9G9B9E5: ret = VK_FORMAT_E5B9G9R9_UFLOAT_PACK32; break; case eSpecial_R4G4B4A4: