Properly flush shader cache

src/core/PICA/shader_gen_glsl.cpp

@@ -140,9 +140,9 @@ std::string FragmentGenerator::generate(const PICARegs& regs) {
 		float alphaOp3 = 0.0;
 	)";
 
+	// Get original depth value by converting from [near, far] = [0, 1] to [-1, 1]
+	// We do this by converting to [0, 2] first and subtracting 1 to go to [-1, 1]
 	ret += R"(
-		// Get original depth value by converting from [near, far] = [0, 1] to [-1, 1]
-		// We do this by converting to [0, 2] first and subtracting 1 to go to [-1, 1]
 		float z_over_w = gl_FragCoord.z * 2.0f - 1.0f;
 		float depth = z_over_w * depthScale + depthOffset;
 	)";
@@ -343,7 +343,7 @@ void FragmentGenerator::getSource(std::string& shader, TexEnvConfig::Source sour
 		
 		// Lighting
 		case TexEnvConfig::Source::PrimaryFragmentColor:
-		case TexEnvConfig::Source::SecondaryFragmentColor: shader += "vec4(0.0, 0.0, 0.0, 1.0)"; break;
+		case TexEnvConfig::Source::SecondaryFragmentColor: shader += "vec4(1.0, 1.0, 1.0, 1.0)"; break;
 
 		default:
 			Helpers::warn("Unimplemented TEV source: %d", static_cast<int>(source));

src/core/renderer_gl/renderer_gl.cpp

@@ -23,6 +23,11 @@ void RendererGL::reset() {
 	colourBufferCache.reset();
 	textureCache.reset();
 
+	for (auto& shader : shaderCache) {
+		shader.second.program.free();
+	}
+	shaderCache.clear();
+
 	// Init the colour/depth buffer settings to some random defaults on reset
 	colourBufferLoc = 0;
 	colourBufferFormat = PICA::ColorFmt::RGBA8;
@@ -899,6 +904,11 @@ void RendererGL::deinitGraphicsContext() {
 	depthBufferCache.reset();
 	colourBufferCache.reset();
 
+	for (auto& shader : shaderCache) {
+		shader.second.program.free();
+	}
+	shaderCache.clear();
+
 	// All other GL objects should be invalidated automatically and be recreated by the next call to initGraphicsContext
 	// TODO: Make it so that depth and colour buffers get written back to 3DS memory
 	printf("RendererGL::DeinitGraphicsContext called\n");

third_party/opengl/opengl.hpp

@@ -397,34 +397,41 @@ namespace OpenGL {
     };
 
     struct Program {
-        GLuint m_handle = 0;
+		GLuint m_handle = 0;
 
-        bool create(std::initializer_list<std::reference_wrapper<Shader>> shaders) {
+		bool create(std::initializer_list<std::reference_wrapper<Shader>> shaders) {
-            m_handle = glCreateProgram();
+			m_handle = glCreateProgram();
-            for (const auto& shader : shaders) {
+			for (const auto& shader : shaders) {
-                glAttachShader(m_handle, shader.get().handle());
+				glAttachShader(m_handle, shader.get().handle());
-            }
+			}
 
-            glLinkProgram(m_handle);
+			glLinkProgram(m_handle);
-            GLint success;
+			GLint success;
-            glGetProgramiv(m_handle, GL_LINK_STATUS, &success);
+			glGetProgramiv(m_handle, GL_LINK_STATUS, &success);
 
-            if (!success) {
+			if (!success) {
-                char buf[4096];
+				char buf[4096];
-                glGetProgramInfoLog(m_handle, 4096, nullptr, buf);
+				glGetProgramInfoLog(m_handle, 4096, nullptr, buf);
-                fprintf(stderr, "Failed to link program\nError: %s\n", buf);
+				fprintf(stderr, "Failed to link program\nError: %s\n", buf);
-                glDeleteProgram(m_handle);
+				glDeleteProgram(m_handle);
 
-                m_handle = 0;
+				m_handle = 0;
-            }
+			}
 
-            return m_handle != 0;
+			return m_handle != 0;
-        }
+		}
 
-        GLuint handle() const { return m_handle; }
+		GLuint handle() const { return m_handle; }
-        bool exists() const { return m_handle != 0; }
+		bool exists() const { return m_handle != 0; }
-        void use() const { glUseProgram(m_handle); }
+		void use() const { glUseProgram(m_handle); }
-    };
+
+		void free() {
+			if (exists()) {
+				glDeleteProgram(m_handle);
+				m_handle = 0;
+			}
+		}
+	};
 
     static void dispatchCompute(GLuint groupsX = 1, GLuint groupsY = 1, GLuint groupsZ = 1) {
         glDispatchCompute(groupsX, groupsY, groupsZ);