Merge branch '7.8'

[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 0d786b0f2e36602f9c10d8bc914ce03fabced1f3..40ebbee72e2e48e795e0de3e983a7d92dd1a7c2c 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_screen.h
+++ b/src/gallium/drivers/nv50/nv50_screen.h
@@ -2,14 +2,14 @@
 #define __NV50_SCREEN_H__
 
 #include "nouveau/nouveau_screen.h"
-#include "nv50_context.h"
+
+struct nv50_context;
 
 struct nv50_screen {
        struct nouveau_screen base;
 
        struct nouveau_winsys *nvws;
 
-       unsigned cur_pctx;
        struct nv50_context *cur_ctx;
 
        struct nouveau_grobj *tesla;
@@ -23,12 +23,12 @@ struct nv50_screen {
        struct nouveau_resource *immd_heap[1];
        struct nouveau_resource *parm_heap[PIPE_SHADER_TYPES];
 
-       struct pipe_buffer *strm_vbuf[16];
+       struct pipe_resource *strm_vbuf[16];
 
        struct nouveau_bo *tic;
        struct nouveau_bo *tsc;
 
-       struct nouveau_stateobj *static_init;
+       boolean force_push;
 };
 
 static INLINE struct nv50_screen *
@@ -37,6 +37,6 @@ nv50_screen(struct pipe_screen *screen)
        return (struct nv50_screen *)screen;
 }
 
-void nv50_transfer_init_screen_functions(struct pipe_screen *);
+extern void nv50_screen_relocs(struct nv50_screen *);
 
 #endif