From bd1f988741efb956b8e58439d8c5348f11e2bcdd Mon Sep 17 00:00:00 2001 From: cyanea-bt <150618858+cyanea-bt@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:20:52 +0200 Subject: [PATCH] Fix OpenGL renderer init failure. (Regression from commit 76fe5f7. Fixes #815.) --- desmume/src/OGLRender.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp index 8bb53eda1..685c67113 100644 --- a/desmume/src/OGLRender.cpp +++ b/desmume/src/OGLRender.cpp @@ -954,6 +954,12 @@ static Render3D* OpenGLRendererCreate() INFO("OpenGL: oglrender_init is unassigned. Clients must assign this function pointer and have a working context before running OpenGL.\n"); return newRenderer; } + + if (!oglrender_init()) + { + INFO("OpenGL: oglrender_init failed.\n"); + return newRenderer; + } if (oglrender_beginOpenGL == NULL) { @@ -967,11 +973,6 @@ static Render3D* OpenGLRendererCreate() return newRenderer; } - if (!oglrender_init()) - { - return newRenderer; - } - if (!BEGINGL()) { char variantString[32] = {0};