diff options
| author | Brian Paul <[email protected]> | 2012-01-16 10:54:31 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-01-27 17:43:21 -0800 |
| commit | 490057ae81e87823cb85cbd663087b7b4d1b12c9 (patch) | |
| tree | e6c3aba69ddd6bd8d043ccf8c82c8a1152e08640 /src/mesa/swrast | |
| parent | d2d1419ba076101ef55b9142d44855351dc6afc6 (diff) | |
swrast: remove gl_renderbuffer::DataType assertions
This field will go away, so remove some uses of it.
(cherry picked from commit 7726be1c1b8ae321d01e781b5db4e2224e67d13d)
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_blend.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_logic.c | 1 | ||||
| -rw-r--r-- | src/mesa/swrast/s_masking.c | 1 |
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); |