Merge branch 'lp-offset-twoside'

[mesa.git] / src / mesa / drivers / dri / intel / intel_tex_layout.h

diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.h b/src/mesa/drivers/dri/intel/intel_tex_layout.h
index 7bc25b6bcb195ff9cff2544651ebfa3af3378b20..1c8c53e54597db6c58b7ae9c0b1c1b70e95f25fd 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_tex_layout.h
+++ b/src/mesa/drivers/dri/intel/intel_tex_layout.h
@@ -33,12 +33,12 @@
 #include "main/macros.h"
 
 
-static GLuint minify( GLuint d )
+static INLINE GLuint minify( GLuint d )
 {
    return MAX2(1, d>>1);
 }
 
 extern void i945_miptree_layout_2d(struct intel_context *intel,
                                   struct intel_mipmap_tree *mt,
-                                  uint32_t tiling);
-extern GLuint intel_compressed_alignment(GLenum);
+                                  uint32_t tiling, int nr_images);
+extern void intel_get_texture_alignment_unit(GLenum, GLuint *, GLuint *);