From fdd53feae063c5907ee718e7c5c8c42ffd8b00d2 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 9 Jun 2016 11:39:49 -0700 Subject: [PATCH] Coverity: Initialise VkMemoryRequirements to 0 in case it's not written --- renderdoc/driver/vulkan/vk_core.cpp | 2 +- renderdoc/driver/vulkan/vk_debug.cpp | 16 ++++++++-------- renderdoc/driver/vulkan/vk_initstate.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 7d8f7e21d..a76410f94 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -1108,7 +1108,7 @@ bool WrappedVulkan::EndFrameCapture(void *dev, void *wnd) vt->CreateImage(Unwrap(device), &imInfo, NULL, &readbackIm); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; vt->GetImageMemoryRequirements(Unwrap(device), readbackIm, &mrq); VkImageSubresource subr = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0}; diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index a4a23f16f..5f28bccc9 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -796,7 +796,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) vkr = m_pDriver->vkCreateImage(dev, &imInfo, NULL, &m_TextAtlas); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; m_pDriver->vkGetImageMemoryRequirements(dev, m_TextAtlas, &mrq); VkImageSubresource subr = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0}; @@ -1752,7 +1752,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) vkr = m_pDriver->vkCreateImage(dev, &imInfo, NULL, &m_TexDisplayDummyImages[index]); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; m_pDriver->vkGetImageMemoryRequirements(dev, m_TexDisplayDummyImages[index], &mrq); uint32_t memIndex = driver->GetGPULocalMemoryIndex(mrq.memoryTypeBits); @@ -1891,7 +1891,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) vkr = m_pDriver->vkCreateImage(dev, &imInfo, NULL, &m_PickPixelImage); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; m_pDriver->vkGetImageMemoryRequirements(dev, m_PickPixelImage, &mrq); VkImageSubresource subr = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0}; @@ -2361,7 +2361,7 @@ void VulkanDebugManager::CreateCustomShaderTex(uint32_t width, uint32_t height) vkr = m_pDriver->vkCreateImage(m_Device, &imInfo, NULL, &m_CustomTexImg); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; m_pDriver->vkGetImageMemoryRequirements(m_Device, m_CustomTexImg, &mrq); // if no memory is allocated, or it's not enough, @@ -3672,7 +3672,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve vkr = m_pDriver->vkCreateImage(m_Device, &imInfo, NULL, &m_OverlayImage); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; m_pDriver->vkGetImageMemoryRequirements(m_Device, m_OverlayImage, &mrq); // if no memory is allocated, or it's not enough, @@ -6253,7 +6253,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t eventID) vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &uniqIdxBuf); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; m_pDriver->vkGetBufferMemoryRequirements(dev, uniqIdxBuf, &mrq); VkMemoryAllocateInfo allocInfo = { @@ -6371,7 +6371,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t eventID) vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &readbackBuffer); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; m_pDriver->vkGetBufferMemoryRequirements(dev, meshBuffer, &mrq); VkMemoryAllocateInfo allocInfo = { @@ -6484,7 +6484,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t eventID) vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &readbackBuffer); RDCASSERTEQUAL(vkr, VK_SUCCESS); - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; m_pDriver->vkGetBufferMemoryRequirements(dev, meshBuffer, &mrq); VkMemoryAllocateInfo allocInfo = { diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index 47d626ad7..bd444c96d 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -845,7 +845,7 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkImage *im, // sparse image? how is that determined? VkSparseMemoryBind unbind = {0, 0, VK_NULL_HANDLE, 0, 0}; - VkMemoryRequirements mrq; + VkMemoryRequirements mrq = {0}; ObjDisp(q)->GetImageMemoryRequirements(Unwrap(GetDev()), im->real.As(), &mrq); unbind.size = mrq.size;