diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-09-12 20:37:33 +1000 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-09-12 20:37:33 +1000 |
commit | cbe05a4734a7df7dd9d8e52f79d0ed5e6c28ae60 (patch) | |
tree | e4f67e46334b43f051a0605c7762cac36ad7c1f6 /src/gallium/drivers/nv10/nv10_screen.h | |
parent | 522139dd146450edfd3d2f07c627b32512a2c27e (diff) | |
parent | 81335d0f1760fe172a106f79e81281c1f0d7dedf (diff) |
Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2
Conflicts:
configs/linux-dri
Diffstat (limited to 'src/gallium/drivers/nv10/nv10_screen.h')
-rw-r--r-- | src/gallium/drivers/nv10/nv10_screen.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv10/nv10_screen.h b/src/gallium/drivers/nv10/nv10_screen.h new file mode 100644 index 0000000000..3f8750a13f --- /dev/null +++ b/src/gallium/drivers/nv10/nv10_screen.h @@ -0,0 +1,22 @@ +#ifndef __NV10_SCREEN_H__ +#define __NV10_SCREEN_H__ + +#include "pipe/p_screen.h" + +struct nv10_screen { + struct pipe_screen pipe; + + struct nouveau_winsys *nvws; + + /* HW graphics objects */ + struct nouveau_grobj *celsius; + struct nouveau_notifier *sync; +}; + +static INLINE struct nv10_screen * +nv10_screen(struct pipe_screen *screen) +{ + return (struct nv10_screen *)screen; +} + +#endif |