Warning fix, some paranoid zero init

hrydgard · Feb 12, 2024 · 9322b4c · 9322b4c
1 parent c50399f
commit 9322b4c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/GPU/Vulkan/DrawEngineVulkan.h b/GPU/Vulkan/DrawEngineVulkan.h
@@ -191,8 +191,8 @@ class DrawEngineVulkan : public DrawEngineCommon {
 	Draw::DrawContext *draw_;
 
 	// We use a shared descriptor set layouts for all PSP draws.
-	VKRPipelineLayout *pipelineLayout_;
-	VulkanPipeline *lastPipeline_;
+	VKRPipelineLayout *pipelineLayout_ = nullptr;
+	VulkanPipeline *lastPipeline_ = nullptr;
 	VkDescriptorSet lastDs_ = VK_NULL_HANDLE;
 
 	// Secondary texture for shader blending
@@ -228,11 +228,13 @@ class DrawEngineVulkan : public DrawEngineCommon {
 	FramebufferManagerVulkan *framebufferManager_ = nullptr;
 
 	// State cache
-	uint64_t dirtyUniforms_;
-	uint32_t baseUBOOffset;
-	uint32_t lightUBOOffset;
-	uint32_t boneUBOOffset;
-	VkBuffer baseBuf, lightBuf, boneBuf;
+	uint64_t dirtyUniforms_ = 0;
+	uint32_t baseUBOOffset = 0;
+	uint32_t lightUBOOffset = 0;
+	uint32_t boneUBOOffset = 0;
+	VkBuffer baseBuf = VK_NULL_HANDLE;
+	VkBuffer lightBuf = VK_NULL_HANDLE;
+	VkBuffer boneBuf = VK_NULL_HANDLE;
 	VkImageView imageView = VK_NULL_HANDLE;
 	VkSampler sampler = VK_NULL_HANDLE;
 

diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp
@@ -869,7 +869,7 @@ void GameInfoCache::PurgeType(IdentifiedFileType fileType) {
 				}
 				// TODO: Find a better way to wait here.
 				if (info->pendingFlags != (GameInfoFlags)0) {
-					INFO_LOG(LOADER, "%s: pending flags %08x, retrying", info->GetTitle().c_str(), info->pendingFlags);
+					INFO_LOG(LOADER, "%s: pending flags %08x, retrying", info->GetTitle().c_str(), (int)info->pendingFlags);
 					retry = true;
 					break;
 				}