KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Match swrast modes more loosely." 

This reverts commit f3728a16c9.

It broke glxgears on radeonsi. The window was just black.
This commit is contained in:
Marek Olšák 2015-07-23 21:51:48 +02:00
parent d6b50ba980
commit a6f39ec1c5
1 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/glx/dri_common.c
View File

@ -265,36 +265,6 @@ scalarEqual(struct glx_config *mode, unsigned int attrib, unsigned int value)
return GL_TRUE; /* Is a non-existing attribute equal to value? */
}
static int
scalarGreaterEqual(struct glx_config *mode, unsigned int attrib, unsigned int value)
{
unsigned int glxValue;
int i;
for (i = 0; i < ARRAY_SIZE(attribMap); i++)
if (attribMap[i].attrib == attrib) {
glxValue = *(unsigned int *) ((char *) mode + attribMap[i].offset);
return glxValue == GLX_DONT_CARE || glxValue >= value;
}
return GL_TRUE; /* Is a non-existing attribute greater than or equal to value? */
}
static int
booleanSupported(struct glx_config *mode, unsigned int attrib, unsigned int value)
{
unsigned int glxValue;
int i;
for (i = 0; i < ARRAY_SIZE(attribMap); i++)
if (attribMap[i].attrib == attrib) {
glxValue = *(unsigned int *) ((char *) mode + attribMap[i].offset);
return glxValue == GLX_DONT_CARE || glxValue;
}
return GL_TRUE; /* Is a non-existing attribute supported? */
}
static int
driConfigEqual(const __DRIcoreExtension *core,
struct glx_config *config, const __DRIconfig *driConfig)
@ -343,37 +313,10 @@ driConfigEqual(const __DRIcoreExtension *core,
if (value & __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT)
glxValue |= GLX_TEXTURE_RECTANGLE_BIT_EXT;
if (config->bindToTextureTargets != GLX_DONT_CARE &&
glxValue != (config->bindToTextureTargets & glxValue))
glxValue != config->bindToTextureTargets)
return GL_FALSE;
break;
case __DRI_ATTRIB_STENCIL_SIZE:
case __DRI_ATTRIB_ACCUM_RED_SIZE:
case __DRI_ATTRIB_ACCUM_GREEN_SIZE:
case __DRI_ATTRIB_ACCUM_BLUE_SIZE:
case __DRI_ATTRIB_ACCUM_ALPHA_SIZE:
if (value != 0 && !scalarEqual(config, attrib, value))
return GL_FALSE;
break;
case __DRI_ATTRIB_DOUBLE_BUFFER:
case __DRI_ATTRIB_BIND_TO_TEXTURE_RGB:
case __DRI_ATTRIB_BIND_TO_TEXTURE_RGBA:
case __DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE:
case __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE:
if (value && !booleanSupported(config, attrib, value))
return GL_FALSE;
break;
case __DRI_ATTRIB_SAMPLE_BUFFERS:
case __DRI_ATTRIB_SAMPLES:
case __DRI_ATTRIB_AUX_BUFFERS:
case __DRI_ATTRIB_MAX_PBUFFER_WIDTH:
case __DRI_ATTRIB_MAX_PBUFFER_HEIGHT:
case __DRI_ATTRIB_MAX_PBUFFER_PIXELS:
if (!scalarGreaterEqual(config, attrib, value))
return GL_FALSE;
default:
if (!scalarEqual(config, attrib, value))
return GL_FALSE;