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 b7ddc2a95942757397c8b9b926ccaa0f25e38d90..b7856cdf00541f9bfdc8c779f7f5f3fa0b94aaad 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_screen.h
+++ b/src/gallium/drivers/nv30/nv30_screen.h
@@ -1,16 +1,19 @@
 #ifndef __NV30_SCREEN_H__
 #define __NV30_SCREEN_H__
 
-#include "pipe/p_screen.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;
        struct nouveau_grobj *rankine;
        struct nouveau_notifier *sync;