Merge branch 'mesa_7_6_branch'

[mesa.git] / src / gallium / drivers / nv40 / nv40_screen.h

diff --git a/src/gallium/drivers/nv40/nv40_screen.h b/src/gallium/drivers/nv40/nv40_screen.h
index c04a1275a004c1f6ca3f6fb5a1ac0a46da96f9e6..57b4c8fc46cda9ca7f1be5cd8c798e9efeb2acff 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_screen.h
+++ b/src/gallium/drivers/nv40/nv40_screen.h
@@ -1,16 +1,18 @@
 #ifndef __NV40_SCREEN_H__
 #define __NV40_SCREEN_H__
 
-#include "pipe/p_screen.h"
+#include "nouveau/nouveau_screen.h"
+#include "nv04/nv04_surface_2d.h"
 
 struct nv40_screen {
-       struct pipe_screen pipe;
+       struct nouveau_screen base;
 
        struct nouveau_winsys *nvws;
 
        unsigned cur_pctx;
 
        /* HW graphics objects */
+       struct nv04_surface_2d *eng2d;
        struct nouveau_grobj *curie;
        struct nouveau_notifier *sync;
 
@@ -32,4 +34,7 @@ nv40_screen(struct pipe_screen *screen)
        return (struct nv40_screen *)screen;
 }
 
+void
+nv40_screen_init_transfer_functions(struct pipe_screen *pscreen);
+
 #endif