GS/GL: Replace GLState::Clear with Init() and Invalidate()

Author: TheLastRar

pcsx2/GS/Renderers/OpenGL/GLState.cpp

@@ -52,8 +52,9 @@ namespace GLState
 		return draw_buffers;
 	}
 
-	void Clear()
+	void Init()
 	{
+		// Set the state to match initial API values.
 		vao = 0;
 		fbo = 0;
 		viewport = GSVector2i(1, 1);
@@ -90,4 +91,35 @@ namespace GLState
 
 		std::fill(std::begin(tex_unit), std::end(tex_unit), 0);
 	}
+
+	void Invalidate()
+	{
+		Init();
+
+		// Set the state to invalid values (or fetch from the API).
+		blend = glIsEnabled(GL_BLEND);
+		eq_RGB = 0xFFFF;
+		f_sRGB = 0xFFFF;
+		f_dRGB = 0xFFFF;
+		f_sA = 0xFFFF;
+		f_dA = 0xFFFF;
+		{
+			// We only track a single value for all channels.
+			// So instead reset back to default values.
+			glBlendColor(0, 0, 0, 0);
+		}
+		wrgba = 0xFF;
+
+		depth = glIsEnabled(GL_DEPTH_TEST);
+		depth_func = 0xFFFFFFFF;
+		{
+			GLboolean mask;
+			glGetBooleanv(GL_DEPTH_WRITEMASK, &mask);
+			depth_mask = mask;
+		}
+
+		stencil = glIsEnabled(GL_STENCIL_TEST);
+		stencil_func = 0xFFFFFFFF;
+		stencil_pass = 0xFFFFFFFF;
+	}
 } // namespace GLState

pcsx2/GS/Renderers/OpenGL/GLState.h

@@ -51,5 +51,8 @@ namespace GLState
 	extern GLuint tex_unit[8]; // shader input texture
 
 	extern u32 UpdateDrawBuffers();
-	extern void Clear();
+	// Initilise GLState to initial api state.
+	extern void Init();
+	// Invalidate GLState, used when the api state was modified without updating this class.
+	extern void Invalidate();
 } // namespace GLState

pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp

@@ -286,7 +286,7 @@ bool GSDeviceOGL::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
 	}
 
 	// because of fbo bindings below...
-	GLState::Clear();
+	GLState::Init();
 
 	// ****************************************************************
 	// Debug helper
@@ -3448,13 +3448,13 @@ bool GSDeviceOGL::DoLibrashader(GSTexture* sTex, GSTexture* dTex)
 	libra_error_t err = libra_gl_filter_chain_frame(&chain, m_librashader_frame_count, input, output, &vp, nullptr, &frame_opts);
 	if (err)
 	{
-		libra_error_free(&err);
-		GLState::Clear();
+		Console.ErrorFmt("librashader: OpenGL frame rendering failed: {}", GetLibrashaderError(err));
+		GLState::Invalidate();
 		return false;
 	}
 
 	// librashader binds its own program/FBO/samplers wipe our cache so the next call rebinds.
-	GLState::Clear();
+	GLState::Invalidate();
 	return true;
 }