TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-03-20 15:51:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

srgb: Readd WGL/GLX extension checks when asking for sRGB-capable framebuffers.

Browse Source 
Reference Issue #14898.
This commit is contained in:
Ryan C. Gordon
2026-02-03 13:25:54 -05:00
parent 2b5ebb1170
commit a6c0052f39
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/video/windows/SDL_windowsopengl.c
View File

@@ -512,6 +512,13 @@ void WIN_GL_InitExtensions(SDL_VideoDevice *_this)
_this->gl_data->HAS_WGL_ARB_create_context_no_error = true;
}
// Check for WGL_ARB_framebuffer_sRGB
if (HasExtension("WGL_ARB_framebuffer_sRGB", extensions)) {
_this->gl_data->HAS_WGL_ARB_framebuffer_sRGB = true;
} else if (HasExtension("WGL_EXT_framebuffer_sRGB", extensions)) { // same thing.
_this->gl_data->HAS_WGL_ARB_framebuffer_sRGB = true;
}
/* Check for WGL_ARB_pixel_format_float */
_this->gl_data->HAS_WGL_ARB_pixel_format_float =
HasExtension("WGL_ARB_pixel_format_float", extensions);
@@ -532,9 +539,6 @@ static int WIN_GL_ChoosePixelFormatARB(SDL_VideoDevice *_this, int *iAttribs, fl
int pixel_format = 0;
unsigned int matching;
int qAttrib = WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB;
int srgb = 0;
hwnd =
CreateWindow(SDL_Appname, SDL_Appname, (WS_POPUP | WS_DISABLED), 0, 0,
10, 10, NULL, NULL, SDL_Instance, NULL);
@@ -556,7 +560,11 @@ static int WIN_GL_ChoosePixelFormatARB(SDL_VideoDevice *_this, int *iAttribs, fl
&matching);
// Check whether we actually got an SRGB capable buffer
_this->gl_data->wglGetPixelFormatAttribivARB(hdc, pixel_format, 0, 1, &qAttrib, &srgb);
int srgb = 0;
if (_this->gl_data->HAS_WGL_ARB_framebuffer_sRGB) {
int qAttrib = WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB;
_this->gl_data->wglGetPixelFormatAttribivARB(hdc, pixel_format, 0, 1, &qAttrib, &srgb);
}
_this->gl_config.framebuffer_srgb_capable = srgb;
}
@@ -651,9 +659,9 @@ static bool WIN_GL_SetupWindowInternal(SDL_VideoDevice *_this, SDL_Window *windo
*iAttr++ = WGL_TYPE_RGBA_FLOAT_ARB;
}
if (_this->gl_config.framebuffer_srgb_capable) {
if (_this->gl_data->HAS_WGL_ARB_framebuffer_sRGB && _this->gl_config.framebuffer_srgb_capable) {
*iAttr++ = WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB;
*iAttr++ = _this->gl_config.framebuffer_srgb_capable;
*iAttr++ = GL_TRUE;
}
/* We always choose either FULL or NO accel on Windows, because of flaky

1
src/video/windows/SDL_windowsopengl.h
View File

@@ -66,6 +66,7 @@ struct SDL_GLDriverData
bool HAS_WGL_ARB_create_context_no_error;
bool HAS_WGL_ARB_pixel_format_float;
bool HAS_WGL_EXT_create_context_es2_profile;
bool HAS_WGL_ARB_framebuffer_sRGB;
/* Max version of OpenGL ES context that can be created if the
implementation supports WGL_EXT_create_context_es2_profile.

9
src/video/x11/SDL_x11opengl.c
View File

@@ -466,6 +466,13 @@ static void X11_GL_InitExtensions(SDL_VideoDevice *_this)
_this->gl_data->HAS_GLX_ARB_create_context_no_error = true;
}
// Check for GLX_ARB_framebuffer_sRGB
if (HasExtension("GLX_ARB_framebuffer_sRGB", extensions)) {
_this->gl_data->HAS_GLX_ARB_framebuffer_sRGB = true;
} else if (HasExtension("GLX_EXT_framebuffer_sRGB", extensions)) { // same thing.
_this->gl_data->HAS_GLX_ARB_framebuffer_sRGB = true;
}
if (context) {
_this->gl_data->glXMakeCurrent(display, None, NULL);
_this->gl_data->glXDestroyContext(display, context);
@@ -576,7 +583,7 @@ static int X11_GL_GetAttributes(SDL_VideoDevice *_this, Display *display, int sc
attribs[i++] = GLX_RGBA_FLOAT_TYPE_ARB;
}
if (_this->gl_config.framebuffer_srgb_capable) {
if (_this->gl_data->HAS_GLX_ARB_framebuffer_sRGB && _this->gl_config.framebuffer_srgb_capable) {
attribs[i++] = GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB;
attribs[i++] = True; // always needed, for_FBConfig or not!
}

1
src/video/x11/SDL_x11opengl.h
View File

@@ -47,6 +47,7 @@ struct SDL_GLDriverData
bool HAS_GLX_ARB_context_flush_control;
bool HAS_GLX_ARB_create_context_robustness;
bool HAS_GLX_ARB_create_context_no_error;
bool HAS_GLX_ARB_framebuffer_sRGB;
/* Max version of OpenGL ES context that can be created if the
implementation supports GLX_EXT_create_context_es2_profile.