diff options
| author | Ian Romanick <[email protected]> | 2012-01-17 12:41:15 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-01-18 12:48:37 -0800 |
| commit | 8a472427559ea33186c71dfbab8254651fec3077 (patch) | |
| tree | 8afad9eaadb64457d33be4ead1cfbe4057acdb19 /src/mesa/drivers/dri/i965 | |
| parent | 221c678329fd1c073d5f8dcf387129cd426ecf07 (diff) | |
intel: Set depth to 6 for cubemaps
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41216
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43212
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43250
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Cc: Jin Yang <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tex_layout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c index 4c7e88ce770..7a1b91f3721 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c @@ -77,6 +77,7 @@ brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt) brw_miptree_layout_texture_array(intel, mt); break; } + assert(mt->depth0 == 6); /* FALLTHROUGH */ case GL_TEXTURE_3D: { @@ -101,7 +102,6 @@ brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt) pack_x_nr = 1; for (level = mt->first_level ; level <= mt->last_level ; level++) { - GLuint nr_images = mt->target == GL_TEXTURE_3D ? depth : 6; GLint x = 0; GLint y = 0; GLint q, j; @@ -110,8 +110,8 @@ brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt) 0, mt->total_height, width, height, depth); - for (q = 0; q < nr_images;) { - for (j = 0; j < pack_x_nr && q < nr_images; j++, q++) { + for (q = 0; q < depth; /* empty */) { + for (j = 0; j < pack_x_nr && q < depth; j++, q++) { intel_miptree_set_image_offset(mt, level, q, x, y); x += pack_x_pitch; } |