summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2013-05-04 18:06:39 +0800
committerChia-I Wu <[email protected]>2013-05-08 11:03:49 +0800
commit75a48a53d80706b3e6d1309c81be5c1585a92302 (patch)
treec3d95db0c172c3b837dcfa68ebc6ce642f077f8d
parent1f970816b1a6d3cf63a0a2a1092fbb485024b37a (diff)
tgsi: fix operand type of TGSI_OPCODE_NOT
It should be TGSI_TYPE_UNSIGNED, not TGSI_TYPE_FLOAT. Fixed also gallivm not_emit_cpu() to use uint build context. Signed-off-by: Chia-I Wu <[email protected]> Acked-by: Roland Scheidegger <[email protected]>
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c2
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_info.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c
index dc7c090ac7c..1feaa19387a 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.c
@@ -1314,7 +1314,7 @@ not_emit_cpu(
struct lp_build_tgsi_context * bld_base,
struct lp_build_emit_data * emit_data)
{
- emit_data->output[emit_data->chan] = lp_build_not(&bld_base->base,
+ emit_data->output[emit_data->chan] = lp_build_not(&bld_base->uint_bld,
emit_data->args[0]);
}
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c
index 90bb4976cbc..99b1c665d8e 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
@@ -276,6 +276,7 @@ tgsi_opcode_infer_type( uint opcode )
case TGSI_OPCODE_MOV:
case TGSI_OPCODE_UCMP:
return TGSI_TYPE_UNTYPED;
+ case TGSI_OPCODE_NOT:
case TGSI_OPCODE_SHL:
case TGSI_OPCODE_AND:
case TGSI_OPCODE_OR: