From 51163c2d9ccfe22ab2e8740119edc27bc947ad0c Mon Sep 17 00:00:00 2001
From: George Tokmaji <tokmajigeorge@gmail.com>
Date: Fri, 19 May 2023 12:25:06 +0200
Subject: [PATCH] CStdGLCtx: Don't deselect the current context on context
 creation since secondary contexts don't get selected afterwards

---
 src/StdGLCtx.cpp | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/StdGLCtx.cpp b/src/StdGLCtx.cpp
index 59d9bf656..b05dbfec4 100644
--- a/src/StdGLCtx.cpp
+++ b/src/StdGLCtx.cpp
@@ -101,7 +101,6 @@ bool CStdGLCtx::Init(CStdWindow *pWindow, CStdApp *pApp, HWND hWindow)
 	hrc = wglCreateContext(hDC); if (!hrc) return !!pGL->Error("  gl: Error creating gl context");
 
 	// share textures
-	wglMakeCurrent(nullptr, nullptr); pGL->pCurrCtx = nullptr;
 	if (this != &pGL->MainCtx)
 	{
 		if (!wglShareLists(pGL->MainCtx.hrc, hrc)) pGL->Error("  gl: Textures for secondary context not available");
@@ -242,13 +241,17 @@ bool CStdGLCtx::Init(CStdWindow *pWindow, CStdApp *)
 		ctx = glXCreateContext(pWindow->dpy, reinterpret_cast<XVisualInfo *>(pWindow->Info), pGL->MainCtx.ctx, False);
 	// No luck at all?
 	if (!ctx) return pGL->Error("  gl: Unable to create context");
-	if (!Select(true)) return pGL->Error("  gl: Unable to select context");
-	// init extensions
-	GLenum err = glewInit();
-	if (GLEW_OK != err)
+
+	if (this == &pGL->MainCtx)
 	{
-		// Problem: glewInit failed, something is seriously wrong.
-		pGL->Error(reinterpret_cast<const char *>(glewGetErrorString(err)));
+		if (!Select(true)) return pGL->Error("  gl: Unable to select context");
+		// init extensions
+		GLenum err = glewInit();
+		if (GLEW_OK != err)
+		{
+			// Problem: glewInit failed, something is seriously wrong.
+			pGL->Error(reinterpret_cast<const char *>(glewGetErrorString(err)));
+		}
 	}
 	return true;
 }
@@ -410,14 +413,18 @@ bool CStdGLCtx::Init(CStdWindow *pWindow, CStdApp *)
 	// store window
 	this->pWindow = pWindow;
 	assert(!Config.Graphics.NoAcceleration);
-	// No luck at all?
-	if (!Select(true)) return pGL->Error("  gl: Unable to select context");
-	// init extensions
-	GLenum err = glewInit();
-	if (GLEW_OK != err)
+
+	if (this == &pGL->MainCtx)
 	{
-		// Problem: glewInit failed, something is seriously wrong.
-		pGL->Error(reinterpret_cast<const char *>(glewGetErrorString(err)));
+		// No luck at all?
+		if (!Select(true)) return pGL->Error("  gl: Unable to select context");
+		// init extensions
+		GLenum err = glewInit();
+		if (GLEW_OK != err)
+		{
+			// Problem: glewInit failed, something is seriously wrong.
+			pGL->Error(reinterpret_cast<const char *>(glewGetErrorString(err)));
+		}
 	}
 	return true;
 }