use wglCreateContextAttribsARB

Author: Adam-

rlawt_windows.c

@@ -45,6 +45,44 @@ void rlawtThrow(JNIEnv *env, const char *msg) {
 	}
 }
 
+static HGLRC createContext(HDC hdc) {
+	HGLRC base = wglCreateContext(hdc);
+	if (!base) {
+		return NULL;
+	}
+
+	if (!wglMakeCurrent(hdc, base)) {
+		wglDeleteContext(base);
+		return NULL;
+	}
+
+	PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress("wglCreateContextAttribsARB");
+	if (wglCreateContextAttribsARB) {
+		// The default values for WGL_CONTEXT_MAJOR_VERSION_ARB and WGL_CONTEXT_MINOR_VERSION_ARB are 1 and 0 respectively. In this case,
+		// implementations will typically return the most recent version of OpenGL they support which is backwards compatible with OpenGL 1.0.
+		const int attribs[] = {
+			WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+			0
+		};
+		HGLRC gl = wglCreateContextAttribsARB(hdc, 0, attribs);
+		if (!gl) {
+			wglDeleteContext(base);
+			return NULL;
+		}
+
+		if (!wglMakeCurrent(hdc, gl)) {
+			wglDeleteContext(base);
+			wglDeleteContext(gl);
+			return NULL;
+		}
+
+		wglDeleteContext(base);
+		return gl;
+	} else {
+		return base;
+	}
+}
+
 static bool makeCurrent(JNIEnv *env, HDC dc, HGLRC context) {
 	if (!wglMakeCurrent(dc, context)) {
 		rlawtThrow(env, "unable to make current");
@@ -107,16 +145,12 @@ JNIEXPORT void JNICALL Java_net_runelite_rlawt_AWTContext_createGLContext(JNIEnv
 		goto unlock;
 	}
 
-	ctx->context = wglCreateContext(ctx->dspi->hdc);
+	ctx->context = createContext(ctx->dspi->hdc);
 	if (!ctx->context) {
 		rlawtThrow(env, "unable to create context");
 		goto unlock;
 	}
 
-	if (!makeCurrent(env, ctx->dspi->hdc, ctx->context)) {
-		goto freeContext;
-	}
-
 	PFNWGLGETEXTENSIONSSTRINGEXTPROC wglGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC) wglGetProcAddress("wglGetExtensionsStringEXT");
 	if (wglGetExtensionsStringEXT) {
 		const char *extensions = wglGetExtensionsStringEXT();
@@ -132,8 +166,6 @@ JNIEXPORT void JNICALL Java_net_runelite_rlawt_AWTContext_createGLContext(JNIEnv
 	ctx->contextCreated = true;
 	return;
 
-freeContext:
-	wglDeleteContext(ctx->context);
 unlock:
 	jthrowable exception = (*env)->ExceptionOccurred(env);
 	ctx->ds->Unlock(ctx->ds);