diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/common/utils.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/fakeglx.c | 18 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/framebuffer.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_manager.c | 2 |
6 files changed, 3 insertions, 21 deletions
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 8621c36e988..0fdca2d9d84 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -355,7 +355,6 @@ driCreateConfigs(mesa_format format, modes->transparentBlue = GLX_DONT_CARE; modes->transparentAlpha = GLX_DONT_CARE; modes->transparentIndex = GLX_DONT_CARE; - modes->rgbMode = GL_TRUE; if (db_modes[i] == __DRI_ATTRIB_SWAP_NONE) { modes->doubleBufferMode = GL_FALSE; diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index af60bfaaa4e..593c8d1f7eb 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -1551,12 +1551,7 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig ) case GLX_RGBA: if (fbconfig) return GLX_BAD_ATTRIBUTE; - if (xmvis->mesa_visual.rgbMode) { - *value = True; - } - else { - *value = False; - } + *value = True; return 0; case GLX_DOUBLEBUFFER: *value = (int) xmvis->mesa_visual.doubleBufferMode; @@ -1618,12 +1613,7 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig ) } else if (xmvis->mesa_visual.level>0) { /* overlay */ - if (xmvis->mesa_visual.rgbMode) { - *value = GLX_TRANSPARENT_RGB_EXT; - } - else { - *value = GLX_TRANSPARENT_INDEX_EXT; - } + *value = GLX_TRANSPARENT_RGB_EXT; } else if (xmvis->mesa_visual.level<0) { /* underlay */ @@ -1691,10 +1681,8 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig ) return GLX_BAD_ATTRIBUTE; if (xmvis->mesa_visual.floatMode) *value = GLX_RGBA_FLOAT_BIT_ARB; - else if (xmvis->mesa_visual.rgbMode) - *value = GLX_RGBA_BIT; else - *value = GLX_COLOR_INDEX_BIT; + *value = GLX_RGBA_BIT; break; case GLX_X_RENDERABLE_SGIX: if (!fbconfig) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index ee5eee32948..5a8f0ff191e 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -287,7 +287,6 @@ _mesa_initialize_visual( struct gl_config *vis, assert(accumBlueBits >= 0); assert(accumAlphaBits >= 0); - vis->rgbMode = GL_TRUE; vis->doubleBufferMode = dbFlag; vis->stereoMode = stereoFlag; diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c index 727831e3d97..9246a0465a6 100644 --- a/src/mesa/main/framebuffer.c +++ b/src/mesa/main/framebuffer.c @@ -435,7 +435,6 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx, struct gl_framebuffer *fb) { memset(&fb->Visual, 0, sizeof(fb->Visual)); - fb->Visual.rgbMode = GL_TRUE; /* assume this */ /* find first RGB renderbuffer */ for (unsigned i = 0; i < BUFFER_COUNT; i++) { diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index af5b60fcf5a..b7eef64bfd9 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -159,7 +159,6 @@ _mesa_varying_slot_in_fs(gl_varying_slot slot) */ struct gl_config { - GLboolean rgbMode; GLboolean floatMode; GLuint doubleBufferMode; GLuint stereoMode; diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index b49e269124c..62af7ba921b 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -380,8 +380,6 @@ st_visual_to_context_mode(const struct st_visual *visual, mode->stereoMode = GL_TRUE; if (visual->color_format != PIPE_FORMAT_NONE) { - mode->rgbMode = GL_TRUE; - mode->redBits = util_format_get_component_bits(visual->color_format, UTIL_FORMAT_COLORSPACE_RGB, 0); |