[Mesa-dev] [PATCH 2/2] gallium/pp: fix MLAA shaders

[Ilia Mirkin]

This patch is

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

On Wed, Apr 4, 2018 at 4:11 PM, Marek Olšák <maraeo at gmail.com> wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> ---
>  src/gallium/auxiliary/postprocess/pp_mlaa.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.h b/src/gallium/auxiliary/postprocess/pp_mlaa.h
> index 85c14a786a3..3507f813781 100644
> --- a/src/gallium/auxiliary/postprocess/pp_mlaa.h
> +++ b/src/gallium/auxiliary/postprocess/pp_mlaa.h
> @@ -56,21 +56,21 @@ static const char depth1fs[] = "FRAG\n"
>     "  0: TEX TEMP[0].x, IN[1].xyyy, SAMP[0], 2D\n"
>     "  1: MOV TEMP[1].x, TEMP[0].xxxx\n"
>     "  2: TEX TEMP[0].x, IN[1].zwww, SAMP[0], 2D\n"
>     "  3: MOV TEMP[1].y, TEMP[0].xxxx\n"
>     "  4: TEX TEMP[0].x, IN[2].xyyy, SAMP[0], 2D\n"
>     "  5: MOV TEMP[1].z, TEMP[0].xxxx\n"
>     "  6: TEX TEMP[0].x, IN[2].zwww, SAMP[0], 2D\n"
>     "  7: MOV TEMP[1].w, TEMP[0].xxxx\n"
>     "  8: TEX TEMP[0].x, IN[0].xyyy, SAMP[0], 2D\n"
>     "  9: ADD TEMP[2], TEMP[0].xxxx, -TEMP[1]\n"
> -   " 10: ABS TEMP[0], TEMP[2]\n"
> +   " 10: MOV TEMP[0], |TEMP[2]|\n"
>     " 11: SGE TEMP[2], TEMP[0], IMM[0].xxxx\n"
>     " 12: DP4 TEMP[0].x, TEMP[2], IMM[0].zzzz\n"
>     " 13: SEQ TEMP[1].x, TEMP[0].xxxx, IMM[0].yyyy\n"
>     " 14: IF TEMP[1].xxxx :16\n"
>     " 15:   KILL\n"
>     " 16: ENDIF\n"
>     " 17: MOV OUT[0], TEMP[2]\n"
>     " 18: END\n";
>
>
> @@ -89,21 +89,21 @@ static const char color1fs[] = "FRAG\n"
>     "  1: DP3 TEMP[0].x, TEMP[1].xyzz, IMM[0]\n"
>     "  2: TEX TEMP[1].xyz, IN[1].zwww, SAMP[0], 2D\n"
>     "  3: DP3 TEMP[0].y, TEMP[1].xyzz, IMM[0].xyzz\n"
>     "  4: TEX TEMP[1].xyz, IN[2].xyyy, SAMP[0], 2D\n"
>     "  5: DP3 TEMP[0].z, TEMP[1].xyzz, IMM[0].xyzz\n"
>     "  6: TEX TEMP[1].xyz, IN[2].zwww, SAMP[0], 2D\n"
>     "  7: DP3 TEMP[0].w, TEMP[1].xyzz, IMM[0].xyzz\n"
>     "  8: TEX TEMP[1].xyz, IN[0].xyyy, SAMP[0], 2D\n"
>     "  9: DP3 TEMP[2].x, TEMP[1].xyzz, IMM[0].xyzz\n"
>     " 10: ADD TEMP[1], TEMP[2].xxxx, -TEMP[0]\n"
> -   " 11: ABS TEMP[0], TEMP[1]\n"
> +   " 11: MOV TEMP[0], |TEMP[1]|\n"
>     " 12: SGE TEMP[2], TEMP[0], IMM[0].wwww\n"
>     " 13: DP4 TEMP[0].x, TEMP[2], IMM[1].xxxx\n"
>     " 14: SEQ TEMP[1].x, TEMP[0].xxxx, IMM[1].yyyy\n"
>     " 15: IF TEMP[1].xxxx :17\n"
>     " 16:   KILL\n"
>     " 17: ENDIF\n"
>     " 18: MOV OUT[0], TEMP[2]\n"
>     " 19: END\n";
>
>
> @@ -254,21 +254,21 @@ static const char blend2fs_2[] =
>     " 61:   MOV TEMP[4], TEMP[1].xyyy\n"
>     " 62:   MOV TEMP[4].w, IMM[0].xxxx\n"
>     " 63:   TXL TEMP[5].x, TEMP[4], SAMP[2], 2D\n"
>     " 64:   MOV TEMP[4].x, TEMP[5].xxxx\n"
>     " 65:   MOV TEMP[5], TEMP[1].zwww\n"
>     " 66:   MOV TEMP[5].w, IMM[0].xxxx\n"
>     " 67:   TXL TEMP[1].x, TEMP[5], SAMP[2], 2D\n"
>     " 68:   MOV TEMP[4].y, TEMP[1].xxxx\n"
>     " 69:   MUL TEMP[5].xy, IMM[2].zzzz, TEMP[4].xyyy\n"
>     " 70:   ROUND TEMP[1].xy, TEMP[5].xyyy\n"
> -   " 71:   ABS TEMP[4].xy, TEMP[3].xyyy\n"
> +   " 71:   MOV TEMP[4].xy, |TEMP[3].xyyy|\n"
>     " 72:   MAD TEMP[3].xy, IMM[2].wwww, TEMP[1].xyyy, TEMP[4].xyyy\n"
>     " 73:   MUL TEMP[5].xyz, TEMP[3].xyyy, IMM[0].zzzz\n"
>     " 74:   MOV TEMP[5].w, IMM[0].xxxx\n"
>     " 75:   TXL TEMP[0].xy, TEMP[5], SAMP[0], 2D\n"
>     " 76: ENDIF\n"
>     " 77: SNE TEMP[1].x, TEMP[2].xxxx, IMM[0].xxxx\n"
>     " 78: IF TEMP[1].xxxx :151\n"
>     " 79:   MOV TEMP[1].xy, IN[0].xyxx\n"
>     " 80:   MOV TEMP[3].x, IMM[1].xxxx\n"
>     " 81:   BGNLOOP :98\n"
> @@ -328,21 +328,21 @@ static const char blend2fs_2[] =
>     "135:   MOV TEMP[3], TEMP[1].xyyy\n"
>     "136:   MOV TEMP[3].w, IMM[0].xxxx\n"
>     "137:   TXL TEMP[4].y, TEMP[3], SAMP[2], 2D\n"
>     "138:   MOV TEMP[3].x, TEMP[4].yyyy\n"
>     "139:   MOV TEMP[4], TEMP[1].zwww\n"
>     "140:   MOV TEMP[4].w, IMM[0].xxxx\n"
>     "141:   TXL TEMP[1].y, TEMP[4], SAMP[2], 2D\n"
>     "142:   MOV TEMP[3].y, TEMP[1].yyyy\n"
>     "143:   MUL TEMP[4].xy, IMM[2].zzzz, TEMP[3].xyyy\n"
>     "144:   ROUND TEMP[1].xy, TEMP[4].xyyy\n"
> -   "145:   ABS TEMP[3].xy, TEMP[2].xyyy\n"
> +   "145:   MOV TEMP[3].xy, |TEMP[2].xyyy|\n"
>     "146:   MAD TEMP[2].xy, IMM[2].wwww, TEMP[1].xyyy, TEMP[3].xyyy\n"
>     "147:   MUL TEMP[3].xyz, TEMP[2].xyyy, IMM[0].zzzz\n"
>     "148:   MOV TEMP[3].w, IMM[0].xxxx\n"
>     "149:   TXL TEMP[1].xy, TEMP[3], SAMP[0], 2D\n"
>     "150:   MOV TEMP[0].zw, TEMP[1].yyxy\n"
>     "151: ENDIF\n"
>     "152: MOV OUT[0], TEMP[0]\n"
>     "153: END\n";
>
>  #endif
> --
> 2.15.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev