Revert "i965/fs: Change fs_visitor::emit_lrp to use MAC for gen<6"

[mesa.git] / src / glx / glxconfig.c

diff --git a/src/glx/glxconfig.c b/src/glx/glxconfig.c
index 805c301efb46ab497f94d9767befe75f9433c548..e5718b143fcacba40efae58d53b72ae709ac6b8c 100644 (file)
--- 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.
@@ -230,7 +230,7 @@ glx_config_create_list(unsigned count)
 
    next = &base;
    for (i = 0; i < count; i++) {
-      *next = (struct glx_config *) malloc(size);
+      *next = malloc(size);
       if (*next == NULL) {
         glx_config_destroy_list(base);
         base = NULL;
@@ -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);
    }