diff options
| author | Eric Anholt <eric@anholt.net> | 2010-04-28 17:17:54 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-04-29 08:34:15 -0700 |
| commit | 7d8f0fc28239c8023d2d44cbd4c979aa86c31873 (patch) | |
| tree | dc787901d42b5deff7dbadf690f2f87a5cba6b42 /src/mesa/drivers/dri/intel/intel_tex_layout.c | |
| parent | d05c35914df1c382b90def7e7425d7f2fa4737dc (diff) | |
i965: Fix cube map layouts on Ironlake.
We were doubling up the offsets for the mipmap levels for CPU access.
Instead of reimplementing i945_miptree_layout_2d with 6 cube images
separated by qpitch, share that function and provide the level offsets
later.
Fixes piglit cubemap and fbo-cubemap.
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) |