diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-02-05 09:50:21 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-02-05 09:50:21 +0000 |
| commit | c036d13d7d2cc905226fe53ebd86a18da808963f (patch) | |
| tree | 1520a41a750b3a2a2685c3d7f46e87f921ad7b83 /src/gallium/drivers/nv10/nv10_screen.h | |
| parent | 69f20294cd8bed52e4a9b648158423c5f0754941 (diff) | |
| parent | 5b6b67eb3ff714fbba8aed88a22a7646e1dbf655 (diff) | |
Merge commit 'fj/mesa-next'
Diffstat (limited to 'src/gallium/drivers/nv10/nv10_screen.h')
| -rw-r--r-- | src/gallium/drivers/nv10/nv10_screen.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/gallium/drivers/nv10/nv10_screen.h b/src/gallium/drivers/nv10/nv10_screen.h deleted file mode 100644 index 86b6d8def5..0000000000 --- a/src/gallium/drivers/nv10/nv10_screen.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef __NV10_SCREEN_H__ -#define __NV10_SCREEN_H__ - -#include "nouveau/nouveau_screen.h" -#include "nv04/nv04_surface_2d.h" - -struct nv10_screen { - struct nouveau_screen base; - - struct nouveau_winsys *nvws; - - /* HW graphics objects */ - struct nv04_surface_2d *eng2d; - struct nouveau_grobj *celsius; - struct nouveau_notifier *sync; -}; - -static INLINE struct nv10_screen * -nv10_screen(struct pipe_screen *screen) -{ - return (struct nv10_screen *)screen; -} - - -void -nv10_screen_init_transfer_functions(struct pipe_screen *pscreen); - -#endif |