summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv40/nv40_screen.h
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-02-29 23:08:01 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-02-29 23:08:01 +1100
commit17f6db9d0197657cd753249ef60355c6fd983032 (patch)
tree62a00ab44eab8eb0ec43268a3d4143242cb008aa /src/gallium/drivers/nv40/nv40_screen.h
parentbaaae562f02563c5966b857c61b3eae7341950e3 (diff)
nv40: move "channel context" stuff into nv40_screen
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_screen.h')
-rw-r--r--src/gallium/drivers/nv40/nv40_screen.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv40/nv40_screen.h b/src/gallium/drivers/nv40/nv40_screen.h
index 88b8fed26c..9f9668dbb6 100644
--- a/src/gallium/drivers/nv40/nv40_screen.h
+++ b/src/gallium/drivers/nv40/nv40_screen.h
@@ -8,6 +8,21 @@ struct nv40_screen {
struct nouveau_winsys *nvws;
unsigned chipset;
+
+ /* HW graphics objects */
+ struct nouveau_grobj *curie;
+ 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[NV40_STATE_MAX];
};
static INLINE struct nv40_screen *