From: Eric Anholt <eric@anholt.net>
Date: Wed, 28 Sep 2011 18:15:01 +0000 (-0700)
Subject: swrast: When asked to map a slice of a 1D array, give back that slice.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5324f9c48d59ef966fbab03664a8d44ea8c19c5f;p=mesa.git

swrast: When asked to map a slice of a 1D array, give back that slice.

Until now, we've been treating 1D arrays as a single slice, and each
array slice is actually just a row of the 2D texture.  While swrast
still stores them this way, hardware drivers think that 1D arrays have
actual separate slices not stored as contiguous rows.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index aa073753f43..36b429cfab9 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -177,6 +177,13 @@ _swrast_map_teximage(struct gl_context *ctx,
                                                  1);
       assert(slice < texImage->Depth);
       map += slice * sliceSize;
+   } else if (texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY) {
+      GLuint sliceSize = _mesa_format_image_size(texImage->TexFormat,
+                                                 texImage->Width,
+                                                 1,
+                                                 1);
+      assert(slice < texImage->Height);
+      map += slice * sliceSize;
    }
 
    /* apply x/y offset to map address */