i965: Fix ENDLOOP to only patch up this loop's BREAK and CONT.

[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 57b4c8fc46cda9ca7f1be5cd8c798e9efeb2acff..9437aa050d40db7a62a9bf0a8c98819c65289f6e 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_screen.h
+++ b/src/gallium/drivers/nv40/nv40_screen.h
@@ -2,14 +2,14 @@
 #define __NV40_SCREEN_H__
 
 #include "nouveau/nouveau_screen.h"
-#include "nv04/nv04_surface_2d.h"
+#include "nouveau/nv04_surface_2d.h"
 
 struct nv40_screen {
        struct nouveau_screen base;
 
        struct nouveau_winsys *nvws;
 
-       unsigned cur_pctx;
+       struct nv40_context *cur_ctx;
 
        /* HW graphics objects */
        struct nv04_surface_2d *eng2d;