Merge branch '7.8'

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

diff --git a/src/gallium/drivers/llvmpipe/lp_tile_image.h b/src/gallium/drivers/llvmpipe/lp_tile_image.h
index d74621925d5f56de9cd12ca313123a7fb1a98ca2..8de8efc6c16f4c8feec27269c1fefcc9dfcbd865 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_tile_image.h
+++ b/src/gallium/drivers/llvmpipe/lp_tile_image.h
@@ -33,14 +33,18 @@ void
 lp_tiled_to_linear(const void *src, void *dst,
                    unsigned x, unsigned y,
                    unsigned width, unsigned height,
-                   enum pipe_format format, unsigned dst_stride);
+                   enum pipe_format format,
+                   unsigned dst_stride,
+                   unsigned tiles_per_row);
 
 
 void
 lp_linear_to_tiled(const void *src, void *dst,
                    unsigned x, unsigned y,
                    unsigned width, unsigned height,
-                   enum pipe_format format, unsigned src_stride);
+                   enum pipe_format format,
+                   unsigned src_stride,
+                   unsigned tiles_per_row);
 
 
 void