gallium: adapt to get_query_result interface change

[mesa.git] / src / gallium / drivers / r300 / r300_texture_desc.h

diff --git a/src/gallium/drivers/r300/r300_texture_desc.h b/src/gallium/drivers/r300/r300_texture_desc.h
index ce6e9643ec6ffe8a6de7fc942483e824bdbb6826..dd2a07e7022b9b39271b531f6bce1df375e965c0 100644 (file)
--- a/src/gallium/drivers/r300/r300_texture_desc.h
+++ b/src/gallium/drivers/r300/r300_texture_desc.h
@@ -25,7 +25,7 @@
 #define R300_TEXTURE_DESC_H
 
 #include "pipe/p_format.h"
-#include "r300_defines.h"
+#include "r300_context.h"
 
 struct pipe_resource;
 struct r300_screen;
@@ -39,15 +39,18 @@ enum r300_dim {
 
 unsigned r300_get_pixel_alignment(enum pipe_format format,
                                   unsigned num_samples,
-                                  enum r300_buffer_tiling microtile,
-                                  enum r300_buffer_tiling macrotile,
+                                  enum radeon_bo_layout microtile,
+                                  enum radeon_bo_layout macrotile,
                                   enum r300_dim dim, boolean is_rs690);
 
-boolean r300_texture_desc_init(struct r300_screen *rscreen,
-                               struct r300_resource *tex,
-                               const struct pipe_resource *base);
+void r300_texture_desc_init(struct r300_screen *rscreen,
+                            struct r300_resource *tex,
+                            const struct pipe_resource *base);
 
 unsigned r300_texture_get_offset(struct r300_resource *tex,
                                  unsigned level, unsigned layer);
 
+unsigned r300_stride_to_width(enum pipe_format format,
+                              unsigned stride_in_bytes);
+
 #endif