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

glx/dri: add initial dri interface for GLX_EXT_framebuffer_sRGB. 

This realigns the name of the glx bit to align with the core mesa names.
This commit is contained in:
Dave Airlie 2011-03-06 20:06:42 +10:00
parent b09b3e5c8f
commit 6538b5824e
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/glx/dri_common.c
View File

@ -222,7 +222,9 @@ __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGB, bindToTextureRgb),
__ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGBA, bindToTextureRgba),
__ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE,
bindToMipmapTexture),
__ATTRIB(__DRI_ATTRIB_YINVERTED, yInverted),};
__ATTRIB(__DRI_ATTRIB_YINVERTED, yInverted),
__ATTRIB(__DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE, sRGBCapable)
};
static int
scalarEqual(struct glx_config *mode, unsigned int attrib, unsigned int value)

4
src/glx/glxconfig.c
View File

@ -189,7 +189,7 @@ glx_config_get(struct glx_config * mode, int attribute, int *value_return)
return 0;
case GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT:
*value_return = mode->framebuffer_srgb_capable;
*value_return = mode->sRGBCapable;
return 0;
/* Applications are NOT allowed to query GLX_VISUAL_SELECT_GROUP_SGIX.
@ -255,7 +255,7 @@ glx_config_create_list(unsigned count)
(*next)->bindToMipmapTexture = GLX_DONT_CARE;
(*next)->bindToTextureTargets = GLX_DONT_CARE;
(*next)->yInverted = GLX_DONT_CARE;
(*next)->framebuffer_srgb_capable = GLX_DONT_CARE;
(*next)->sRGBCapable = GLX_DONT_CARE;
next = &((*next)->next);
}

2
src/glx/glxconfig.h
View File

@ -102,7 +102,7 @@ struct glx_config {
GLint yInverted;
/* EXT_framebuffer_sRGB */
GLint framebuffer_srgb_capable;
GLint sRGBCapable;
};
#define __GLX_MIN_CONFIG_PROPS 18

2
src/glx/glxext.c
View File

@ -547,7 +547,7 @@ __glXInitializeVisualConfigFromTags(struct glx_config * config, int count,
break;
#endif
case GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT:
config->framebuffer_srgb_capable = *bp++;
config->sRGBCapable = *bp++;
break;
case GLX_USE_GL:

3
src/mesa/drivers/dri/common/utils.c
View File

@ -648,6 +648,8 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type,
__DRI_ATTRIB_TEXTURE_1D_BIT |
__DRI_ATTRIB_TEXTURE_2D_BIT |
__DRI_ATTRIB_TEXTURE_RECTANGLE_BIT;
modes->sRGBCapable = GL_FALSE;
}
}
}
@ -727,6 +729,7 @@ static const struct { unsigned int attrib, offset; } attribMap[] = {
__ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE, bindToMipmapTexture),
__ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS, bindToTextureTargets),
__ATTRIB(__DRI_ATTRIB_YINVERTED, yInverted),
__ATTRIB(__DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE, sRGBCapable),
/* The struct field doesn't matter here, these are handled by the
* switch in driGetConfigAttribIndex. We need them in the array