From 2b34aca115df0f36cbae497028f08abbc15885ba Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 14 May 2016 11:32:21 +0200 Subject: [PATCH] Make sure debug manager stuff is properly zero-initialised --- renderdoc/driver/vulkan/vk_debug.cpp | 12 ++++++++++++ renderdoc/driver/vulkan/vk_debug.h | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index f42eb150a..73b588c3e 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -273,6 +273,12 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) RDCEraseEl(m_TexDisplayDummyInfos); m_TexDisplayDummyMemory = VK_NULL_HANDLE; + m_PickPixelImageMem = VK_NULL_HANDLE; + m_PickPixelImage = VK_NULL_HANDLE; + m_PickPixelImageView = VK_NULL_HANDLE; + m_PickPixelFB = VK_NULL_HANDLE; + m_PickPixelRP = VK_NULL_HANDLE; + m_TextDescSetLayout = VK_NULL_HANDLE; m_TextPipeLayout = VK_NULL_HANDLE; m_TextDescSet = VK_NULL_HANDLE; @@ -296,6 +302,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) m_QuadResolvePipeLayout = VK_NULL_HANDLE; m_QuadDescSet = VK_NULL_HANDLE; m_QuadResolvePipeline = VK_NULL_HANDLE; + m_QuadSPIRV = NULL; m_MeshDescSetLayout = VK_NULL_HANDLE; m_MeshPipeLayout = VK_NULL_HANDLE; @@ -316,6 +323,11 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) m_MeshFetchDescSetLayout = VK_NULL_HANDLE; m_MeshFetchDescSet = VK_NULL_HANDLE; + + m_FontCharSize = 1.0f; + m_FontCharAspect = 1.0f; + + m_FixedColSPIRV = NULL; m_Device = dev; diff --git a/renderdoc/driver/vulkan/vk_debug.h b/renderdoc/driver/vulkan/vk_debug.h index 7596584ce..3b82d6717 100644 --- a/renderdoc/driver/vulkan/vk_debug.h +++ b/renderdoc/driver/vulkan/vk_debug.h @@ -127,7 +127,10 @@ class VulkanDebugManager eGPUBufferVBuffer = 0x2, eGPUBufferSSBO = 0x4, }; - GPUBuffer() : buf(VK_NULL_HANDLE), mem(VK_NULL_HANDLE) {} + GPUBuffer() + : sz(0), buf(VK_NULL_HANDLE), mem(VK_NULL_HANDLE) + , align(0), totalsize(0), curoffset(0) + , m_ResourceManager(NULL) {} void Create(WrappedVulkan *driver, VkDevice dev, VkDeviceSize size, uint32_t ringSize, uint32_t flags); void Destroy(const VkLayerDispatchTable *vt, VkDevice dev);