commit 56e52b3324b7252db741bc537cd13c03a8d3d229
author Ryan C. Gordon <icculus@icculus.org> Thu Sep 10 15:02:51 2020 -0400
committer Ryan C. Gordon <icculus@icculus.org> Thu Sep 10 15:02:51 2020 -0400
tree b41720a0f0d0492bb6f6c8e407abbe23984b2dea
parent abbdf5121e01e4a622ea06e70fa9b136090a551b

video: Set up default before calling GL_DefaultProfileConfig().

This way, the implementation can opt to do nothing to accept SDL's defaults.

--HG--
extra : rebase_source : 3acc3d3caef859db4864c585d133515c0724c6fe

src/video/SDL_video.c

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 182b3c7..6696e6c 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -3149,24 +3149,24 @@
     _this->gl_config.retained_backing = 1;
     _this->gl_config.accelerated = -1;  /* accelerated or not, both are fine */
 
+#if SDL_VIDEO_OPENGL
+    _this->gl_config.major_version = 2;
+    _this->gl_config.minor_version = 1;
+    _this->gl_config.profile_mask = 0;
+#elif SDL_VIDEO_OPENGL_ES2
+    _this->gl_config.major_version = 2;
+    _this->gl_config.minor_version = 0;
+    _this->gl_config.profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
+#elif SDL_VIDEO_OPENGL_ES
+    _this->gl_config.major_version = 1;
+    _this->gl_config.minor_version = 1;
+    _this->gl_config.profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
+#endif
+
     if (_this->GL_DefaultProfileConfig) {
         _this->GL_DefaultProfileConfig(_this, &_this->gl_config.profile_mask,
                                        &_this->gl_config.major_version,
                                        &_this->gl_config.minor_version);
-    } else {
-#if SDL_VIDEO_OPENGL
-        _this->gl_config.major_version = 2;
-        _this->gl_config.minor_version = 1;
-        _this->gl_config.profile_mask = 0;
-#elif SDL_VIDEO_OPENGL_ES2
-        _this->gl_config.major_version = 2;
-        _this->gl_config.minor_version = 0;
-        _this->gl_config.profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
-#elif SDL_VIDEO_OPENGL_ES
-        _this->gl_config.major_version = 1;
-        _this->gl_config.minor_version = 1;
-        _this->gl_config.profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
-#endif
     }
 
     _this->gl_config.flags = 0;