diff options
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 14 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 033255ed5d3..541c25a9a07 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -526,7 +526,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(1))); + emit(XOR(this->result, op[0], fs_reg(1u))); } break; case ir_unop_neg: @@ -801,7 +801,7 @@ fs_visitor::visit(ir_expression *ir) this->result.type = BRW_REGISTER_TYPE_F; } else { temp = fs_reg(this, glsl_type::int_type); - emit(AND(temp, op[0], fs_reg(1))); + emit(AND(temp, op[0], fs_reg(1u))); emit(MOV(this->result, temp)); } break; @@ -2329,7 +2329,7 @@ fs_visitor::visit(ir_constant *ir) case GLSL_TYPE_BOOL: emit(MOV(dst_reg, fs_reg(ir->value.b[i] != 0 ? ctx->Const.UniformBooleanTrue - : 0))); + : 0u))); break; default: unreachable("Non-float/uint/int/bool constant"); @@ -2377,7 +2377,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(1))); + inst = emit(AND(reg_null_d, dst, fs_reg(1u))); inst->conditional_mod = BRW_CONDITIONAL_NZ; } else { inst = emit(XOR(reg_null_d, op[0], op[1])); @@ -2389,7 +2389,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(1))); + inst = emit(AND(reg_null_d, dst, fs_reg(1u))); inst->conditional_mod = BRW_CONDITIONAL_NZ; } else { inst = emit(OR(reg_null_d, op[0], op[1])); @@ -2401,7 +2401,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(1))); + inst = emit(AND(reg_null_d, dst, fs_reg(1u))); inst->conditional_mod = BRW_CONDITIONAL_NZ; } else { inst = emit(AND(reg_null_d, op[0], op[1])); @@ -3404,7 +3404,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(1))); + emit(AND(temp, *reg, fs_reg(1u))); *reg = temp; } diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index cd1e7eb699e..935514c5238 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -280,8 +280,8 @@ brw_type_for_base_type(const struct glsl_type *type) case GLSL_TYPE_FLOAT: return BRW_REGISTER_TYPE_F; case GLSL_TYPE_INT: - case GLSL_TYPE_BOOL: return BRW_REGISTER_TYPE_D; + case GLSL_TYPE_BOOL: 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 8e32d8b92d1..0caa7a50f39 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -1316,7 +1316,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(1))); + emit(XOR(result_dst, op[0], src_reg(1u))); } break; case ir_unop_neg: @@ -1506,7 +1506,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(1))); + emit(AND(result_dst, result_src, src_reg(1u))); } break; } @@ -1522,7 +1522,7 @@ vec4_visitor::visit(ir_expression *ir) } 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(1))); + emit(AND(result_dst, result_src, src_reg(1u))); } } break; @@ -1538,7 +1538,7 @@ vec4_visitor::visit(ir_expression *ir) } 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(1))); + emit(AND(result_dst, result_src, src_reg(1u))); } } break; @@ -1602,7 +1602,7 @@ vec4_visitor::visit(ir_expression *ir) break; case ir_unop_b2i: if (ctx->Const.UniformBooleanTrue != 1) { - emit(AND(result_dst, op[0], src_reg(1))); + emit(AND(result_dst, op[0], src_reg(1u))); } else { emit(MOV(result_dst, op[0])); } @@ -1621,7 +1621,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(1))); + emit(AND(result_dst, result_src, src_reg(1u))); } break; @@ -1769,7 +1769,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(1))); + emit(AND(result_dst, result, src_reg(1u))); } } else { emit(MOV(result_dst, packed_consts)); @@ -2296,7 +2296,7 @@ vec4_visitor::emit_constant_values(dst_reg *dst, ir_constant *ir) case GLSL_TYPE_BOOL: emit(MOV(*dst, src_reg(ir->value.b[i] != 0 ? ctx->Const.UniformBooleanTrue - : 0))); + : 0u))); break; default: unreachable("Non-float/uint/int/bool constant"); |