summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-01-16 10:54:31 -0700
committerBrian Paul <[email protected]>2012-01-24 14:12:09 -0700
commit7726be1c1b8ae321d01e781b5db4e2224e67d13d (patch)
tree5003ed54f7259c0c3e6281bf5f87068804ee5a62 /src/mesa
parentca6d86d26b1726b13baa21b73fe9d426f28370e2 (diff)
swrast: remove gl_renderbuffer::DataType assertions
This field will go away, so remove some uses of it.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_blend.c1
-rw-r--r--src/mesa/swrast/s_logic.c1
-rw-r--r--src/mesa/swrast/s_masking.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c
index be5010b1383..cd6e6f03602 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 80ee46c24be..e908a0efeb0 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 2e68f8c4bd7..2d962ebc5c3 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);