swrast: remove gl_renderbuffer::DataType assertions

This field will go away, so remove some uses of it.

diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c
index be5010b1383b09d6254e1c9e61f7c9e9baaf9c29..cd6e6f0360214ec5e397045cb2af0673cebd8796 100644 (file)
--- 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 80ee46c24be08030f89f7c37a2a365ff98124db7..e908a0efeb0ce63f1f9a22965fb07bf8df347e78 100644 (file)
--- 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 2e68f8c4bd7d0f72c1e754fc8e26a33c0e7d6d62..2d962ebc5c34e7b8c67ee6d6632344fa845c8f96 100644 (file)
--- 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);