Mesa (master): vl/compositor: set the scissor before clearing the render target

[Christian König]

Module: Mesa
Branch: master
Commit: 03a99ba9e41ea86355a4febbe0b1a114d5455b9f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=03a99ba9e41ea86355a4febbe0b1a114d5455b9f

Author: Christian König <christian.koenig at amd.com>
Date:   Wed Aug 13 21:01:33 2014 +0200

vl/compositor: set the scissor before clearing the render target

Otherwise we clear areas that shouldn't be cleared.

Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org

---

 src/gallium/auxiliary/vl/vl_compositor.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c
index 839fd27..6bd1a88 100644
--- a/src/gallium/auxiliary/vl/vl_compositor.c
+++ b/src/gallium/auxiliary/vl/vl_compositor.c
@@ -1060,6 +1060,7 @@ vl_compositor_render(struct vl_compositor_state *s,
       s->scissor.maxx = dst_surface->width;
       s->scissor.maxy = dst_surface->height;
    }
+   c->pipe->set_scissor_states(c->pipe, 0, 1, &s->scissor);
 
    gen_vertex_data(c, s, dirty_area);
 
@@ -1072,7 +1073,6 @@ vl_compositor_render(struct vl_compositor_state *s,
       dirty_area->x1 = dirty_area->y1 = MIN_DIRTY;
    }
 
-   c->pipe->set_scissor_states(c->pipe, 0, 1, &s->scissor);
    c->pipe->set_framebuffer_state(c->pipe, &c->fb_state);
    c->pipe->bind_vs_state(c->pipe, c->vs);
    c->pipe->set_vertex_buffers(c->pipe, 0, 1, &c->vertex_buf);