summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-03-06 20:06:42 +1000
committerDave Airlie <airlied@redhat.com>2011-03-06 20:06:42 +1000
commit6538b5824e298eaebede2d9686c7607c44ab446a (patch)
treec781c1a032ef4b080707cfb513f8036c115c0165 /src/glx
parentb09b3e5c8f4f5d71b986bf359b56e7b60424538d (diff)
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.
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/dri_common.c4
-rw-r--r--src/glx/glxconfig.c4
-rw-r--r--src/glx/glxconfig.h2
-rw-r--r--src/glx/glxext.c2
4 files changed, 7 insertions, 5 deletions
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 83d6e3c310..06a73e4a6b 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -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)
diff --git a/src/glx/glxconfig.c b/src/glx/glxconfig.c
index 805c301efb..c3e1d5a568 100644
--- a/src/glx/glxconfig.c
+++ b/src/glx/glxconfig.c
@@ -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);
}
diff --git a/src/glx/glxconfig.h b/src/glx/glxconfig.h
index a587612cc4..2f1074ca5f 100644
--- a/src/glx/glxconfig.h
+++ b/src/glx/glxconfig.h
@@ -102,7 +102,7 @@ struct glx_config {
GLint yInverted;
/* EXT_framebuffer_sRGB */
- GLint framebuffer_srgb_capable;
+ GLint sRGBCapable;
};
#define __GLX_MIN_CONFIG_PROPS 18
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 38622f3826..e35dcb73e8 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -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: