diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-26 15:41:24 -0600 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-26 15:41:24 -0600 |
commit | 2b440d54617bf0020171ce765708e7a9b48f2185 (patch) | |
tree | f125abe7e2c08ccaee721e895c4adf7f3faac4c2 /src/mesa/drivers/dri/intel/intel_tex_layout.h | |
parent | ab57cbaccccb30fd743ba3283251430e6bc3a071 (diff) | |
parent | b422e5ad3716d32f2434ca38819f4a877c7eeeeb (diff) |
Merge branch 'master' into autoconf2
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_layout.h')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_layout.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.h b/src/mesa/drivers/dri/intel/intel_tex_layout.h index 99d41c3629..193699d3f7 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_layout.h +++ b/src/mesa/drivers/dri/intel/intel_tex_layout.h @@ -38,5 +38,5 @@ static GLuint minify( GLuint d ) return MAX2(1, d>>1); } -extern void i945_miptree_layout_2d( struct intel_mipmap_tree *mt ); +extern void i945_miptree_layout_2d( struct intel_context *intel, struct intel_mipmap_tree *mt ); extern GLuint intel_compressed_alignment(GLenum); |