Mesa (master): u_blitter: add cube map array support.

Dave Airlie airlied at kemper.freedesktop.org
Fri Nov 9 00:46:34 UTC 2012


Module: Mesa
Branch: master
Commit: 308a03f1ab9200f02ff35c3ce4afb134cc4e8664
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=308a03f1ab9200f02ff35c3ce4afb134cc4e8664

Author: Dave Airlie <airlied at gmail.com>
Date:   Sat Nov  3 20:52:49 2012 +1000

u_blitter: add cube map array support.

This adds cube array support to the blitter.

Reviewed-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/auxiliary/util/u_blitter.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index d10ce23..5ea6aca 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -647,9 +647,10 @@ static void blitter_set_texcoords(struct blitter_context_priv *ctx,
 
    get_texcoords(src, src_width0, src_height0, x1, y1, x2, y2, coord);
 
-   if (src->texture->target == PIPE_TEXTURE_CUBE) {
+   if (src->texture->target == PIPE_TEXTURE_CUBE ||
+       src->texture->target == PIPE_TEXTURE_CUBE_ARRAY) {
       set_texcoords_in_vertices(coord, &face_coord[0][0], 2);
-      util_map_texcoords2d_onto_cubemap(layer,
+      util_map_texcoords2d_onto_cubemap(layer % 6,
                                         /* pointer, stride in floats */
                                         &face_coord[0][0], 2,
                                         &ctx->vertices[0][1][0], 8);




More information about the mesa-commit mailing list