mesa: Use u_math.h from macros.h

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_texture.h

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.h b/src/mesa/drivers/dri/nouveau/nouveau_texture.h
index 251f537bba7151f7eb152dba9c2cf0d580239325..562429f146b0d269d31349c9e874184a2546f350 100644 (file)
--- 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