Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

[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..816ece94c4aef0b5c009d37846086a21a157a3a9 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_screen.h
+++ b/src/gallium/drivers/nv30/nv30_screen.h
@@ -4,10 +4,24 @@
 #include "pipe/p_screen.h"
 
 struct nv30_screen {
-       struct pipe_screen screen;
+       struct pipe_screen pipe;
 
        struct nouveau_winsys *nvws;
-       unsigned chipset;
+
+       /* HW graphics objects */
+       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 *