From c76fe9cec4ad2484861321d8c01b71b55c3a2a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 10 Feb 2021 00:20:52 +0100
Subject: [PATCH] Assorted paranoid cleanups, inspired by #14082

---
 Common/GPU/OpenGL/thin3d_gl.cpp | 6 +++---
 Common/UI/Context.h             | 4 ++--
 UI/MiscScreens.cpp              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Common/GPU/OpenGL/thin3d_gl.cpp b/Common/GPU/OpenGL/thin3d_gl.cpp
index fcce3aabbd..7c1708fb63 100644
--- a/Common/GPU/OpenGL/thin3d_gl.cpp
+++ b/Common/GPU/OpenGL/thin3d_gl.cpp
@@ -302,7 +302,7 @@ public:
 
 	// TODO: Optimize by getting the locations first and putting in a custom struct
 	UniformBufferDesc dynamicUniforms;
-	GLint samplerLocs_[8];
+	GLint samplerLocs_[8]{};
 	std::vector<GLint> dynamicUniformLocs_;
 	GLRProgram *program_ = nullptr;
 
@@ -1038,8 +1038,8 @@ Pipeline *OpenGLContext::CreateGraphicsPipeline(const PipelineDesc &desc) {
 		ERROR_LOG(G3D,  "Pipeline requires at least one shader");
 		return nullptr;
 	}
-	if ((int)desc.prim >= (int)Primitive::PRIMITIVE_TYPE_COUNT) {
-		ERROR_LOG(G3D,  "Invalid primitive type");
+	if ((uint32_t)desc.prim >= (uint32_t)Primitive::PRIMITIVE_TYPE_COUNT) {
+		ERROR_LOG(G3D, "Invalid primitive type");
 		return nullptr;
 	}
 	if (!desc.depthStencil || !desc.blend || !desc.raster) {
diff --git a/Common/UI/Context.h b/Common/UI/Context.h
index 944d31e4d8..29635b74fd 100644
--- a/Common/UI/Context.h
+++ b/Common/UI/Context.h
@@ -99,7 +99,7 @@ public:
 	Bounds TransformBounds(const Bounds &bounds);
 
 private:
-	Draw::DrawContext *draw_;
+	Draw::DrawContext *draw_ = nullptr;
 	Bounds bounds_;
 
 	float fontScaleX_ = 1.0f;
@@ -107,7 +107,7 @@ private:
 	UI::FontStyle *fontStyle_ = nullptr;
 	TextDrawer *textDrawer_ = nullptr;
 
-	Draw::SamplerState *sampler_;
+	Draw::SamplerState *sampler_ = nullptr;
 	Draw::Pipeline *ui_pipeline_ = nullptr;
 	Draw::Pipeline *ui_pipeline_notex_ = nullptr;
 	std::unique_ptr<ManagedTexture> uitexture_;
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index 55a46dce27..bb472b41c6 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -516,8 +516,8 @@ void LogoScreen::render() {
 
 	const Bounds &bounds = dc.GetBounds();
 
-	float xres = dc.GetBounds().w;
-	float yres = dc.GetBounds().h;
+	float xres = bounds.w;
+	float yres = bounds.h;
 
 	dc.Begin();