diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2019-02-27 15:59:29 -0600 |
|---|---|---|
| committer | Jason Ekstrand <jason@jlekstrand.net> | 2019-03-25 16:12:09 -0500 |
| commit | 8ed583fe5237038e7fd78d0635e8fb93322e96c7 (patch) | |
| tree | 238398823f3b42f179a3bcedc1159c55e98c9804 | |
| parent | e50ab2c0f23c0c12dd8f50b5d3cecb811a332779 (diff) | |
spirv: Handle the NonUniformEXT decoration
| -rw-r--r-- | src/compiler/spirv/spirv_to_nir.c | 6 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_variables.c | 22 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 77f49b505630..8c2b995be8f0 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -2407,6 +2407,12 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode, is_shadow && glsl_get_components(ret_type->type) == 1; 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)) { case GLSL_TYPE_FLOAT: instr->dest_type = nir_type_float; break; case GLSL_TYPE_INT: instr->dest_type = nir_type_int; break; diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index b121a2c29886..43c32930cffe 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -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 vtn_storage_class_to_mode(struct vtn_builder *b, 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, ptr_decoration_cb, val->pointer); if ((var->mode == vtn_variable_mode_input || var->mode == vtn_variable_mode_output) && @@ -2371,12 +2388,17 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode, val->sampled_image->image = vtn_pointer_dereference(b, base_val->sampled_image->image, chain); 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 { vtn_assert(base_val->value_type == vtn_value_type_pointer); struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_pointer); val->pointer = vtn_pointer_dereference(b, base_val->pointer, chain); val->pointer->ptr_type = ptr_type; + vtn_foreach_decoration(b, val, ptr_decoration_cb, val->pointer); } break; } |