Merge branch 'texformat-rework'

[mesa.git] / src / gallium / drivers / nv30 / nv30_screen.h

diff --git a/src/gallium/drivers/nv30/nv30_screen.h b/src/gallium/drivers/nv30/nv30_screen.h
index f878f81e11f714e581723bd985dcc0d153f69d7a..5fbd998b53943c35ebac43b449d7bd4106b4401e 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_screen.h
+++ b/src/gallium/drivers/nv30/nv30_screen.h
@@ -1,13 +1,32 @@
 #ifndef __NV30_SCREEN_H__
 #define __NV30_SCREEN_H__
 
-#include "pipe/p_screen.h"
+#include "nouveau/nouveau_screen.h"
+
+#include "nv04/nv04_surface_2d.h"
 
 struct nv30_screen {
-       struct pipe_screen screen;
+       struct nouveau_screen base;
 
        struct nouveau_winsys *nvws;
-       unsigned chipset;
+
+       unsigned cur_pctx;
+
+       /* HW graphics objects */
+       struct nv04_surface_2d *eng2d;
+       struct nouveau_grobj *rankine;
+       struct nouveau_notifier *sync;
+
+       /* Query object resources */
+       struct nouveau_notifier *query;
+       struct nouveau_resource *query_heap;
+
+       /* Vtxprog resources */
+       struct nouveau_resource *vp_exec_heap;
+       struct nouveau_resource *vp_data_heap;
+
+       /* Current 3D state of channel */
+       struct nouveau_stateobj *state[NV30_STATE_MAX];
 };
 
 static INLINE struct nv30_screen *
@@ -16,4 +35,7 @@ nv30_screen(struct pipe_screen *screen)
        return (struct nv30_screen *)screen;
 }
 
+void
+nv30_screen_init_transfer_functions(struct pipe_screen *pscreen);
+
 #endif