diff options
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r-- | src/mesa/swrast/s_buffers.c | 2 | ||||
-rw-r--r-- | src/mesa/swrast/s_context.c | 2 | ||||
-rw-r--r-- | src/mesa/swrast/s_drawpix.c | 2 | ||||
-rw-r--r-- | src/mesa/swrast/s_logic.c | 2 | ||||
-rw-r--r-- | src/mesa/swrast/s_span.c | 8 | ||||
-rw-r--r-- | src/mesa/swrast/swrast.h | 2 |
6 files changed, 7 insertions, 11 deletions
diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c index e788900..7af9d9d 100644 --- a/src/mesa/swrast/s_buffers.c +++ b/src/mesa/swrast/s_buffers.c @@ -234,7 +234,7 @@ clear_color_buffers(GLcontext *ctx) for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers[0]; i++) { struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0][i]; -#if OLD_RENDERBUFFER || NEW_RENDERBUFFER +#if OLD_RENDERBUFFER /* SetBuffer will go away */ if (swrast->Driver.SetBuffer) swrast->Driver.SetBuffer(ctx, ctx->DrawBuffer, diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 4a4d1b8..5c57b42 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -88,9 +88,7 @@ _swrast_update_rasterflags( GLcontext *ctx ) * MULTI_DRAW_BIT flag. Also set it if we're drawing to no * buffers or the RGBA or CI mask disables all writes. */ -#if NEW_RENDERBUFFER if (ctx->DrawBuffer->_NumColorDrawBuffers[0] != 1) { -#endif /* more than one color buffer designated for writing (or zero buffers) */ rasterMask |= MULTI_DRAW_BIT; } diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 9d23147..709f9a1 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -51,9 +51,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels) { -#if NEW_RENDERBUFFER struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0][0]; -#endif SWcontext *swrast = SWRAST_CONTEXT(ctx); struct sw_span span; diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c index 56bc012..05e2e0a 100644 --- a/src/mesa/swrast/s_logic.c +++ b/src/mesa/swrast/s_logic.c @@ -224,7 +224,7 @@ _swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb, _swrast_read_rgba_span(ctx, rb, span->end, span->x, span->y, dest); } - /* NEW_RENDERBUFFER: XXX make this a runtime test */ + /* XXX make this a runtime test */ #if CHAN_TYPE == GL_UNSIGNED_BYTE /* treat 4*GLubyte as GLuint */ logicop_uint(ctx, span->end, (GLuint *) rgba, diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 3a6e719..aec9a99 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -987,7 +987,7 @@ _swrast_write_index_span( GLcontext *ctx, struct sw_span *span) } } -#if OLD_RENDERBUFFER || NEW_RENDERBUFFER +#if OLD_RENDERBUFFER /* restore default dest buffer */ _swrast_use_draw_buffer(ctx); #endif @@ -1033,7 +1033,7 @@ add_colors(GLuint n, GLchan rgba[][4], GLchan specular[][4] ) static void multi_write_rgba_span( GLcontext *ctx, struct sw_span *span ) { -#if OLD_RENDERBUFFER || NEW_RENDERBUFFER +#if OLD_RENDERBUFFER SWcontext *swrast = SWRAST_CONTEXT(ctx); #endif const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask); @@ -1048,7 +1048,7 @@ multi_write_rgba_span( GLcontext *ctx, struct sw_span *span ) struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[output][i]; GLchan rgbaTmp[MAX_WIDTH][4]; -#if OLD_RENDERBUFFER || NEW_RENDERBUFFER +#if OLD_RENDERBUFFER /* obsolete code */ GLuint bufferBit = fb->_ColorDrawBit[output][i]; /* Set the current read/draw buffer */ @@ -1085,7 +1085,7 @@ multi_write_rgba_span( GLcontext *ctx, struct sw_span *span ) } } -#if OLD_RENDERBUFFER || NEW_RENDERBUFFER +#if OLD_RENDERBUFFER /* restore default dest buffer */ _swrast_use_draw_buffer(ctx); #endif diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h index 3aa30d3..299eda5 100644 --- a/src/mesa/swrast/swrast.h +++ b/src/mesa/swrast/swrast.h @@ -257,7 +257,7 @@ _swrast_copy_texsubimage3d(GLcontext *ctx, * Unless otherwise noted, all functions are mandatory. */ struct swrast_device_driver { -#if OLD_RENDERBUFFER || NEW_RENDERBUFFER +#if OLD_RENDERBUFFER void (*SetBuffer)(GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit); /* * Specifies the current color buffer for span/pixel writing/reading. |