r300g: reorder parts of translate_texformat

[mesa.git] / src / gallium / drivers / llvmpipe / lp_flush.h

diff --git a/src/gallium/drivers/llvmpipe/lp_flush.h b/src/gallium/drivers/llvmpipe/lp_flush.h
index e13f57ccec590daec931e09776feca063cdee994..579d24c68ad185b2398070c4d0689c213f088bd6 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_flush.h
+++ b/src/gallium/drivers/llvmpipe/lp_flush.h
@@ -32,18 +32,27 @@
 
 struct pipe_context;
 struct pipe_fence_handle;
+struct pipe_resource;
 
-void llvmpipe_flush(struct pipe_context *pipe, unsigned flags,
-                    struct pipe_fence_handle **fence);
+void
+llvmpipe_flush(struct pipe_context *pipe,
+               unsigned flags,
+               struct pipe_fence_handle **fence,
+               const char *reason);
+
+void
+llvmpipe_finish( struct pipe_context *pipe,
+                 const char *reason );
 
 boolean
-llvmpipe_flush_texture(struct pipe_context *pipe,
-                       struct pipe_texture *texture,
-                       unsigned face,
-                       unsigned level,
-                       unsigned flush_flags,
-                       boolean read_only,
-                       boolean cpu_access,
-                       boolean do_not_flush);
+llvmpipe_flush_resource(struct pipe_context *pipe,
+                        struct pipe_resource *resource,
+                        unsigned level,
+                        int layer,
+                        unsigned flush_flags,
+                        boolean read_only,
+                        boolean cpu_access,
+                        boolean do_not_block,
+                        const char *reason);
 
 #endif