diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-02-24 18:58:38 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-03-03 12:37:04 -0800 |
| commit | 22a96f305898b5d1aa26809c7156a01686eb9bf0 (patch) | |
| tree | a6a863d1bd28f639f92467364d4d4687f4367413 /src/mesa/main/readpix.c | |
| parent | fcf438e9e03f6e75bca4a49ad372fe7c4b1abbf8 (diff) | |
mesa: Remove checks of Visual.rgbMode
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>
Diffstat (limited to 'src/mesa/main/readpix.c')
| -rw-r--r-- | src/mesa/main/readpix.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index feea1d375f..f4d74e8be6 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -77,14 +77,7 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type, case GL_RGBA: case GL_BGRA: case GL_ABGR_EXT: - 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 { + if (!drawing) { /* reading */ if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) { _mesa_error(ctx, GL_INVALID_OPERATION, @@ -95,10 +88,9 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type, break; case GL_COLOR_INDEX: if (drawing) { - if (ctx->DrawBuffer->Visual.rgbMode && - (ctx->PixelMaps.ItoR.Size == 0 || - ctx->PixelMaps.ItoG.Size == 0 || - ctx->PixelMaps.ItoB.Size == 0)) { + if (ctx->PixelMaps.ItoR.Size == 0 || + ctx->PixelMaps.ItoG.Size == 0 || + ctx->PixelMaps.ItoB.Size == 0) { _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawPixels(drawing color index pixels into RGB buffer)"); return GL_TRUE; |