i965/vec4: Return the emitted instruction in emit_lrp()

[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 695c0897b590d03c5ce9f4080901829a45c7ce0b..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))
 
@@ -41,9 +47,17 @@ struct nouveau_texture {
 #define to_nouveau_texture(x) ((struct nouveau_texture *)(x))
 
 #define texture_dirty(t) \
-       to_nouveau_texture(t)->dirty = GL_TRUE;
+       to_nouveau_texture(t)->dirty = GL_TRUE
+
+void
+nouveau_set_texbuffer(__DRIcontext *dri_ctx,
+                     GLint target, GLint format,
+                     __DRIdrawable *draw);
+
+GLboolean
+nouveau_texture_validate(struct gl_context *ctx, struct gl_texture_object *t);
 
 void
-nouveau_texture_validate(GLcontext *ctx, struct gl_texture_object *t);
+nouveau_texture_reallocate(struct gl_context *ctx, struct gl_texture_object *t);
 
 #endif