Merge branch 'mesa_7_5_branch'

[mesa.git] / src / gallium / drivers / nv50 / nv50_clear.c

diff --git a/src/gallium/drivers/nv50/nv50_clear.c b/src/gallium/drivers/nv50/nv50_clear.c
index fbc6cd09ceeed17fd0f8cd6e9c292173797d1fc1..e0b2d2880b00b1e42bfe7d02a3ba121ea06c208b 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_clear.c
+++ b/src/gallium/drivers/nv50/nv50_clear.c
@@ -27,9 +27,42 @@
 #include "nv50_context.h"
 
 void
-nv50_clear(struct pipe_context *pipe, struct pipe_surface *ps,
-          unsigned clearValue)
+nv50_clear(struct pipe_context *pipe, unsigned buffers,
+          const float *rgba, double depth, unsigned stencil)
 {
-       pipe->surface_fill(pipe, ps, 0, 0, ps->width, ps->height, clearValue);
-       ps->status = PIPE_SURFACE_STATUS_CLEAR;
+       struct nv50_context *nv50 = nv50_context(pipe);
+       struct nouveau_channel *chan = nv50->screen->base.channel;
+       struct nouveau_grobj *tesla = nv50->screen->tesla;
+       struct pipe_framebuffer_state *fb = &nv50->framebuffer;
+       unsigned mode = 0, i;
+
+       if (!nv50_state_validate(nv50))
+               return;
+
+       if (buffers & PIPE_CLEAR_COLOR && fb->nr_cbufs) {
+               BEGIN_RING(chan, tesla, NV50TCL_CLEAR_COLOR(0), 4);
+               OUT_RING  (chan, fui(rgba[0]));
+               OUT_RING  (chan, fui(rgba[1]));
+               OUT_RING  (chan, fui(rgba[2]));
+               OUT_RING  (chan, fui(rgba[3]));
+               mode |= 0x3c;
+       }
+
+       if (buffers & PIPE_CLEAR_DEPTHSTENCIL) {
+               BEGIN_RING(chan, tesla, NV50TCL_CLEAR_DEPTH, 1);
+               OUT_RING  (chan, fui(depth));
+               BEGIN_RING(chan, tesla, NV50TCL_CLEAR_STENCIL, 1);
+               OUT_RING  (chan, stencil & 0xff);
+
+               mode |= 0x03;
+       }
+
+       BEGIN_RING(chan, tesla, NV50TCL_CLEAR_BUFFERS, 1);
+       OUT_RING  (chan, mode);
+
+       for (i = 1; i < fb->nr_cbufs; i++) {
+               BEGIN_RING(chan, tesla, NV50TCL_CLEAR_BUFFERS, 1);
+               OUT_RING  (chan, (i << 6) | 0x3c);
+       }
 }
+