nv50: make sure static buffers (constbuf, tex control etc) get on reloc list

2008-06-17 23:55:23 +10:00
parent 3b88c3f411
commit 714cb4a86c
3 changed files with 4 additions and 1 deletions
@@ -273,7 +273,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws)
 	so_data  (so, 1);

 	so_emit(nvws, so);
-	so_ref(NULL, &so);
+	so_ref(so, &screen->static_init);
 	nvws->push_flush(nvws, 0, NULL);

 	screen->pipe.winsys = ws;
@@ -18,6 +18,8 @@ struct nv50_screen {

 	struct pipe_buffer *tic;
 	struct pipe_buffer *tsc;
+
+	struct nouveau_stateobj *static_init;
 };

 static INLINE struct nv50_screen *
@@ -151,6 +151,7 @@ nv50_state_emit(struct nv50_context *nv50)
 	so_emit_reloc_markers(nvws, nv50->state.vertprog);
 	so_emit_reloc_markers(nvws, nv50->state.fragprog);
 	so_emit_reloc_markers(nvws, nv50->state.vtxbuf);
+	so_emit_reloc_markers(nvws, nv50->screen->static_init);
 }

 boolean