Merge commit 'origin/master' into gallium-sampler-view

[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 8e36883975926cd67cbc5427605d14706247d6a7..b7856cdf00541f9bfdc8c779f7f5f3fa0b94aaad 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_screen.h
+++ b/src/gallium/drivers/nv30/nv30_screen.h
@@ -1,15 +1,16 @@
 #ifndef __NV30_SCREEN_H__
 #define __NV30_SCREEN_H__
 
-#include "pipe/p_screen.h"
-#include "nv04/nv04_surface_2d.h"
+#include "nouveau/nouveau_screen.h"
+
+#include "nouveau/nv04_surface_2d.h"
 
 struct nv30_screen {
-       struct pipe_screen pipe;
+       struct nouveau_screen base;
 
        struct nouveau_winsys *nvws;
 
-       unsigned cur_pctx;
+       struct nv30_context *cur_ctx;
 
        /* HW graphics objects */
        struct nv04_surface_2d *eng2d;
@@ -34,7 +35,4 @@ nv30_screen(struct pipe_screen *screen)
        return (struct nv30_screen *)screen;
 }
 
-void
-nv30_screen_init_transfer_functions(struct pipe_screen *pscreen);
-
 #endif