Attachment #325 for bug #2998

View | Details | Raw Unified | Return to bug 2998
Collapse All | Expand All




static int
scalarEqual(__GLcontextModes *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 equal to value? */

		glxValue |= GLX_TEXTURE_2D_BIT_EXT;
	    if (value & __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT)
		glxValue |= GLX_TEXTURE_RECTANGLE_BIT_EXT;
	    if (modes->bindToTextureTargets != GLX_DONT_CARE &&
		glxValue != modes->bindToTextureTargets)
		return GL_FALSE;
	    break;	


Lines 415-421 _gl_context_modes_create( unsigned count, size_t minimum_size ) Link Here

(-)a/src/glx/x11/glcontextmodes.c (-2 / +1 lines)
415	(*next)->bindToTextureRgb = GLX_DONT_CARE;	415	(*next)->bindToTextureRgb = GLX_DONT_CARE;
416	(*next)->bindToTextureRgba = GLX_DONT_CARE;	416	(*next)->bindToTextureRgba = GLX_DONT_CARE;
417	(*next)->bindToMipmapTexture = GLX_DONT_CARE;	417	(*next)->bindToMipmapTexture = GLX_DONT_CARE;
418	(*next)->bindToTextureTargets = 0;	418	(*next)->bindToTextureTargets = GLX_DONT_CARE;
419	(*next)->yInverted = GLX_DONT_CARE;	419	(*next)->yInverted = GLX_DONT_CARE;
420		420
421	next = & ((*next)->next);	421	next = & ((*next)->next);
422	-

Return to bug 2998

Lines 520-532 static const struct { unsigned int attrib, offset; } attribMap[] = { Link Here

(-)a/src/glx/x11/dri_glx.c (-4 / +5 lines)
520	static int	520	static int
521	scalarEqual(__GLcontextModes *mode, unsigned int attrib, unsigned int value)	521	scalarEqual(__GLcontextModes *mode, unsigned int attrib, unsigned int value)
522	{	522	{
523	unsigned int driValue;	523	unsigned int glxValue;
524	int i;	524	int i;
525		525
526	for (i = 0; i < ARRAY_SIZE(attribMap); i++)	526	for (i = 0; i < ARRAY_SIZE(attribMap); i++)
527	if (attribMap[i].attrib == attrib) {	527	if (attribMap[i].attrib == attrib) {
528	driValue = (unsigned int ) ((char *) mode + attribMap[i].offset);	528	glxValue = (unsigned int ) ((char *) mode + attribMap[i].offset);
529	return driValue == value;	529	return glxValue == GLX_DONT_CARE \|\| glxValue == value;
530	}	530	}
531		531
532	return GL_TRUE; /* Is a non-existing attribute equal to value? */	532	return GL_TRUE; /* Is a non-existing attribute equal to value? */
Lines 572-578 driConfigEqual(const __DRIcoreExtension *core, Link Here
572	glxValue \|= GLX_TEXTURE_2D_BIT_EXT;	572	glxValue \|= GLX_TEXTURE_2D_BIT_EXT;
573	if (value & __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT)	573	if (value & __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT)
574	glxValue \|= GLX_TEXTURE_RECTANGLE_BIT_EXT;	574	glxValue \|= GLX_TEXTURE_RECTANGLE_BIT_EXT;
575	if (glxValue != modes->bindToTextureTargets)	575	if (modes->bindToTextureTargets != GLX_DONT_CARE &&
		576	glxValue != modes->bindToTextureTargets)
576	return GL_FALSE;	577	return GL_FALSE;
577	break;	578	break;
578		579