diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-04-30 15:27:13 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-04-30 15:27:13 +0200 |
| commit | 7662e3519bef3802024da3050b886068281e02b1 (patch) | |
| tree | bc5bf675e67febffaf9e4d1fadd139e8c253ae32 /src/mesa/drivers/dri/intel/intel_tex_layout.c | |
| parent | 9a966b93c03aecac8eb72e6133aa9a2f2c7673f3 (diff) | |
| parent | 7c769bef052fc1936d7ab33e291bb4646dc5b0d1 (diff) | |
Merge commit 'origin/master' into gallium-msaa
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_layout.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_layout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.c b/src/mesa/drivers/dri/intel/intel_tex_layout.c index d132e19e83..d39733b6c5 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_layout.c +++ b/src/mesa/drivers/dri/intel/intel_tex_layout.c @@ -63,9 +63,9 @@ void intel_get_texture_alignment_unit(GLenum internalFormat, GLuint *w, GLuint * } } -void i945_miptree_layout_2d( struct intel_context *intel, - struct intel_mipmap_tree *mt, - uint32_t tiling ) +void i945_miptree_layout_2d(struct intel_context *intel, + struct intel_mipmap_tree *mt, + uint32_t tiling, int nr_images) { GLuint align_h = 2, align_w = 4; GLuint level; @@ -107,7 +107,7 @@ void i945_miptree_layout_2d( struct intel_context *intel, for ( level = mt->first_level ; level <= mt->last_level ; level++ ) { GLuint img_height; - intel_miptree_set_level_info(mt, level, 1, x, y, width, + intel_miptree_set_level_info(mt, level, nr_images, x, y, width, height, 1); if (mt->compressed) |