Merge commit 'origin/master' into gallium-sw-api-2

[mesa.git] / src / gallium / drivers / nv50 / nv50_screen.h

diff --git a/src/gallium/drivers/nv50/nv50_screen.h b/src/gallium/drivers/nv50/nv50_screen.h
index 61e24a5b571746e3b5b9c2af0fb76ff4398b2a2e..d1bc80cb9edfcf51667e1ce8d3a486af0a9303ac 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_screen.h
+++ b/src/gallium/drivers/nv50/nv50_screen.h
@@ -2,13 +2,14 @@
 #define __NV50_SCREEN_H__
 
 #include "nouveau/nouveau_screen.h"
+#include "nv50_context.h"
 
 struct nv50_screen {
        struct nouveau_screen base;
 
        struct nouveau_winsys *nvws;
 
-       unsigned cur_pctx;
+       struct nv50_context *cur_ctx;
 
        struct nouveau_grobj *tesla;
        struct nouveau_grobj *eng2d;
@@ -16,15 +17,19 @@ struct nv50_screen {
        struct nouveau_notifier *sync;
 
        struct nouveau_bo *constbuf_misc[1];
-       struct nouveau_bo *constbuf_parm[2];
+       struct nouveau_bo *constbuf_parm[PIPE_SHADER_TYPES];
 
        struct nouveau_resource *immd_heap[1];
-       struct nouveau_resource *parm_heap[2];
+       struct nouveau_resource *parm_heap[PIPE_SHADER_TYPES];
+
+       struct pipe_buffer *strm_vbuf[16];
 
        struct nouveau_bo *tic;
        struct nouveau_bo *tsc;
 
        struct nouveau_stateobj *static_init;
+
+       boolean force_push;
 };
 
 static INLINE struct nv50_screen *