summaryrefslogtreecommitdiffstats
path: root/src/compiler/spirv/spirv_to_nir.c
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2018-11-28 15:20:03 -0600
committerJason Ekstrand <[email protected]>2019-01-08 00:38:30 +0000
commitadc155a8156ee4df18c66bc44587a6880a70bdd7 (patch)
treeb96e01a55601d50cb8f1db0800065a93e5c1b9fd /src/compiler/spirv/spirv_to_nir.c
parentbe039cb467635c6e2a70e29a586de7a5e403c929 (diff)
spirv: Add explicit pointer types
Instead of baking in uvec2 for UBO and SSBO pointers and uint for push constant and shared memory pointers, make it configurable. Reviewed-by: Alejandro PiƱeiro <[email protected]> Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]>
Diffstat (limited to 'src/compiler/spirv/spirv_to_nir.c')
-rw-r--r--src/compiler/spirv/spirv_to_nir.c42
1 files changed, 22 insertions, 20 deletions
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index a36cd7206fc..48c5a2aff01 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -1279,26 +1279,21 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
vtn_foreach_decoration(b, val, array_stride_decoration_cb, NULL);
- if (storage_class == SpvStorageClassUniform ||
- storage_class == SpvStorageClassStorageBuffer) {
- /* These can actually be stored to nir_variables and used as SSA
- * values so they need a real glsl_type.
- */
- val->type->type = glsl_vector_type(GLSL_TYPE_UINT, 2);
- }
-
- if (storage_class == SpvStorageClassPushConstant) {
- /* These can actually be stored to nir_variables and used as SSA
- * values so they need a real glsl_type.
- */
- val->type->type = glsl_uint_type();
- }
-
- if (storage_class == SpvStorageClassWorkgroup) {
- /* These can actually be stored to nir_variables and used as SSA
- * values so they need a real glsl_type.
- */
- val->type->type = glsl_uint_type();
+ /* These can actually be stored to nir_variables and used as SSA
+ * values so they need a real glsl_type.
+ */
+ switch (storage_class) {
+ case SpvStorageClassUniform:
+ val->type->type = b->options->ubo_ptr_type;
+ break;
+ case SpvStorageClassStorageBuffer:
+ val->type->type = b->options->ssbo_ptr_type;
+ break;
+ case SpvStorageClassPushConstant:
+ val->type->type = b->options->push_const_ptr_type;
+ break;
+ case SpvStorageClassWorkgroup:
+ val->type->type = b->options->shared_ptr_type;
if (b->options->lower_workgroup_access_to_offsets) {
uint32_t size, align;
val->type->deref = vtn_type_layout_std430(b, val->type->deref,
@@ -1306,6 +1301,13 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
val->type->length = size;
val->type->align = align;
}
+ break;
+ default:
+ /* In this case, no variable pointers are allowed so all deref chains
+ * are complete back to the variable and it doesn't matter what type
+ * gets used so we leave it NULL.
+ */
+ break;
}
break;
}