Merge branch '7.8'

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

diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index a4deb56ffc8f40772595f2ab3937b3be291438c4..14c3490599dc75d800a5819642f0976862a8b9f0 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -32,7 +32,7 @@ validate_fb(struct nv50_context *nv50)
        struct nouveau_grobj *tesla = nv50->screen->tesla;
        struct nouveau_stateobj *so = so_new(32, 79, 18);
        struct pipe_framebuffer_state *fb = &nv50->framebuffer;
-       unsigned i, w, h, gw = 0;
+       unsigned i, w = 0, h = 0, gw = 0;
 
        /* Set nr of active RTs and select RT for each colour output.
         * FP result 0 always goes to RT[0], bits 4 - 6 are ignored.
@@ -237,7 +237,7 @@ static struct nouveau_stateobj *
 validate_stencil_ref(struct nv50_context *nv50)
 {
        struct nouveau_grobj *tesla = nv50->screen->tesla;
-       struct nouveau_stateobj *so = so = so_new(2, 2, 0);
+       struct nouveau_stateobj *so = so_new(2, 2, 0);
 
        so_method(so, tesla, NV50TCL_STENCIL_FRONT_FUNC_REF, 1);
        so_data  (so, nv50->stencil_ref.ref_value[0]);