OSDN Git Service

radeonsi: fix isolines tess factor writes to control ring
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Mon, 5 Dec 2016 13:39:50 +0000 (14:39 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 14 Dec 2016 19:03:12 +0000 (19:03 +0000)
Fixes piglit arb_tessellation_shader/execution/isoline{_no_tcs}.shader_test.

Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit d3931a355fd5d309d5bcfe2655249f029e84d355)
[Emil Velikov: there is no si_shader_key::part in branch]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
src/gallium/drivers/radeonsi/si_shader.c

index f22cd8d..447900d 100644 (file)
@@ -2577,10 +2577,18 @@ static void si_write_tess_factors(struct lp_build_tgsi_context *bld_base,
                                 lp_build_const_int32(gallivm,
                                                      tess_outer_index * 4), "");
 
-       for (i = 0; i < outer_comps; i++)
-               out[i] = lds_load(bld_base, TGSI_TYPE_SIGNED, i, lds_outer);
-       for (i = 0; i < inner_comps; i++)
-               out[outer_comps+i] = lds_load(bld_base, TGSI_TYPE_SIGNED, i, lds_inner);
+       if (shader->key.tcs.epilog.prim_mode == PIPE_PRIM_LINES) {
+               /* For isolines, the hardware expects tess factors in the
+                * reverse order from what GLSL / TGSI specify.
+                */
+               out[0] = lds_load(bld_base, TGSI_TYPE_SIGNED, 1, lds_outer);
+               out[1] = lds_load(bld_base, TGSI_TYPE_SIGNED, 0, lds_outer);
+       } else {
+               for (i = 0; i < outer_comps; i++)
+                       out[i] = lds_load(bld_base, TGSI_TYPE_SIGNED, i, lds_outer);
+               for (i = 0; i < inner_comps; i++)
+                       out[outer_comps+i] = lds_load(bld_base, TGSI_TYPE_SIGNED, i, lds_inner);
+       }
 
        /* Convert the outputs to vectors for stores. */
        vec0 = lp_build_gather_values(gallivm, out, MIN2(stride, 4));