X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_masking.c;h=f83e305b06ca56fba5e6e8a1b3372a8f1fd4da08;hb=f515c78a2320369ead087c4e0efd583f17b4b78b;hp=b4433b2bc744b08e9caeb34f97cb2b7466504135;hpb=709892459922a32096fe9dd8261d0d92337bb02f;p=mesa.git diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c index b4433b2bc74..f83e305b06c 100644 --- a/src/mesa/swrast/s_masking.c +++ b/src/mesa/swrast/s_masking.c @@ -1,10 +1,8 @@ -/* $Id: s_masking.c,v 1.5 2001/03/19 02:25:36 keithw Exp $ */ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 6.5.2 * - * Copyright (C) 1999-2001 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"), @@ -31,152 +29,87 @@ #include "glheader.h" -#include "enums.h" #include "macros.h" -#include "s_alphabuf.h" #include "s_context.h" #include "s_masking.h" -#include "s_pb.h" #include "s_span.h" -/* - * Apply glColorMask to a span of RGBA pixels. +/** + * Apply the color mask to a span of rgba values. */ void -_mesa_mask_rgba_span( GLcontext *ctx, - GLuint n, GLint x, GLint y, GLchan rgba[][4] ) +_swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb, + struct sw_span *span) { 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 *rgba32 = (GLuint *) span->array->rgba; GLuint *dest32 = (GLuint *) dest; - - _mesa_read_rgba_span( ctx, ctx->DrawBuffer, 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]; - - _mesa_read_rgba_span( ctx, ctx->DrawBuffer, 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]; - } - + const GLboolean rMask = ctx->Color.ColorMask[RCOMP]; + const GLboolean gMask = ctx->Color.ColorMask[GCOMP]; + const GLboolean bMask = ctx->Color.ColorMask[BCOMP]; + const GLboolean aMask = ctx->Color.ColorMask[ACOMP]; #endif -} - - - -/* - * Apply glColorMask to an array of RGBA pixels. - */ -void -_mesa_mask_rgba_pixels( GLcontext *ctx, - GLuint n, const GLint x[], const GLint y[], - GLchan rgba[][4], const GLubyte mask[] ) -{ - SWcontext *swrast = SWRAST_CONTEXT(ctx); - GLchan dest[PB_SIZE][4]; + const GLuint n = span->end; GLuint i; -#if CHAN_BITS == 8 - - GLuint srcMask = *((GLuint*)ctx->Color.ColorMask); - GLuint dstMask = ~srcMask; - GLuint *rgba32 = (GLuint *) rgba; - GLuint *dest32 = (GLuint *) dest; + ASSERT(n < MAX_WIDTH); + ASSERT(span->arrayMask & SPAN_RGBA); - (*swrast->Driver.ReadRGBAPixels)( ctx, n, x, y, dest, mask ); - if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) { - _mesa_read_alpha_pixels( ctx, n, x, y, dest, mask ); + if (span->arrayMask & SPAN_XY) { + _swrast_get_values(ctx, rb, n, span->array->x, span->array->y, + dest, 4 * sizeof(GLchan)); + } + else { + _swrast_read_rgba_span(ctx, rb, n, span->x, span->y, dest); } - for (i=0; iColor.ColorMask[RCOMP]; - const GLint gMask = ctx->Color.ColorMask[GCOMP]; - const GLint bMask = ctx->Color.ColorMask[BCOMP]; - const GLint aMask = ctx->Color.ColorMask[ACOMP]; - - (*swrast->Driver.ReadRGBAPixels)( ctx, n, x, y, dest, mask ); - if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) { - _mesa_read_alpha_pixels( ctx, n, x, y, dest, mask ); - } - 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]; + if (!rMask) span->array->rgba[i][RCOMP] = dest[i][RCOMP]; + if (!gMask) span->array->rgba[i][GCOMP] = dest[i][GCOMP]; + if (!bMask) span->array->rgba[i][BCOMP] = dest[i][BCOMP]; + if (!aMask) span->array->rgba[i][ACOMP] = dest[i][ACOMP]; } - #endif } - -/* - * Apply glIndexMask to a span of CI pixels. +/** + * Apply the index mask to a span of color index values. */ void -_mesa_mask_index_span( GLcontext *ctx, - GLuint n, GLint x, GLint y, GLuint index[] ) +_swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb, + struct sw_span *span) { + const GLuint srcMask = ctx->Color.IndexMask; + const GLuint dstMask = ~srcMask; + GLuint *index = span->array->index; + GLuint dest[MAX_WIDTH]; GLuint i; - GLuint fbindexes[MAX_WIDTH]; - GLuint msrc, mdest; - _mesa_read_index_span( ctx, ctx->DrawBuffer, n, x, y, fbindexes ); + ASSERT(span->arrayMask & SPAN_INDEX); + ASSERT(span->end <= MAX_WIDTH); + ASSERT(rb->DataType == GL_UNSIGNED_INT); - msrc = ctx->Color.IndexMask; - mdest = ~msrc; - - for (i=0;iarrayMask & SPAN_XY) { + _swrast_get_values(ctx, rb, span->end, span->array->x, span->array->y, + dest, sizeof(GLuint)); + } + else { + _swrast_read_index_span(ctx, rb, span->end, span->x, span->y, dest); } -} - - - -/* - * Apply glIndexMask to an array of CI pixels. - */ -void -_mesa_mask_index_pixels( GLcontext *ctx, - GLuint n, const GLint x[], const GLint y[], - GLuint index[], const GLubyte mask[] ) -{ - SWcontext *swrast = SWRAST_CONTEXT(ctx); - GLuint i; - GLuint fbindexes[PB_SIZE]; - GLuint msrc, mdest; - - (*swrast->Driver.ReadCI32Pixels)( ctx, n, x, y, fbindexes, mask ); - - msrc = ctx->Color.IndexMask; - mdest = ~msrc; - for (i=0;iend; i++) { + index[i] = (index[i] & srcMask) | (dest[i] & dstMask); } }