diff options
author | Fredrik Höglund <[email protected]> | 2014-02-13 21:07:09 +0100 |
---|---|---|
committer | Fredrik Höglund <[email protected]> | 2014-02-26 02:16:42 +0100 |
commit | f41c2f6c332ae9b9784ac924b718963a1086cb85 (patch) | |
tree | bf1493f6c066baaf41fd778feb2a01fcf0cd38c7 | |
parent | 54df6a049110464c4ba2ad97b12b69ede927eca4 (diff) |
glx: Fix the default values for GLXFBConfig attributes
The default values for GLX_DRAWABLE_TYPE and GLX_RENDER_TYPE are
GLX_WINDOW_BIT and GLX_RGBA_BIT respectively, as specified in
the GLX 1.4 specification.
This fixes the glx-choosefbconfig-defaults piglit test.
Cc: "9.2 10.0 10.1" <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r-- | src/glx/glxcmds.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 38a5262e9a5..43c473bc47b 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -925,13 +925,10 @@ init_fbconfig_for_chooser(struct glx_config * config, if (fbconfig_style_tags) { config->rgbMode = GL_TRUE; config->doubleBufferMode = GLX_DONT_CARE; - /* allow any kind of drawable, including those for off-screen buffers */ - config->drawableType = 0; - } else { - /* allow configs which support on-screen drawing */ - config->drawableType = GLX_WINDOW_BIT; + config->renderType = GLX_RGBA_BIT; } + config->drawableType = GLX_WINDOW_BIT; config->visualRating = GLX_DONT_CARE; config->transparentPixel = GLX_NONE; config->transparentRed = GLX_DONT_CARE; @@ -940,8 +937,6 @@ init_fbconfig_for_chooser(struct glx_config * config, config->transparentAlpha = GLX_DONT_CARE; config->transparentIndex = GLX_DONT_CARE; - /* Set GLX_RENDER_TYPE property to not expect any flags by default. */ - config->renderType = 0; config->xRenderable = GLX_DONT_CARE; config->fbconfigID = (GLXFBConfigID) (GLX_DONT_CARE); |