From: Ian Romanick Date: Thu, 25 Feb 2010 03:06:29 +0000 (-0800) Subject: swrast: Remove _swrast_logicop_ci_span X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5034e8ad42df60a7f61319ccd6c1a3dbf28e6699;p=mesa.git swrast: Remove _swrast_logicop_ci_span After all the recent color-index rendering removal, _swrast_logicop_ci_span is no longer used anywhere. Signed-off-by: Ian Romanick --- diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c index f0274b4c0b1..c36a16e665c 100644 --- a/src/mesa/swrast/s_logic.c +++ b/src/mesa/swrast/s_logic.c @@ -182,33 +182,6 @@ logicop_uint4(GLcontext *ctx, GLuint n, GLuint src[], const GLuint dest[], -/* - * Apply the current logic operator to a span of CI pixels. This is only - * used if the device driver can't do logic ops. - */ -void -_swrast_logicop_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb, - SWspan *span) -{ - GLuint dest[MAX_WIDTH]; - GLuint *index = span->array->index; - - ASSERT(span->end < MAX_WIDTH); - ASSERT(rb->DataType == GL_UNSIGNED_INT); - - /* Read dest values from frame buffer */ - if (span->arrayMask & SPAN_XY) { - _swrast_get_values(ctx, rb, span->end, span->array->x, span->array->y, - dest, sizeof(GLuint)); - } - else { - rb->GetRow(ctx, rb, span->end, span->x, span->y, dest); - } - - logicop_uint1(ctx, span->end, index, dest, span->array->mask); -} - - /** * Apply the current logic operator to a span of RGBA pixels. * We can handle horizontal runs of pixels (spans) or arrays of x/y diff --git a/src/mesa/swrast/s_logic.h b/src/mesa/swrast/s_logic.h index ba20cd7b325..e8cfae33f23 100644 --- a/src/mesa/swrast/s_logic.h +++ b/src/mesa/swrast/s_logic.h @@ -29,12 +29,6 @@ #include "swrast.h" - -extern void -_swrast_logicop_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb, - SWspan *span); - - extern void _swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb, SWspan *span);