Merge branch 'remove-copyteximage-hook'

[mesa.git] / src / gallium / drivers / nouveau / nouveau_context.h

diff --git a/src/gallium/drivers/nouveau/nouveau_context.h b/src/gallium/drivers/nouveau/nouveau_context.h
index 6a28d40da7b81d0621437d4316a255a6d4636a7e..19bf7c84ac7350fde934a24963f6966c4a64a956 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_context.h
+++ b/src/gallium/drivers/nouveau/nouveau_context.h
@@ -1,11 +1,29 @@
 #ifndef __NOUVEAU_CONTEXT_H__
 #define __NOUVEAU_CONTEXT_H__
 
-unsigned int
-nouveau_is_texture_referenced(struct pipe_context *, struct pipe_texture *,
-                             unsigned face, unsigned level);
+#include "pipe/p_context.h"
 
-unsigned int
-nouveau_is_buffer_referenced(struct pipe_context *, struct pipe_buffer *);
+struct nouveau_context {
+   struct pipe_context pipe;
+   struct nouveau_screen *screen;
+
+   boolean vbo_dirty;
+
+   void (*copy_data)(struct nouveau_context *,
+                     struct nouveau_bo *dst, unsigned, unsigned,
+                     struct nouveau_bo *src, unsigned, unsigned, unsigned);
+   void (*push_data)(struct nouveau_context *,
+                     struct nouveau_bo *dst, unsigned, unsigned,
+                     unsigned, void *);
+};
+
+static INLINE struct nouveau_context *
+nouveau_context(struct pipe_context *pipe)
+{
+   return (struct nouveau_context *)pipe;
+}
+
+void
+nouveau_context_init_vdec(struct nouveau_context *);
 
 #endif