From 7726be1c1b8ae321d01e781b5db4e2224e67d13d Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 16 Jan 2012 10:54:31 -0700 Subject: [PATCH] swrast: remove gl_renderbuffer::DataType assertions This field will go away, so remove some uses of it. --- src/mesa/swrast/s_blend.c | 1 - src/mesa/swrast/s_logic.c | 1 - src/mesa/swrast/s_masking.c | 1 - 3 files changed, 3 deletions(-) diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c index be5010b..cd6e6f0 100644 --- a/src/mesa/swrast/s_blend.c +++ b/src/mesa/swrast/s_blend.c @@ -1000,7 +1000,6 @@ _swrast_blend_span(struct gl_context *ctx, struct gl_renderbuffer *rb, SWspan *s ASSERT(span->end <= MAX_WIDTH); ASSERT(span->arrayMask & SPAN_RGBA); - ASSERT(rb->DataType == span->array->ChanType); ASSERT(!ctx->Color.ColorLogicOpEnabled); rbPixels = _swrast_get_dest_rgba(ctx, rb, span); diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c index 80ee46c..e908a0e 100644 --- a/src/mesa/swrast/s_logic.c +++ b/src/mesa/swrast/s_logic.c @@ -195,7 +195,6 @@ _swrast_logicop_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb, ASSERT(span->end < MAX_WIDTH); ASSERT(span->arrayMask & SPAN_RGBA); - ASSERT(rb->DataType == span->array->ChanType); rbPixels = _swrast_get_dest_rgba(ctx, rb, span); diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c index 2e68f8c..2d962eb 100644 --- a/src/mesa/swrast/s_masking.c +++ b/src/mesa/swrast/s_masking.c @@ -48,7 +48,6 @@ _swrast_mask_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb, ASSERT(n < MAX_WIDTH); ASSERT(span->arrayMask & SPAN_RGBA); - ASSERT(rb->DataType == span->array->ChanType); rbPixels = _swrast_get_dest_rgba(ctx, rb, span); -- 2.7.4