5 files changed, 5 insertions, 14 deletions
diff --git a/src/gallium/drivers/nv50/nv50_clear.c b/src/gallium/drivers/nv50/nv50_clear.c
index f9bc3b53ca..db44a9da0e 100644
--- a/src/gallium/drivers/nv50/nv50_clear.c
+++ b/src/gallium/drivers/nv50/nv50_clear.c
@@ -86,7 +86,5 @@ nv50_clear(struct pipe_context *pipe, struct pipe_surface *ps,
 	pipe->set_framebuffer_state(pipe, &s_fb);
 	pipe->set_scissor_state(pipe, &s_sc);
 	nv50->dirty |= dirty;
-
-	ps->status = PIPE_SURFACE_STATUS_CLEAR;
 }
 
diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index 313e435e7a..7b67a75439 100644
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -184,8 +184,8 @@ extern boolean nv50_draw_elements(struct pipe_context *pipe,
 extern void nv50_vbo_validate(struct nv50_context *nv50);
 
 /* nv50_clear.c */
-extern void nv50_clear(struct pipe_context *pipe, struct pipe_surface *ps,
-		       unsigned clearValue);
+extern void nv50_clear(struct pipe_context *pipe, unsigned buffers,
+		       const float *rgba, double depth, unsigned stencil);
 
 /* nv50_program.c */
 extern void nv50_vertprog_validate(struct nv50_context *nv50);
diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index dc4688ccdc..f79a7ca86c 100644
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -163,7 +163,6 @@ nv50_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 	ps->width = pt->width[level];
 	ps->height = pt->height[level];
 	ps->usage = flags;
-	ps->status = PIPE_SURFACE_STATUS_DEFINED;
 	pipe_reference_init(&ps->reference, 1);
 	ps->face = face;
 	ps->level = level;
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index a2c56f99a8..35cebdbdc3 100644
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -41,7 +41,7 @@ nv50_query(struct pipe_query *pipe)
 static struct pipe_query *
 nv50_query_create(struct pipe_context *pipe, unsigned type)
 {
-	struct pipe_screen *screen = pipe->winsys;
+	struct pipe_screen *screen = pipe->screen;
 	struct nv50_query *q = CALLOC_STRUCT(nv50_query);
 
 	assert (q->type == PIPE_QUERY_OCCLUSION_COUNTER);
diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index 85098a78a2..c13d3de1cb 100644
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -178,17 +178,10 @@ nv50_state_emit(struct nv50_context *nv50)
 boolean
 nv50_state_validate(struct nv50_context *nv50)
 {
-	const struct pipe_framebuffer_state *fb = &nv50->framebuffer;
 	struct nouveau_grobj *tesla = nv50->screen->tesla;
 	struct nouveau_stateobj *so;
 	unsigned i;
 
-	for (i = 0; i < fb->nr_cbufs; i++)
-		fb->cbufs[i]->status = PIPE_SURFACE_STATUS_DEFINED;
-
-	if (fb->zsbuf)
-		fb->zsbuf->status = PIPE_SURFACE_STATUS_DEFINED;
-
 	if (nv50->dirty & NV50_NEW_FRAMEBUFFER)
 		nv50_state_validate_fb(nv50);
 
@@ -251,7 +244,7 @@ nv50_state_validate(struct nv50_context *nv50)
 	}
 scissor_uptodate:
 
-	if (nv50->dirty & NV50_NEW_VIEWPORT) {
+	if (nv50->dirty & (NV50_NEW_VIEWPORT | NV50_NEW_RASTERIZER)) {
 		unsigned bypass;
 
 		if (!nv50->rasterizer->pipe.bypass_vs_clip_and_viewport)
@@ -288,6 +281,7 @@ scissor_uptodate:
 
 		so_ref(so, &nv50->state.viewport);
 		so_ref(NULL, &so);
+		nv50->state.dirty |= NV50_NEW_VIEWPORT;
 	}
 viewport_uptodate: