From 3fe9c40cb27b23d44e938a19fbf4f21e1b1e288b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 2 Jun 2005 04:09:05 +0000
Subject: Remove last of the old span code.

---
 src/mesa/swrast/s_copypix.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'src/mesa/swrast/s_copypix.c')

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 3d6d91de51d..7bae7ed99e0 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * Version:  6.3
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  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"),
@@ -130,7 +130,6 @@ static void
 copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
                       GLint width, GLint height, GLint destx, GLint desty)
 {
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
    struct gl_renderbuffer *drawRb = NULL;
    GLboolean quick_draw;
    GLint row;
@@ -242,14 +241,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
 
       dy = desty + row;
       if (quick_draw && dy >= 0 && dy < (GLint) ctx->DrawBuffer->Height) {
-#if OLD_RENDERBUFFER
-         if (swrast->Driver.WriteRGBASpan)
-            swrast->Driver.WriteRGBASpan(ctx, drawRb, width, destx, dy,
-		       (const GLchan (*)[4]) span.array->rgba, NULL);
-         else
-#endif
-            drawRb->PutRow(ctx, drawRb, width, destx, dy,
-                           span.array->rgba, NULL);
+         drawRb->PutRow(ctx, drawRb, width, destx, dy, span.array->rgba, NULL);
       }
       else if (zoom) {
          span.x = destx;
@@ -278,7 +270,6 @@ static void
 copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
                  GLint width, GLint height, GLint destx, GLint desty)
 {
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
    struct gl_renderbuffer *drawRb;
    GLchan *tmpImage,*p;
    GLboolean quick_draw;
@@ -413,14 +404,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
 
       /* Write color span */
       if (quick_draw && dy >= 0 && dy < (GLint) ctx->DrawBuffer->Height) {
-#if OLD_RENDERBUFFER
-         if (swrast->Driver.WriteRGBASpan)
-            swrast->Driver.WriteRGBASpan(ctx, drawRb, width, destx, dy,
-                                 (const GLchan (*)[4])span.array->rgba, NULL);
-         else
-#endif
-            drawRb->PutRow(ctx, drawRb, width, destx, dy, span.array->rgba, NULL);
-
+         drawRb->PutRow(ctx, drawRb, width, destx, dy, span.array->rgba, NULL);
       }
       else if (zoom) {
          span.x = destx;
-- 
cgit v1.2.3