projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 c9de9b56784163394e60d523eb5a68d1d5c5f1e0..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"
#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,
{
return MAX2(1, d>>1);
}
extern void i945_miptree_layout_2d(struct intel_context *intel,
struct intel_mipmap_tree *mt,
- uint32_t tiling);
+ uint32_t tiling
, int nr_images
);
extern void intel_get_texture_alignment_unit(GLenum, GLuint *, GLuint *);
extern void intel_get_texture_alignment_unit(GLenum, GLuint *, GLuint *);