Remove references to accum buffers in softpipe.

Also some minor clear fixes.

4 files changed, 3 insertions, 15 deletions

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 4f5937b8f3..2ce2781771 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -57,7 +57,7 @@ struct pipe_context {
 
    /** Clear framebuffer */
    void (*clear)(struct pipe_context *pipe, GLboolean color, GLboolean depth,
-                 GLboolean stencil, GLboolean accum);
+                 GLboolean stencil);
 
    /** occlusion counting (XXX this may be temporary - we should probably
     * have generic query objects with begin/end methods)
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index d6ed514fb1..699efd5877 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -202,7 +202,6 @@ struct pipe_framebuffer_state
 
    struct pipe_surface *zbuf;      /**< Z buffer */
    struct pipe_surface *sbuf;      /**< Stencil buffer */
-   struct pipe_surface *abuf;      /**< Accum buffer */
 };
 
 
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index 09cc643003..e9b142e780 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -63,7 +63,7 @@ color_value(GLuint format, const GLfloat color[4])
 
 void
 softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
-               GLboolean stencil, GLboolean accum)
+               GLboolean stencil)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
    GLint x, y, w, h;
@@ -152,15 +152,4 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
          pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
       }
    }
-
-   if (accum) {
-      /* XXX there might be no notion of accum buffers in 'pipe'.
-       * Just implement them with a deep RGBA surface format...
-       */
-      struct pipe_surface *ps = softpipe->framebuffer.abuf;
-      GLuint clearVal = 0x0; /* XXX FIX */
-      GLuint mask = ~0;
-      assert(ps);
-      pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
-   }
 }
diff --git a/src/mesa/pipe/softpipe/sp_clear.h b/src/mesa/pipe/softpipe/sp_clear.h
index f9db99dd32..d41cc1d070 100644
--- a/src/mesa/pipe/softpipe/sp_clear.h
+++ b/src/mesa/pipe/softpipe/sp_clear.h
@@ -37,7 +37,7 @@ struct pipe_context;
 
 extern void
 softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
-               GLboolean stencil, GLboolean accum);
+               GLboolean stencil);
 
 
 #endif /* SP_CLEAR_H */