OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/glsl: Force 32-bit for UBO and SSBO Booleans

Browse Source 
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
This commit is contained in:
Jason Ekstrand
2018-11-13 10:19:25 -06:00
parent 44b7005581
commit b5c48271d4
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -1000,7 +1000,10 @@ nir_visitor::visit(ir_call *ir)
ir_constant *write_mask = ((ir_instruction *)param)->as_constant(); ir_constant *write_mask = ((ir_instruction *)param)->as_constant();
assert(write_mask); assert(write_mask);
instr->src[0] = nir_src_for_ssa(evaluate_rvalue(val)); nir_ssa_def *nir_val = evaluate_rvalue(val);
assert(!val->type->is_boolean() || nir_val->bit_size == 32);
instr->src[0] = nir_src_for_ssa(nir_val);
instr->src[1] = nir_src_for_ssa(evaluate_rvalue(block)); instr->src[1] = nir_src_for_ssa(evaluate_rvalue(block));
instr->src[2] = nir_src_for_ssa(evaluate_rvalue(offset)); instr->src[2] = nir_src_for_ssa(evaluate_rvalue(offset));
nir_intrinsic_set_write_mask(instr, write_mask->value.u[0]); nir_intrinsic_set_write_mask(instr, write_mask->value.u[0]);
@@ -1023,7 +1026,7 @@ nir_visitor::visit(ir_call *ir)
instr->num_components = type->vector_elements; instr->num_components = type->vector_elements;
/* Setup destination register */ /* Setup destination register */
unsigned bit_size = glsl_get_bit_size(type); unsigned bit_size = type->is_boolean() ? 32 : glsl_get_bit_size(type);
nir_ssa_dest_init(&instr->instr, &instr->dest, nir_ssa_dest_init(&instr->instr, &instr->dest,
type->vector_elements, bit_size, NULL); type->vector_elements, bit_size, NULL);
@@ -1100,7 +1103,7 @@ nir_visitor::visit(ir_call *ir)
instr->num_components = type->vector_elements; instr->num_components = type->vector_elements;
/* Setup destination register */ /* Setup destination register */
unsigned bit_size = glsl_get_bit_size(type); unsigned bit_size = type->is_boolean() ? 32 : glsl_get_bit_size(type);
nir_ssa_dest_init(&instr->instr, &instr->dest, nir_ssa_dest_init(&instr->instr, &instr->dest,
type->vector_elements, bit_size, NULL); type->vector_elements, bit_size, NULL);
@@ -1123,7 +1126,10 @@ nir_visitor::visit(ir_call *ir)
nir_intrinsic_set_write_mask(instr, write_mask->value.u[0]); nir_intrinsic_set_write_mask(instr, write_mask->value.u[0]);
instr->src[0] = nir_src_for_ssa(evaluate_rvalue(val)); nir_ssa_def *nir_val = evaluate_rvalue(val);
assert(!val->type->is_boolean() || nir_val->bit_size == 32);
instr->src[0] = nir_src_for_ssa(nir_val);
instr->num_components = val->type->vector_elements; instr->num_components = val->type->vector_elements;
nir_builder_instr_insert(&b, &instr->instr); nir_builder_instr_insert(&b, &instr->instr);
@@ -1377,7 +1383,8 @@ nir_visitor::visit(ir_expression *ir)
case ir_binop_ubo_load: { case ir_binop_ubo_load: {
nir_intrinsic_instr *load = nir_intrinsic_instr *load =
nir_intrinsic_instr_create(this->shader, nir_intrinsic_load_ubo); nir_intrinsic_instr_create(this->shader, nir_intrinsic_load_ubo);
unsigned bit_size = glsl_get_bit_size(ir->type); unsigned bit_size = ir->type->is_boolean() ? 32 :
glsl_get_bit_size(ir->type);
load->num_components = ir->type->vector_elements; load->num_components = ir->type->vector_elements;
load->src[0] = nir_src_for_ssa(evaluate_rvalue(ir->operands[0])); load->src[0] = nir_src_for_ssa(evaluate_rvalue(ir->operands[0]));
load->src[1] = nir_src_for_ssa(evaluate_rvalue(ir->operands[1])); load->src[1] = nir_src_for_ssa(evaluate_rvalue(ir->operands[1]));