X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fnouveau%2Fnouveau_texture.h;h=562429f146b0d269d31349c9e874184a2546f350;hb=4d8b476fa9a01aef94dc2d83e9306ba7c5adbe7f;hp=251f537bba7151f7eb152dba9c2cf0d580239325;hpb=a6fecdff3e71f080d4caf29d2b0713ab5ce9d5f4;p=mesa.git

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.h b/src/mesa/drivers/dri/nouveau/nouveau_texture.h
index 251f537bba7..562429f146b 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.h
@@ -27,9 +27,15 @@
 #ifndef __NOUVEAU_TEXTURE_H__
 #define __NOUVEAU_TEXTURE_H__
 
+#include "swrast/s_context.h"
+
 struct nouveau_teximage {
-	struct gl_texture_image base;
+	struct swrast_texture_image base;
 	struct nouveau_surface surface;
+	struct {
+		struct nouveau_surface surface;
+		int x, y;
+	} transfer;
 };
 #define to_nouveau_teximage(x) ((struct nouveau_teximage *)(x))
 
@@ -49,9 +55,9 @@ nouveau_set_texbuffer(__DRIcontext *dri_ctx,
 		      __DRIdrawable *draw);
 
 GLboolean
-nouveau_texture_validate(GLcontext *ctx, struct gl_texture_object *t);
+nouveau_texture_validate(struct gl_context *ctx, struct gl_texture_object *t);
 
 void
-nouveau_texture_reallocate(GLcontext *ctx, struct gl_texture_object *t);
+nouveau_texture_reallocate(struct gl_context *ctx, struct gl_texture_object *t);
 
 #endif