Merge remote branch 'origin/7.8'

[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 eca65a88c15dc9a4bbbafc37b21d58177dbd7356..5447904e9ca11a7babff49b33e438335ba3cfbb8 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_clear.c
+++ b/src/gallium/drivers/nv50/nv50_clear.c
@@ -31,22 +31,23 @@ nv50_clear(struct pipe_context *pipe, unsigned buffers,
           const float *rgba, double depth, unsigned stencil)
 {
        struct nv50_context *nv50 = nv50_context(pipe);
-       struct nouveau_channel *chan = nv50->screen->nvws->channel;
+       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;
+       const unsigned dirty = nv50->dirty;
 
-       if (!nv50_state_validate(nv50))
+       /* don't need NEW_BLEND, NV50TCL_COLOR_MASK doesn't affect CLEAR_BUFFERS */
+       nv50->dirty &= NV50_NEW_FRAMEBUFFER | NV50_NEW_SCISSOR;
+       if (!nv50_state_validate(nv50, 64))
                return;
 
-       if (buffers & PIPE_CLEAR_COLOR) {
-               BEGIN_RING(chan, tesla, NV50TCL_CLEAR_COLOR(0), 4*fb->nr_cbufs);
-               for (i = 0; i < fb->nr_cbufs; i++) {
-                       OUT_RING  (chan, fui(rgba[0]));
-                       OUT_RING  (chan, fui(rgba[1]));
-                       OUT_RING  (chan, fui(rgba[2]));
-                       OUT_RING  (chan, fui(rgba[3]));
-               }
+       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;
        }
 
@@ -61,5 +62,11 @@ nv50_clear(struct pipe_context *pipe, unsigned buffers,
 
        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);
+       }
+       nv50->dirty = dirty;
 }