OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove checks of Visual.rgbMode

Browse Source 
This must always be true now, so there is no reason to check it.  Ever.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Ian Romanick
2010-02-24 18:58:38 -08:00
parent fcf438e9e0
commit 22a96f3058
8 changed files with 48 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/mesa/main/clear.c
View File

@@ -51,11 +51,6 @@ _mesa_ClearIndex( GLfloat c )
FLUSH_VERTICES(ctx, _NEW_COLOR); FLUSH_VERTICES(ctx, _NEW_COLOR);
ctx->Color.ClearIndex = (GLuint) c; ctx->Color.ClearIndex = (GLuint) c;
if (!ctx->Visual.rgbMode && ctx->Driver.ClearIndex) {
/* it's OK to call glClearIndex in RGBA mode but it should be a NOP */
(*ctx->Driver.ClearIndex)( ctx, ctx->Color.ClearIndex );
}
} }
#endif #endif
@@ -92,7 +87,7 @@ _mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
FLUSH_VERTICES(ctx, _NEW_COLOR); FLUSH_VERTICES(ctx, _NEW_COLOR);
COPY_4V(ctx->Color.ClearColor, tmp); COPY_4V(ctx->Color.ClearColor, tmp);
if (ctx->Visual.rgbMode && ctx->Driver.ClearColor) { if (ctx->Driver.ClearColor) {
/* it's OK to call glClearColor in CI mode but it should be a NOP */ /* it's OK to call glClearColor in CI mode but it should be a NOP */
(*ctx->Driver.ClearColor)(ctx, ctx->Color.ClearColor); (*ctx->Driver.ClearColor)(ctx, ctx->Color.ClearColor);
} }
@@ -261,11 +256,6 @@ _mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
FLUSH_CURRENT(ctx, 0); FLUSH_CURRENT(ctx, 0);
if (!ctx->DrawBuffer->Visual.rgbMode) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glClearBufferiv()");
return;
}
if (ctx->NewState) { if (ctx->NewState) {
_mesa_update_state( ctx ); _mesa_update_state( ctx );
} }
@@ -342,11 +332,6 @@ _mesa_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
FLUSH_CURRENT(ctx, 0); FLUSH_CURRENT(ctx, 0);
if (!ctx->DrawBuffer->Visual.rgbMode) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glClearBufferuiv()");
return;
}
if (ctx->NewState) { if (ctx->NewState) {
_mesa_update_state( ctx ); _mesa_update_state( ctx );
} }
@@ -401,11 +386,6 @@ _mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
FLUSH_CURRENT(ctx, 0); FLUSH_CURRENT(ctx, 0);
if (!ctx->DrawBuffer->Visual.rgbMode) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glClearBufferfv()");
return;
}
if (ctx->NewState) { if (ctx->NewState) {
_mesa_update_state( ctx ); _mesa_update_state( ctx );
} }
@@ -480,11 +460,6 @@ _mesa_ClearBufferfi(GLenum buffer, GLint drawbuffer,
FLUSH_CURRENT(ctx, 0); FLUSH_CURRENT(ctx, 0);
if (!ctx->DrawBuffer->Visual.rgbMode) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glClearBufferfi()");
return;
}
if (buffer != GL_DEPTH_STENCIL) { if (buffer != GL_DEPTH_STENCIL) {
_mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfi(buffer=%s)", _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfi(buffer=%s)",
_mesa_lookup_enum_by_nr(buffer)); _mesa_lookup_enum_by_nr(buffer));

2
src/mesa/main/context.c
View File

@@ -1164,8 +1164,6 @@ check_compatible(const GLcontext *ctx, const GLframebuffer *buffer)
if (ctxvis == bufvis) if (ctxvis == bufvis)
return GL_TRUE; return GL_TRUE;
if (ctxvis->rgbMode != bufvis->rgbMode)
return GL_FALSE;
#if 0 #if 0
/* disabling this fixes the fgl_glxgears pbuffer demo */ /* disabling this fixes the fgl_glxgears pbuffer demo */
if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode) if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode)

11
src/mesa/main/feedback.c
View File

@@ -78,18 +78,13 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
ctx->Feedback._Mask = FB_3D; ctx->Feedback._Mask = FB_3D;
break; break;
case GL_3D_COLOR: case GL_3D_COLOR:
ctx->Feedback._Mask = (FB_3D | ctx->Feedback._Mask = (FB_3D | FB_COLOR);
(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX));
break; break;
case GL_3D_COLOR_TEXTURE: case GL_3D_COLOR_TEXTURE:
ctx->Feedback._Mask = (FB_3D | ctx->Feedback._Mask = (FB_3D | FB_COLOR | FB_TEXTURE);
(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
FB_TEXTURE);
break; break;
case GL_4D_COLOR_TEXTURE: case GL_4D_COLOR_TEXTURE:
ctx->Feedback._Mask = (FB_3D | FB_4D | ctx->Feedback._Mask = (FB_3D | FB_4D | FB_COLOR | FB_TEXTURE);
(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
FB_TEXTURE);
break; break;
default: default:
_mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" ); _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );

7
src/mesa/main/framebuffer.c
View File

@@ -536,7 +536,7 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
} }
#endif #endif
/* find first RGB or CI renderbuffer */ /* find first RGB renderbuffer */
for (i = 0; i < BUFFER_COUNT; i++) { for (i = 0; i < BUFFER_COUNT; i++) {
if (fb->Attachment[i].Renderbuffer) { if (fb->Attachment[i].Renderbuffer) {
const struct gl_renderbuffer *rb = fb->Attachment[i].Renderbuffer; const struct gl_renderbuffer *rb = fb->Attachment[i].Renderbuffer;
@@ -554,11 +554,6 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
fb->Visual.samples = rb->NumSamples; fb->Visual.samples = rb->NumSamples;
break; break;
} }
else if (baseFormat == GL_COLOR_INDEX) {
fb->Visual.indexBits = _mesa_get_format_bits(fmt, GL_INDEX_BITS);
fb->Visual.rgbMode = GL_FALSE;
break;
}
} }
} }

41
src/mesa/main/light.c
View File

@@ -1093,31 +1093,22 @@ _mesa_update_lighting( GLcontext *ctx )
* FLUSH_UPDATE_CURRENT, as when any outstanding material changes * FLUSH_UPDATE_CURRENT, as when any outstanding material changes
* are flushed, they will update the derived state at that time. * are flushed, they will update the derived state at that time.
*/ */
if (ctx->Visual.rgbMode) { if (ctx->Light.Model.TwoSide)
if (ctx->Light.Model.TwoSide) _mesa_update_material(ctx,
_mesa_update_material( ctx, MAT_BIT_FRONT_EMISSION |
MAT_BIT_FRONT_EMISSION | MAT_BIT_FRONT_AMBIENT |
MAT_BIT_FRONT_AMBIENT | MAT_BIT_FRONT_DIFFUSE |
MAT_BIT_FRONT_DIFFUSE | MAT_BIT_FRONT_SPECULAR |
MAT_BIT_FRONT_SPECULAR | MAT_BIT_BACK_EMISSION |
MAT_BIT_BACK_EMISSION | MAT_BIT_BACK_AMBIENT |
MAT_BIT_BACK_AMBIENT | MAT_BIT_BACK_DIFFUSE |
MAT_BIT_BACK_DIFFUSE | MAT_BIT_BACK_SPECULAR);
MAT_BIT_BACK_SPECULAR); else
else _mesa_update_material(ctx,
_mesa_update_material( ctx, MAT_BIT_FRONT_EMISSION |
MAT_BIT_FRONT_EMISSION | MAT_BIT_FRONT_AMBIENT |
MAT_BIT_FRONT_AMBIENT | MAT_BIT_FRONT_DIFFUSE |
MAT_BIT_FRONT_DIFFUSE | MAT_BIT_FRONT_SPECULAR);
MAT_BIT_FRONT_SPECULAR);
}
else {
static const GLfloat ci[3] = { .30F, .59F, .11F };
foreach(light, &ctx->Light.EnabledList) {
light->_dli = DOT3(ci, light->Diffuse);
light->_sli = DOT3(ci, light->Specular);
}
}
} }

38
src/mesa/main/rastpos.c
View File

@@ -246,28 +246,22 @@ window_pos3f(GLfloat x, GLfloat y, GLfloat z)
ctx->Current.RasterDistance = 0.0; ctx->Current.RasterDistance = 0.0;
/* raster color = current color or index */ /* raster color = current color or index */
if (ctx->Visual.rgbMode) { ctx->Current.RasterColor[0]
ctx->Current.RasterColor[0] = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0], 0.0F, 1.0F);
= CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0], 0.0F, 1.0F); ctx->Current.RasterColor[1]
ctx->Current.RasterColor[1] = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1], 0.0F, 1.0F);
= CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1], 0.0F, 1.0F); ctx->Current.RasterColor[2]
ctx->Current.RasterColor[2] = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2], 0.0F, 1.0F);
= CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2], 0.0F, 1.0F); ctx->Current.RasterColor[3]
ctx->Current.RasterColor[3] = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3], 0.0F, 1.0F);
= CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3], 0.0F, 1.0F); ctx->Current.RasterSecondaryColor[0]
ctx->Current.RasterSecondaryColor[0] = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0], 0.0F, 1.0F);
= CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0], 0.0F, 1.0F); ctx->Current.RasterSecondaryColor[1]
ctx->Current.RasterSecondaryColor[1] = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1], 0.0F, 1.0F);
= CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1], 0.0F, 1.0F); ctx->Current.RasterSecondaryColor[2]
ctx->Current.RasterSecondaryColor[2] = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2], 0.0F, 1.0F);
= CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2], 0.0F, 1.0F); ctx->Current.RasterSecondaryColor[3]
ctx->Current.RasterSecondaryColor[3] = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F);
= CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F);
}
else {
ctx->Current.RasterIndex
= ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0];
}
/* raster texcoord = current texcoord */ /* raster texcoord = current texcoord */
{ {

16
src/mesa/main/readpix.c
View File

@@ -77,14 +77,7 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
case GL_RGBA: case GL_RGBA:
case GL_BGRA: case GL_BGRA:
case GL_ABGR_EXT: case GL_ABGR_EXT:
if (drawing) { if (!drawing) {
if (!ctx->DrawBuffer->Visual.rgbMode) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glDrawPixels(drawing RGB pixels into color index buffer)");
return GL_TRUE;
}
}
else {
/* reading */ /* reading */
if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) { if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -95,10 +88,9 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
break; break;
case GL_COLOR_INDEX: case GL_COLOR_INDEX:
if (drawing) { if (drawing) {
if (ctx->DrawBuffer->Visual.rgbMode && if (ctx->PixelMaps.ItoR.Size == 0 ||
(ctx->PixelMaps.ItoR.Size == 0 || ctx->PixelMaps.ItoG.Size == 0 ||
ctx->PixelMaps.ItoG.Size == 0 || ctx->PixelMaps.ItoB.Size == 0) {
ctx->PixelMaps.ItoB.Size == 0)) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,
"glDrawPixels(drawing color index pixels into RGB buffer)"); "glDrawPixels(drawing color index pixels into RGB buffer)");
return GL_TRUE; return GL_TRUE;

25
src/mesa/main/renderbuffer.c
View File

@@ -1907,21 +1907,13 @@ _mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
GLboolean backRight = fb->Visual.stereoMode && fb->Visual.doubleBufferMode; GLboolean backRight = fb->Visual.stereoMode && fb->Visual.doubleBufferMode;
if (color) { if (color) {
if (fb->Visual.rgbMode) { assert(fb->Visual.redBits == fb->Visual.greenBits);
assert(fb->Visual.redBits == fb->Visual.greenBits); assert(fb->Visual.redBits == fb->Visual.blueBits);
assert(fb->Visual.redBits == fb->Visual.blueBits); _mesa_add_color_renderbuffers(NULL, fb,
_mesa_add_color_renderbuffers(NULL, fb, fb->Visual.redBits,
fb->Visual.redBits, fb->Visual.alphaBits,
fb->Visual.alphaBits, frontLeft, backLeft,
frontLeft, backLeft, frontRight, backRight);
frontRight, backRight);
}
else {
_mesa_add_color_index_renderbuffers(NULL, fb,
fb->Visual.indexBits,
frontLeft, backLeft,
frontRight, backRight);
}
} }
if (depth) { if (depth) {
@@ -1935,7 +1927,6 @@ _mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
} }
if (accum) { if (accum) {
assert(fb->Visual.rgbMode);
assert(fb->Visual.accumRedBits > 0); assert(fb->Visual.accumRedBits > 0);
assert(fb->Visual.accumGreenBits > 0); assert(fb->Visual.accumGreenBits > 0);
assert(fb->Visual.accumBlueBits > 0); assert(fb->Visual.accumBlueBits > 0);
@@ -1947,14 +1938,12 @@ _mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
} }
if (aux) { if (aux) {
assert(fb->Visual.rgbMode);
assert(fb->Visual.numAuxBuffers > 0); assert(fb->Visual.numAuxBuffers > 0);
_mesa_add_aux_renderbuffers(NULL, fb, fb->Visual.redBits, _mesa_add_aux_renderbuffers(NULL, fb, fb->Visual.redBits,
fb->Visual.numAuxBuffers); fb->Visual.numAuxBuffers);
} }
if (alpha) { if (alpha) {
assert(fb->Visual.rgbMode);
assert(fb->Visual.alphaBits > 0); assert(fb->Visual.alphaBits > 0);
_mesa_add_alpha_renderbuffers(NULL, fb, fb->Visual.alphaBits, _mesa_add_alpha_renderbuffers(NULL, fb, fb->Visual.alphaBits,
frontLeft, backLeft, frontLeft, backLeft,