From bb953a87489963f63e65c797a1f2837382ff7808 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 21 Nov 2013 08:43:25 +0100
Subject: xserver mesa git update 21 nov 2013

xserver          commit 6403cbb143c67872ca9c58e3116ae7942def0ae1
mesa             commit b7c0b61782251c1dedb0b0fb0e6654af81249910
---
 mesalib/src/gallium/auxiliary/util/u_blit.c       |  3 ++-
 mesalib/src/gallium/auxiliary/util/u_blitter.c    |  3 ++-
 mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c |  3 ++-
 mesalib/src/gallium/auxiliary/util/u_texture.c    | 11 +++++++++--
 mesalib/src/gallium/auxiliary/util/u_texture.h    |  5 ++++-
 5 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'mesalib/src/gallium/auxiliary')

diff --git a/mesalib/src/gallium/auxiliary/util/u_blit.c b/mesalib/src/gallium/auxiliary/util/u_blit.c
index 4ba71b929..595287d3b 100644
--- a/mesalib/src/gallium/auxiliary/util/u_blit.c
+++ b/mesalib/src/gallium/auxiliary/util/u_blit.c
@@ -272,7 +272,8 @@ setup_vertex_data_tex(struct blit_state *ctx,
       const unsigned stride = sizeof ctx->vertices[0] / sizeof ctx->vertices[0][0][0];
       util_map_texcoords2d_onto_cubemap(src_face,
                                         &ctx->vertices[0][1][0], stride,
-                                        &ctx->vertices[0][1][0], stride);
+                                        &ctx->vertices[0][1][0], stride,
+                                        TRUE);
    }
 
    offset = get_next_slot( ctx );
diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c
index 096d3bc2b..b95cbab12 100644
--- a/mesalib/src/gallium/auxiliary/util/u_blitter.c
+++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c
@@ -659,7 +659,8 @@ static void blitter_set_texcoords(struct blitter_context_priv *ctx,
       util_map_texcoords2d_onto_cubemap(layer % 6,
                                         /* pointer, stride in floats */
                                         &face_coord[0][0], 2,
-                                        &ctx->vertices[0][1][0], 8);
+                                        &ctx->vertices[0][1][0], 8,
+                                        TRUE);
    } else {
       set_texcoords_in_vertices(coord, &ctx->vertices[0][1][0], 8);
    }
diff --git a/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c b/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
index a885f2b0f..84bf30f08 100644
--- a/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -1409,7 +1409,8 @@ set_vertex_data(struct gen_mipmap_state *ctx,
       };
 
       util_map_texcoords2d_onto_cubemap(layer, &st[0][0], 2,
-                                        &ctx->vertices[0][1][0], 8);
+                                        &ctx->vertices[0][1][0], 8,
+                                        FALSE);
    }
    else if (tex_target == PIPE_TEXTURE_1D_ARRAY) {
       /* 1D texture array  */
diff --git a/mesalib/src/gallium/auxiliary/util/u_texture.c b/mesalib/src/gallium/auxiliary/util/u_texture.c
index d97e57a79..e865f8e73 100644
--- a/mesalib/src/gallium/auxiliary/util/u_texture.c
+++ b/mesalib/src/gallium/auxiliary/util/u_texture.c
@@ -42,7 +42,8 @@
 
 void util_map_texcoords2d_onto_cubemap(unsigned face,
                                        const float *in_st, unsigned in_stride,
-                                       float *out_str, unsigned out_stride)
+                                       float *out_str, unsigned out_stride,
+                                       boolean allow_scale)
 {
    int i;
    float rx, ry, rz;
@@ -52,8 +53,14 @@ void util_map_texcoords2d_onto_cubemap(unsigned face,
       /* Compute sc = +/-scale and tc = +/-scale.
        * Not +/-1 to avoid cube face selection ambiguity near the edges,
        * though that can still sometimes happen with this scale factor...
+       *
+       * XXX: Yep, there is no safe scale factor that will prevent sampling
+       * the neighbouring face when stretching out.  A more reliable solution
+       * would be to clamp (sc, tc) against +/- 1.0-1.0/mipsize, in the shader.
+       *
+       * Also, this is not necessary when minifying, or 1:1 blits.
        */
-      const float scale = 0.9999f;
+      const float scale = allow_scale ? 0.9999f : 1.0f;
       const float sc = (2 * in_st[0] - 1) * scale;
       const float tc = (2 * in_st[1] - 1) * scale;
 
diff --git a/mesalib/src/gallium/auxiliary/util/u_texture.h b/mesalib/src/gallium/auxiliary/util/u_texture.h
index 93b2f1e4c..b1c8c7091 100644
--- a/mesalib/src/gallium/auxiliary/util/u_texture.h
+++ b/mesalib/src/gallium/auxiliary/util/u_texture.h
@@ -27,6 +27,8 @@
 #ifndef U_TEXTURE_H
 #define U_TEXTURE_H
 
+#include "pipe/p_compiler.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -44,7 +46,8 @@ extern "C" {
  */
 void util_map_texcoords2d_onto_cubemap(unsigned face,
                                        const float *in_st, unsigned in_stride,
-                                       float *out_str, unsigned out_stride);
+                                       float *out_str, unsigned out_stride,
+                                       boolean allow_scale);
 
 
 #ifdef __cplusplus
-- 
cgit v1.2.3