tgsi: add ISSG support

This adds integer version of SSG that GLSL 1.30 can produce.

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

diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index 3046656faeb01115c6afdd52162c3ba75a043b04..72b1dcab60381b93e2bf0554e5f6408bb45208f0 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -374,6 +374,16 @@ micro_sgn(union tgsi_exec_channel *dst,
    dst->f[3] = src->f[3] < 0.0f ? -1.0f : src->f[3] > 0.0f ? 1.0f : 0.0f;
 }
 
+static void
+micro_isgn(union tgsi_exec_channel *dst,
+          const union tgsi_exec_channel *src)
+{
+   dst->i[0] = src->i[0] < 0 ? -1 : src->i[0] > 0 ? 1 : 0;
+   dst->i[1] = src->i[1] < 0 ? -1 : src->i[1] > 0 ? 1 : 0;
+   dst->i[2] = src->i[2] < 0 ? -1 : src->i[2] > 0 ? 1 : 0;
+   dst->i[3] = src->i[3] < 0 ? -1 : src->i[3] > 0 ? 1 : 0;
+}
+
 static void
 micro_sgt(union tgsi_exec_channel *dst,
           const union tgsi_exec_channel *src0,
@@ -4207,6 +4217,10 @@ exec_instruction(
       exec_vector_unary(mach, inst, micro_iabs, TGSI_EXEC_DATA_INT, TGSI_EXEC_DATA_INT);
       break;
 
+   case TGSI_OPCODE_ISSG:
+      exec_vector_unary(mach, inst, micro_isgn, TGSI_EXEC_DATA_INT, TGSI_EXEC_DATA_INT);
+      break;
+
    default:
       assert( 0 );
    }

diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c
index c9acdb9fbf8c973cd0c7b74189cf002fbedc4db9..5b26d8ff09b491cf391de8b93e315c78e411c71b 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
@@ -193,6 +193,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 1, 1, 0, 0, 0, 0, "UARL", TGSI_OPCODE_UARL },
    { 1, 3, 0, 0, 0, 0, "UCMP", TGSI_OPCODE_UCMP },
    { 1, 1, 0, 0, 0, 0, "IABS", TGSI_OPCODE_IABS },
+   { 1, 1, 0, 0, 0, 0, "ISSG", TGSI_OPCODE_ISSG },
 };
 
 const struct tgsi_opcode_info *

diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
index cb1e698996eea7a194d43202c629743f590dd936..a1316306bbc352f602f4c1451f9f89527a69eaf1 100644 (file)
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -379,8 +379,9 @@ struct tgsi_property_data {
 #define TGSI_OPCODE_UARL                157
 #define TGSI_OPCODE_UCMP                158
 #define TGSI_OPCODE_IABS                159
+#define TGSI_OPCODE_ISSG                160
 
-#define TGSI_OPCODE_LAST                160
+#define TGSI_OPCODE_LAST                161
 
 #define TGSI_SAT_NONE            0  /* do not saturate */
 #define TGSI_SAT_ZERO_ONE        1  /* clamp to [0,1] */