From c4990b7b19b5ea4ebec1fa4c4a94bfed33c34b9f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 6 Sep 2019 11:43:19 -0400 Subject: [PATCH] mesa: Remove unused gl_config::indexBits MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Eric Anholt Reviewed-by: Marek Olšák --- src/gallium/state_trackers/glx/xlib/xm_api.c | 2 -- src/mesa/drivers/x11/xm_api.c | 1 - src/mesa/main/context.c | 2 -- src/mesa/main/get_hash_params.py | 2 +- src/mesa/main/mtypes.h | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index d63ea485e1b..a2ef87fa10f 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -666,7 +666,6 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b, "XMesa: RGB mode rendering not supported in given visual.\n"); return GL_FALSE; } - v->mesa_visual.indexBits = 0; if (v->BitsPerPixel == 32) { /* We use XImages for all front/back buffers. If an X Window or @@ -859,7 +858,6 @@ XMesaVisual XMesaCreateVisual( Display *display, vis->alphaBits = alpha_bits; vis->rgbBits = red_bits + green_bits + blue_bits; - vis->indexBits = 0; vis->depthBits = depth_size; vis->stencilBits = stencil_size; diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 90f89a36221..6857789a011 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -582,7 +582,6 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b, _mesa_warning(NULL, "XMesa: RGB mode rendering not supported in given visual.\n"); return GL_FALSE; } - v->mesa_visual.indexBits = 0; if (getenv("MESA_NO_DITHER")) { v->dithered_pf = v->undithered_pf; diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index d77647ccda9..0dd83e564b1 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -205,7 +205,6 @@ _mesa_notifySwapBuffers(struct gl_context *ctx) * \param stencilBits requested minimum bits per stencil buffer value * \param accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits number * of bits per color component in accum buffer. - * \param indexBits number of bits per pixel if \p rgbFlag is GL_FALSE * \param redBits number of bits per color component in frame buffer for RGB(A) * mode. We always use 8 in core Mesa though. * \param greenBits same as above. @@ -298,7 +297,6 @@ _mesa_initialize_visual( struct gl_config *vis, vis->alphaBits = alphaBits; vis->rgbBits = redBits + greenBits + blueBits; - vis->indexBits = 0; vis->depthBits = depthBits; vis->stencilBits = stencilBits; diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 3e67a5adf11..bd56b4e6c00 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -714,7 +714,7 @@ descriptor=[ [ "FOG_INDEX", "CONTEXT_FLOAT(Fog.Index), NO_EXTRA" ], [ "GREEN_BIAS", "CONTEXT_FLOAT(Pixel.GreenBias), NO_EXTRA" ], [ "GREEN_SCALE", "CONTEXT_FLOAT(Pixel.GreenScale), NO_EXTRA" ], - [ "INDEX_BITS", "BUFFER_INT(Visual.indexBits), extra_new_buffers" ], + [ "INDEX_BITS", "CONST(0), NO_EXTRA" ], [ "INDEX_CLEAR_VALUE", "CONTEXT_INT(Color.ClearIndex), NO_EXTRA" ], [ "INDEX_MODE", "CONST(0) , NO_EXTRA" ], [ "INDEX_OFFSET", "CONTEXT_INT(Pixel.IndexOffset), NO_EXTRA" ], diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index f035287ac7e..5c633938f37 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -172,7 +172,6 @@ struct gl_config GLuint redMask, greenMask, blueMask, alphaMask; GLint redShift, greenShift, blueShift, alphaShift; GLint rgbBits; /* total bits for rgb */ - GLint indexBits; /* total bits for colorindex */ GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits; GLint depthBits; -- 2.30.2