Skip to content

A
angle
Commit 121ea584 by Corentin Wallez
Options

DisplayGLX: validate configs against the backing context's config

This is a step required before adding an ANGLE extension that will allow passing the Visual ID to use for the context at display creation time: the configs will have to be compatible with it even if the visual has non-standard sizes. BUG=522149 Change-Id: I85e8ee3b9072934c665bddfa2b461d26f8903ff3 Reviewed-on: https://chromium-review.googlesource.com/311220Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 91dbc188
Showing with 12 additions and 2 deletions
src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
...@@ -258,6 +258,14 @@ egl::ConfigSet DisplayGLX::generateConfigs() const ...@@ -258,6 +258,14 @@ egl::ConfigSet DisplayGLX::generateConfigs() const
bool hasSwapControl = mGLX.hasExtension("GLX_EXT_swap_control"); bool hasSwapControl = mGLX.hasExtension("GLX_EXT_swap_control");
int contextRedSize = getGLXFBConfigAttrib(mContextConfig, GLX_RED_SIZE);
int contextGreenSize = getGLXFBConfigAttrib(mContextConfig, GLX_GREEN_SIZE);
int contextBlueSize = getGLXFBConfigAttrib(mContextConfig, GLX_BLUE_SIZE);
int contextAlphaSize = getGLXFBConfigAttrib(mContextConfig, GLX_ALPHA_SIZE);
int contextDepthSize = getGLXFBConfigAttrib(mContextConfig, GLX_DEPTH_SIZE);
int contextStencilSize = getGLXFBConfigAttrib(mContextConfig, GLX_STENCIL_SIZE);
int contextSamples = getGLXFBConfigAttrib(mContextConfig, GLX_SAMPLES); int contextSamples = getGLXFBConfigAttrib(mContextConfig, GLX_SAMPLES);
int contextSampleBuffers = getGLXFBConfigAttrib(mContextConfig, GLX_SAMPLE_BUFFERS); int contextSampleBuffers = getGLXFBConfigAttrib(mContextConfig, GLX_SAMPLE_BUFFERS);
...@@ -296,7 +304,8 @@ egl::ConfigSet DisplayGLX::generateConfigs() const ...@@ -296,7 +304,8 @@ egl::ConfigSet DisplayGLX::generateConfigs() const
config.stencilSize = getGLXFBConfigAttrib(glxConfig, GLX_STENCIL_SIZE); config.stencilSize = getGLXFBConfigAttrib(glxConfig, GLX_STENCIL_SIZE);
// We require RGBA8 and the D24S8 (or no DS buffer) // We require RGBA8 and the D24S8 (or no DS buffer)
if (config.redSize != 8 || config.greenSize != 8 || config.blueSize != 8 || config.alphaSize != 8) if (config.redSize != contextRedSize || config.greenSize != contextGreenSize ||
config.blueSize != contextBlueSize || config.alphaSize != contextAlphaSize)
{ {
continue; continue;
} }
...@@ -304,7 +313,8 @@ egl::ConfigSet DisplayGLX::generateConfigs() const ...@@ -304,7 +313,8 @@ egl::ConfigSet DisplayGLX::generateConfigs() const
// however the Mesa Intel driver (and probably on other Mesa drivers) // however the Mesa Intel driver (and probably on other Mesa drivers)
// fails to make current when the Depth stencil doesn't exactly match the // fails to make current when the Depth stencil doesn't exactly match the
// configuration. // configuration.
bool hasSameDepthStencil = config.depthSize == 24 && config.stencilSize == 8; bool hasSameDepthStencil =
config.depthSize == contextDepthSize && config.stencilSize == contextStencilSize;
bool hasNoDepthStencil = config.depthSize == 0 && config.stencilSize == 0; bool hasNoDepthStencil = config.depthSize == 0 && config.stencilSize == 0;
if (!hasSameDepthStencil && (mIsMesa || !hasNoDepthStencil)) if (!hasSameDepthStencil && (mIsMesa || !hasNoDepthStencil))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment