On 12/04/2014 03:05 PM, Matt Turner wrote:
> This is a revert of commit 4656c14e ("i965/fs: Change the type of
> booleans to UD and emit correct immediates") plus some small additional
Commit 4656c14e contained some shader-db data... does this pseudo-revert
have shader-db changes?
> fixes, like casting ctx->Const.UniformBooleanTrue to int and changing UD
> to D in the ir_unop_b2f cases. Note that it's safe to leave 0x3f800000
> as UD and as a literal it's more recognizable than 1065353216.
> ---
> src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 20 +++++++++---------
> src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 28
> +++++++++++++-------------
> 3 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> index cc12e48..e854056 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> @@ -537,7 +537,7 @@ fs_visitor::visit(ir_expression *ir)
> if (ctx->Const.UniformBooleanTrue != 1) {
> emit(NOT(this->result, op[0]));
> } else {
> - emit(XOR(this->result, op[0], fs_reg(1u)));
> + emit(XOR(this->result, op[0], fs_reg(1)));
> }
> break;
> case ir_unop_neg:
> @@ -819,13 +819,13 @@ fs_visitor::visit(ir_expression *ir)
> break;
> case ir_unop_b2f:
> if (ctx->Const.UniformBooleanTrue != 1) {
> - op[0].type = BRW_REGISTER_TYPE_UD;
> - this->result.type = BRW_REGISTER_TYPE_UD;
> + op[0].type = BRW_REGISTER_TYPE_D;
> + this->result.type = BRW_REGISTER_TYPE_D;
> emit(AND(this->result, op[0], fs_reg(0x3f800000u)));
> this->result.type = BRW_REGISTER_TYPE_F;
> } else {
> temp = fs_reg(this, glsl_type::int_type);
> - emit(AND(temp, op[0], fs_reg(1u)));
> + emit(AND(temp, op[0], fs_reg(1)));
> emit(MOV(this->result, temp));
> }
> break;
> @@ -2347,8 +2347,8 @@ fs_visitor::visit(ir_constant *ir)
> break;
> case GLSL_TYPE_BOOL:
> emit(MOV(dst_reg,
> - fs_reg(ir->value.b[i] != 0 ?
> ctx->Const.UniformBooleanTrue
> - : 0u)));
> + fs_reg(ir->value.b[i] != 0 ?
> (int)ctx->Const.UniformBooleanTrue
> + : 0)));
> break;
> default:
> unreachable("Non-float/uint/int/bool constant");
> @@ -2396,7 +2396,7 @@ fs_visitor::emit_bool_to_cond_code(ir_rvalue *ir)
> if (ctx->Const.UniformBooleanTrue == 1) {
> fs_reg dst = fs_reg(this, glsl_type::uint_type);
> emit(XOR(dst, op[0], op[1]));
> - inst = emit(AND(reg_null_d, dst, fs_reg(1u)));
> + inst = emit(AND(reg_null_d, dst, fs_reg(1)));
> inst->conditional_mod = BRW_CONDITIONAL_NZ;
> } else {
> inst = emit(XOR(reg_null_d, op[0], op[1]));
> @@ -2408,7 +2408,7 @@ fs_visitor::emit_bool_to_cond_code(ir_rvalue *ir)
> if (ctx->Const.UniformBooleanTrue == 1) {
> fs_reg dst = fs_reg(this, glsl_type::uint_type);
> emit(OR(dst, op[0], op[1]));
> - inst = emit(AND(reg_null_d, dst, fs_reg(1u)));
> + inst = emit(AND(reg_null_d, dst, fs_reg(1)));
> inst->conditional_mod = BRW_CONDITIONAL_NZ;
> } else {
> inst = emit(OR(reg_null_d, op[0], op[1]));
> @@ -2420,7 +2420,7 @@ fs_visitor::emit_bool_to_cond_code(ir_rvalue *ir)
> if (ctx->Const.UniformBooleanTrue == 1) {
> fs_reg dst = fs_reg(this, glsl_type::uint_type);
> emit(AND(dst, op[0], op[1]));
> - inst = emit(AND(reg_null_d, dst, fs_reg(1u)));
> + inst = emit(AND(reg_null_d, dst, fs_reg(1)));
> inst->conditional_mod = BRW_CONDITIONAL_NZ;
> } else {
> inst = emit(AND(reg_null_d, op[0], op[1]));
> @@ -3420,7 +3420,7 @@ fs_visitor::resolve_bool_comparison(ir_rvalue *rvalue,
> fs_reg *reg)
> return;
>
> fs_reg temp = fs_reg(this, glsl_type::bool_type);
> - emit(AND(temp, *reg, fs_reg(1u)));
> + emit(AND(temp, *reg, fs_reg(1)));
> *reg = temp;
> }
>
> diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp
> b/src/mesa/drivers/dri/i965/brw_shader.cpp
> index 8528d3e..a1b25fd 100644
> --- a/src/mesa/drivers/dri/i965/brw_shader.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
> @@ -275,8 +275,8 @@ brw_type_for_base_type(const struct glsl_type *type)
> case GLSL_TYPE_FLOAT:
> return BRW_REGISTER_TYPE_F;
> case GLSL_TYPE_INT:
> - return BRW_REGISTER_TYPE_D;
> case GLSL_TYPE_BOOL:
> + return BRW_REGISTER_TYPE_D;
> case GLSL_TYPE_UINT:
> return BRW_REGISTER_TYPE_UD;
> case GLSL_TYPE_ARRAY:
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> index 61af325..8a0a7e4 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> @@ -1323,7 +1323,7 @@ vec4_visitor::visit(ir_expression *ir)
> if (ctx->Const.UniformBooleanTrue != 1) {
> emit(NOT(result_dst, op[0]));
> } else {
> - emit(XOR(result_dst, op[0], src_reg(1u)));
> + emit(XOR(result_dst, op[0], src_reg(1)));
> }
> break;
> case ir_unop_neg:
> @@ -1513,7 +1513,7 @@ vec4_visitor::visit(ir_expression *ir)
> emit(CMP(result_dst, op[0], op[1],
> brw_conditional_for_comparison(ir->operation)));
> if (ctx->Const.UniformBooleanTrue == 1) {
> - emit(AND(result_dst, result_src, src_reg(1u)));
> + emit(AND(result_dst, result_src, src_reg(1)));
> }
> break;
> }
> @@ -1524,12 +1524,12 @@ vec4_visitor::visit(ir_expression *ir)
> ir->operands[1]->type->is_vector()) {
> emit(CMP(dst_null_d(), op[0], op[1], BRW_CONDITIONAL_Z));
> emit(MOV(result_dst, src_reg(0)));
> - inst = emit(MOV(result_dst,
> src_reg(ctx->Const.UniformBooleanTrue)));
> + inst = emit(MOV(result_dst,
> src_reg((int)ctx->Const.UniformBooleanTrue)));
> inst->predicate = BRW_PREDICATE_ALIGN16_ALL4H;
> } else {
> emit(CMP(result_dst, op[0], op[1], BRW_CONDITIONAL_Z));
> if (ctx->Const.UniformBooleanTrue == 1) {
> - emit(AND(result_dst, result_src, src_reg(1u)));
> + emit(AND(result_dst, result_src, src_reg(1)));
> }
> }
> break;
> @@ -1540,12 +1540,12 @@ vec4_visitor::visit(ir_expression *ir)
> emit(CMP(dst_null_d(), op[0], op[1], BRW_CONDITIONAL_NZ));
>
> emit(MOV(result_dst, src_reg(0)));
> - inst = emit(MOV(result_dst,
> src_reg(ctx->Const.UniformBooleanTrue)));
> + inst = emit(MOV(result_dst,
> src_reg((int)ctx->Const.UniformBooleanTrue)));
> inst->predicate = BRW_PREDICATE_ALIGN16_ANY4H;
> } else {
> emit(CMP(result_dst, op[0], op[1], BRW_CONDITIONAL_NZ));
> if (ctx->Const.UniformBooleanTrue == 1) {
> - emit(AND(result_dst, result_src, src_reg(1u)));
> + emit(AND(result_dst, result_src, src_reg(1)));
> }
> }
> break;
> @@ -1554,7 +1554,7 @@ vec4_visitor::visit(ir_expression *ir)
> emit(CMP(dst_null_d(), op[0], src_reg(0), BRW_CONDITIONAL_NZ));
> emit(MOV(result_dst, src_reg(0)));
>
> - inst = emit(MOV(result_dst, src_reg(ctx->Const.UniformBooleanTrue)));
> + inst = emit(MOV(result_dst,
> src_reg((int)ctx->Const.UniformBooleanTrue)));
> inst->predicate = BRW_PREDICATE_ALIGN16_ANY4H;
> break;
>
> @@ -1609,15 +1609,15 @@ vec4_visitor::visit(ir_expression *ir)
> break;
> case ir_unop_b2i:
> if (ctx->Const.UniformBooleanTrue != 1) {
> - emit(AND(result_dst, op[0], src_reg(1u)));
> + emit(AND(result_dst, op[0], src_reg(1)));
> } else {
> emit(MOV(result_dst, op[0]));
> }
> break;
> case ir_unop_b2f:
> if (ctx->Const.UniformBooleanTrue != 1) {
> - op[0].type = BRW_REGISTER_TYPE_UD;
> - result_dst.type = BRW_REGISTER_TYPE_UD;
> + op[0].type = BRW_REGISTER_TYPE_D;
> + result_dst.type = BRW_REGISTER_TYPE_D;
> emit(AND(result_dst, op[0], src_reg(0x3f800000u)));
> result_dst.type = BRW_REGISTER_TYPE_F;
> } else {
> @@ -1628,7 +1628,7 @@ vec4_visitor::visit(ir_expression *ir)
> case ir_unop_i2b:
> emit(CMP(result_dst, op[0], src_reg(0.0f), BRW_CONDITIONAL_NZ));
> if (ctx->Const.UniformBooleanTrue == 1) {
> - emit(AND(result_dst, result_src, src_reg(1u)));
> + emit(AND(result_dst, result_src, src_reg(1)));
> }
> break;
>
> @@ -1776,7 +1776,7 @@ vec4_visitor::visit(ir_expression *ir)
> emit(CMP(result_dst, packed_consts, src_reg(0u),
> BRW_CONDITIONAL_NZ));
> if (ctx->Const.UniformBooleanTrue == 1) {
> - emit(AND(result_dst, result, src_reg(1u)));
> + emit(AND(result_dst, result, src_reg(1)));
> }
> } else {
> emit(MOV(result_dst, packed_consts));
> @@ -2308,8 +2308,8 @@ vec4_visitor::emit_constant_values(dst_reg *dst,
> ir_constant *ir)
> break;
> case GLSL_TYPE_BOOL:
> emit(MOV(*dst,
> - src_reg(ir->value.b[i] != 0 ? ctx->Const.UniformBooleanTrue
> - : 0u)));
> + src_reg(ir->value.b[i] != 0 ?
> (int)ctx->Const.UniformBooleanTrue
> + : 0)));
> break;
> default:
> unreachable("Non-float/uint/int/bool constant");
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
