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

spirv: Handle the NonUniformEXT decoration

Browse Source
This commit is contained in:
Jason Ekstrand
2019-02-27 15:59:29 -06:00
committed by Jason Ekstrand
parent e50ab2c0f2
commit 8ed583fe52
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/spirv/spirv_to_nir.c
View File

@@ -2407,6 +2407,12 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
is_shadow && glsl_get_components(ret_type->type) == 1; is_shadow && glsl_get_components(ret_type->type) == 1;
instr->component = gather_component; instr->component = gather_component;
if (sampled.image && (sampled.image->access & ACCESS_NON_UNIFORM))
instr->texture_non_uniform = true;
if (sampled.sampler && (sampled.sampler->access & ACCESS_NON_UNIFORM))
instr->sampler_non_uniform = true;
switch (glsl_get_sampler_result_type(image_type)) { switch (glsl_get_sampler_result_type(image_type)) {
case GLSL_TYPE_FLOAT: instr->dest_type = nir_type_float; break; case GLSL_TYPE_FLOAT: instr->dest_type = nir_type_float; break;
case GLSL_TYPE_INT: instr->dest_type = nir_type_int; break; case GLSL_TYPE_INT: instr->dest_type = nir_type_int; break;

22
src/compiler/spirv/vtn_variables.c
View File

@@ -1688,6 +1688,22 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
} }
} }
static void
ptr_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
const struct vtn_decoration *dec, void *void_ptr)
{
struct vtn_pointer *ptr = void_ptr;
switch (dec->decoration) {
case SpvDecorationNonUniformEXT:
ptr->access |= ACCESS_NON_UNIFORM;
break;
default:
break;
}
}
static enum vtn_variable_mode static enum vtn_variable_mode
vtn_storage_class_to_mode(struct vtn_builder *b, vtn_storage_class_to_mode(struct vtn_builder *b,
SpvStorageClass class, SpvStorageClass class,
@@ -2194,6 +2210,7 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
} }
vtn_foreach_decoration(b, val, var_decoration_cb, var); vtn_foreach_decoration(b, val, var_decoration_cb, var);
vtn_foreach_decoration(b, val, ptr_decoration_cb, val->pointer);
if ((var->mode == vtn_variable_mode_input || if ((var->mode == vtn_variable_mode_input ||
var->mode == vtn_variable_mode_output) && var->mode == vtn_variable_mode_output) &&
@@ -2371,12 +2388,17 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
val->sampled_image->image = val->sampled_image->image =
vtn_pointer_dereference(b, base_val->sampled_image->image, chain); vtn_pointer_dereference(b, base_val->sampled_image->image, chain);
val->sampled_image->sampler = base_val->sampled_image->sampler; val->sampled_image->sampler = base_val->sampled_image->sampler;
vtn_foreach_decoration(b, val, ptr_decoration_cb,
val->sampled_image->image);
vtn_foreach_decoration(b, val, ptr_decoration_cb,
val->sampled_image->sampler);
} else { } else {
vtn_assert(base_val->value_type == vtn_value_type_pointer); vtn_assert(base_val->value_type == vtn_value_type_pointer);
struct vtn_value *val = struct vtn_value *val =
vtn_push_value(b, w[2], vtn_value_type_pointer); vtn_push_value(b, w[2], vtn_value_type_pointer);
val->pointer = vtn_pointer_dereference(b, base_val->pointer, chain); val->pointer = vtn_pointer_dereference(b, base_val->pointer, chain);
val->pointer->ptr_type = ptr_type; val->pointer->ptr_type = ptr_type;
vtn_foreach_decoration(b, val, ptr_decoration_cb, val->pointer);
} }
break; break;
} }