From 43715c711d2c1d1e7624cd7c9c8a44b8866510fd Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 22 Sep 2006 17:44:39 +0000 Subject: Get rid of _swrast_mask_rgba_array() and _swrast_mask_index_array(). --- src/mesa/swrast/s_accum.c | 8 +++-- src/mesa/swrast/s_buffers.c | 26 +++++++++++----- src/mesa/swrast/s_masking.c | 74 ++++++--------------------------------------- src/mesa/swrast/s_masking.h | 19 ++---------- 4 files changed, 36 insertions(+), 91 deletions(-) (limited to 'src') diff --git a/src/mesa/swrast/s_accum.c b/src/mesa/swrast/s_accum.c index a159e80497..fa760501c2 100644 --- a/src/mesa/swrast/s_accum.c +++ b/src/mesa/swrast/s_accum.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 + * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -519,7 +519,11 @@ accum_return(GLcontext *ctx, GLfloat value, for (buffer = 0; buffer < fb->_NumColorDrawBuffers[0]; buffer++) { struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[0][buffer]; if (masking) { - _swrast_mask_rgba_array(ctx, rb, width, xpos, ypos + i, rgba); + struct sw_span span; + INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_RGBA); + span.x = xpos; + span.y = ypos + i; + _swrast_mask_rgba_span(ctx, rb, &span, rgba); } rb->PutRow(ctx, rb, width, xpos, ypos + i, rgba, NULL); } diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c index 57f23ee829..1bc198c676 100644 --- a/src/mesa/swrast/s_buffers.c +++ b/src/mesa/swrast/s_buffers.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5 + * Version: 6.5.2 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -59,12 +59,18 @@ clear_rgba_buffer_with_masking(GLcontext *ctx, struct gl_renderbuffer *rb) CLAMPED_FLOAT_TO_CHAN(clearColor[ACOMP], ctx->Color.ClearColor[3]); for (i = 0; i < height; i++) { + struct sw_span span; GLchan rgba[MAX_WIDTH][4]; GLint j; for (j = 0; j < width; j++) { COPY_CHAN4(rgba[j], clearColor); } - _swrast_mask_rgba_array( ctx, rb, width, x, y + i, rgba ); + /* setup span struct for masking */ + INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_RGBA); + span.x = x; + span.y = y + i; + _swrast_mask_rgba_span(ctx, rb, &span, rgba); + /* write masked row */ rb->PutRow(ctx, rb, width, x, y + i, rgba, NULL); } } @@ -87,13 +93,19 @@ clear_ci_buffer_with_masking(GLcontext *ctx, struct gl_renderbuffer *rb) ASSERT(rb->DataType == GL_UNSIGNED_INT); for (i = 0; i < height;i++) { - GLuint span[MAX_WIDTH]; + struct sw_span span; + GLuint indexes[MAX_WIDTH]; GLint j; for (j = 0; j < width;j++) { - span[j] = ctx->Color.ClearIndex; + indexes[j] = ctx->Color.ClearIndex; } - _swrast_mask_ci_array(ctx, rb, width, x, y + i, span); - rb->PutRow(ctx, rb, width, x, y + i, span, NULL); + /* setup span struct for masking */ + INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_RGBA); + span.x = x; + span.y = y + i; + _swrast_mask_ci_span(ctx, rb, &span, indexes); + /* write masked row */ + rb->PutRow(ctx, rb, width, x, y + i, indexes, NULL); } } diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c index 65c4e7d01c..0f2bde1b0a 100644 --- a/src/mesa/swrast/s_masking.c +++ b/src/mesa/swrast/s_masking.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.3 + * Version: 6.5.2 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -29,7 +29,6 @@ #include "glheader.h" -#include "enums.h" #include "macros.h" #include "s_context.h" @@ -37,7 +36,10 @@ #include "s_span.h" - +/** + * Apply the color mask to a span of rgba values. + * \param rgba the array of incoming colors + */ void _swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb, const struct sw_span *span, GLchan rgba[][4]) @@ -83,48 +85,10 @@ _swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb, } -/* - * Apply glColorMask to a span of RGBA pixels. +/** + * Apply the index mask to a span of color index values. + * \param index the array of incoming color indexes */ -void -_swrast_mask_rgba_array(GLcontext *ctx, struct gl_renderbuffer *rb, - GLuint n, GLint x, GLint y, GLchan rgba[][4]) -{ - GLchan dest[MAX_WIDTH][4]; - GLuint i; - -#if CHAN_BITS == 8 - - GLuint srcMask = *((GLuint*)ctx->Color.ColorMask); - GLuint dstMask = ~srcMask; - GLuint *rgba32 = (GLuint *) rgba; - GLuint *dest32 = (GLuint *) dest; - - _swrast_read_rgba_span( ctx, rb, n, x, y, dest ); - for (i = 0; i < n; i++) { - rgba32[i] = (rgba32[i] & srcMask) | (dest32[i] & dstMask); - } - -#else - - const GLint rMask = ctx->Color.ColorMask[RCOMP]; - const GLint gMask = ctx->Color.ColorMask[GCOMP]; - const GLint bMask = ctx->Color.ColorMask[BCOMP]; - const GLint aMask = ctx->Color.ColorMask[ACOMP]; - - _swrast_read_rgba_span( ctx, rb, n, x, y, dest ); - for (i = 0; i < n; i++) { - if (!rMask) rgba[i][RCOMP] = dest[i][RCOMP]; - if (!gMask) rgba[i][GCOMP] = dest[i][GCOMP]; - if (!bMask) rgba[i][BCOMP] = dest[i][BCOMP]; - if (!aMask) rgba[i][ACOMP] = dest[i][ACOMP]; - } - -#endif -} - - - void _swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb, const struct sw_span *span, GLuint index[]) @@ -150,23 +114,3 @@ _swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb, index[i] = (index[i] & srcMask) | (dest[i] & dstMask); } } - - -/* - * Apply glIndexMask to an array of CI pixels. - */ -void -_swrast_mask_ci_array(GLcontext *ctx, struct gl_renderbuffer *rb, - GLuint n, GLint x, GLint y, GLuint index[]) -{ - const GLuint srcMask = ctx->Color.IndexMask; - const GLuint dstMask = ~srcMask; - GLuint dest[MAX_WIDTH]; - GLuint i; - - _swrast_read_index_span(ctx, rb, n, x, y, dest); - - for (i=0;i