Make glXChooseFBConfig handle unspecified sRGB correctly
Make glXChooseFBConfig properly handle the case where the only matching configs have the sRGB flag set, but no sRGB attribute is specified. Since6e06e281, the sRGBcapable flag is now actually compared, using MATCH_DONT_CARE.7b0f912eadded defaulting of sRGBcapable to GL_FALSE in __glXInitializeVisualConfigFromTags(), to handle servers which don't report it, but this function is also used by glXChooseFBConfig(), so sRGBcapable is implicitly false when not explicitly specified. (This can cause e.g. glxinfo to fail to find anything matching the simple config it looks for if all the candidates have the sRGB flag set to true. I'm assuming this doesn't happen 'normally' as candidate configs with and without sRGB true are available) Move this defaulting to createConfigsFromProperties(), and set the default for glXChooseFBConfig() in init_fbconfig_for_chooser() to GLX_DONT_CARE. Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
@@ -937,6 +937,7 @@ init_fbconfig_for_chooser(struct glx_config * config,
|
||||
config->fbconfigID = (GLXFBConfigID) (GLX_DONT_CARE);
|
||||
|
||||
config->swapMethod = GLX_DONT_CARE;
|
||||
config->sRGBCapable = GLX_DONT_CARE;
|
||||
}
|
||||
|
||||
#define MATCH_DONT_CARE( param ) \
|
||||
|
||||
+2
-2
@@ -402,8 +402,6 @@ __glXInitializeVisualConfigFromTags(struct glx_config * config, int count,
|
||||
#endif
|
||||
}
|
||||
|
||||
config->sRGBCapable = GL_FALSE;
|
||||
|
||||
/*
|
||||
** Additional properties may be in a list at the end
|
||||
** of the reply. They are in pairs of property type
|
||||
@@ -660,6 +658,8 @@ createConfigsFromProperties(Display * dpy, int nvisuals, int nprops,
|
||||
*/
|
||||
m->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;
|
||||
#endif
|
||||
/* Older X servers don't send this so we default it here. */
|
||||
m->sRGBCapable = GL_FALSE;
|
||||
__glXInitializeVisualConfigFromTags(m, nprops, props,
|
||||
tagged_only, GL_TRUE);
|
||||
m->screen = screen;
|
||||
|
||||
Reference in New Issue
Block a user