diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-14 12:47:44 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-14 12:47:44 +0100 |
| commit | e0c9361a7cd16cc008220cf1933fba4371f46753 (patch) | |
| tree | 550fd051fd04ec51ef800dbb27cf742b998a5b55 /src/mesa/drivers/dri/i915tex/i915_tex_layout.c | |
| parent | 81855f22cd8d8df5bd96fdbd76ff975b6cf4150b (diff) | |
Avoid failing assertion in intel_miptree_set_image_offset() with cube maps.
Cube maps still aren't working quite correctly though.
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/i915_tex_layout.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/i915_tex_layout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915tex/i915_tex_layout.c b/src/mesa/drivers/dri/i915tex/i915_tex_layout.c index fc98611d31..333fefef85 100644 --- a/src/mesa/drivers/dri/i915tex/i915_tex_layout.c +++ b/src/mesa/drivers/dri/i915tex/i915_tex_layout.c @@ -212,7 +212,7 @@ i945_miptree_layout(struct intel_mipmap_tree * mt) y = mt->total_height - 4; x = (face - 4) * 8; } - else if (dim < 4) { + else if (dim < 4 && (face > 0 || mt->first_level > 0)) { y = mt->total_height - 4; x = face * 8; } |