From ad65878c0c637cacb51bfcede8857826caa69c19 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Mon, 1 Sep 2025 19:57:38 +0200
Subject: [PATCH] gl: fix some cppcheck issues

---
 rpcs3/Emu/RSX/Common/texture_cache_utils.h | 6 +++---
 rpcs3/Emu/RSX/GL/GLRenderTargets.cpp       | 4 +++-
 rpcs3/Emu/RSX/GL/GLTexture.cpp             | 2 ++
 rpcs3/Emu/RSX/GL/glutils/program.h         | 2 +-
 rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp | 7 ++-----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/Emu/RSX/Common/texture_cache_utils.h
index c34b73f7ba..a180a1a8d1 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_utils.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_utils.h
@@ -79,7 +79,7 @@ namespace rsx
 
 		private:
 			// Members
-			block_list *block;
+			block_list* block = nullptr;
 			list_iterator list_it = {};
 			size_type idx = u32{umax};
 			size_type array_idx = 0;
@@ -705,9 +705,9 @@ namespace rsx
 		private:
 			// Members
 			address_range32 range;
-			section_bounds bounds;
+			section_bounds bounds {};
 
-			block_type *block = nullptr;
+			block_type* block = nullptr;
 			bool needs_overlap_check = true;
 			bool unowned_remaining = false;
 			unowned_iterator unowned_it = {};
diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
index 4e5e61dcba..18058842aa 100644
--- a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
+++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
@@ -218,7 +218,7 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 		static_cast<gl::framebuffer_holder*>(m_draw_fbo)->release();
 	}
 
-	for (auto &fbo : m_framebuffer_cache)
+	for (auto& fbo : m_framebuffer_cache)
 	{
 		if (fbo.matches(color_targets, depth_stencil_target))
 		{
@@ -264,6 +264,8 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 		}
 	}
 
+	ensure(m_draw_fbo);
+
 	switch (rsx::method_registers.surface_color_target())
 	{
 	case rsx::surface_target::none: break;
diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp
index 7b43cfc0a7..9a439177f4 100644
--- a/rpcs3/Emu/RSX/GL/GLTexture.cpp
+++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp
@@ -289,6 +289,8 @@ namespace gl
 	void* copy_image_to_buffer(gl::command_context& cmd, const pixel_buffer_layout& pack_info, const gl::texture* src, gl::buffer* dst,
 		u32 dst_offset, const int src_level, const coord3u& src_region,  image_memory_requirements* mem_info)
 	{
+		ensure(src && dst);
+
 		auto initialize_scratch_mem = [&]() -> bool // skip_transform
 		{
 			const u64 max_mem = (mem_info->memory_required) ? mem_info->memory_required : mem_info->image_size_in_bytes;
diff --git a/rpcs3/Emu/RSX/GL/glutils/program.h b/rpcs3/Emu/RSX/GL/glutils/program.h
index 72daef2523..5caca0ed98 100644
--- a/rpcs3/Emu/RSX/GL/glutils/program.h
+++ b/rpcs3/Emu/RSX/GL/glutils/program.h
@@ -14,7 +14,7 @@ namespace gl
 		class shader
 		{
 			std::string source;
-			::glsl::program_domain type;
+			::glsl::program_domain type {};
 			GLuint m_id = GL_NONE;
 
 			fence m_compiled_fence;
diff --git a/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp b/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp
index 9835a5891f..694ed28cac 100644
--- a/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp
+++ b/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp
@@ -376,15 +376,12 @@ namespace gl
 
 		GLuint get_bound_texture(GLuint layer, GLenum target)
 		{
-			ensure(layer < 48);
-			return bound_textures[layer][target];
+			return ::at32(bound_textures, layer)[target];
 		}
 
 		void bind_texture(GLuint layer, GLenum target, GLuint name, GLboolean force = GL_FALSE)
 		{
-			ensure(layer < 48);
-
-			auto& bound = bound_textures[layer][target];
+			auto& bound = ::at32(bound_textures, layer)[target];
 			if (bound != name || force)
 			{
 				glActiveTexture(GL_TEXTURE0 + layer);