summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schürmann <[email protected]>2018-04-10 12:02:44 +0200
committerBas Nieuwenhuizen <[email protected]>2018-04-14 00:52:22 +0200
commitfd5b0e0a64a2af29afa3ac1bc5bda23a1422f64a (patch)
tree29fcd91c45241a115e4925a76537685fa51b5dc8
parent54937d820d97f5459c2249b6c358428f18245985 (diff)
nir/spirv: Fix warning and add missing breaks.
Reviewed-by: Jason Ekstrand <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]>
-rw-r--r--src/compiler/spirv/spirv_to_nir.c2
-rw-r--r--src/compiler/spirv/vtn_subgroup.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 78c1e9ff597..28274311c2b 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -3361,10 +3361,12 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvCapabilityGroupNonUniformQuad:
spv_check_supported(subgroup_quad, cap);
+ break;
case SpvCapabilityGroupNonUniformArithmetic:
case SpvCapabilityGroupNonUniformClustered:
spv_check_supported(subgroup_arithmetic, cap);
+ break;
case SpvCapabilityVariablePointersStorageBuffer:
case SpvCapabilityVariablePointers:
diff --git a/src/compiler/spirv/vtn_subgroup.c b/src/compiler/spirv/vtn_subgroup.c
index bd3143962be..ecec3aa62d0 100644
--- a/src/compiler/spirv/vtn_subgroup.c
+++ b/src/compiler/spirv/vtn_subgroup.c
@@ -277,6 +277,8 @@ vtn_handle_subgroup(struct vtn_builder *b, SpvOp opcode,
case 2:
op = nir_intrinsic_quad_swap_diagonal;
break;
+ default:
+ vtn_fail("Invalid constant value in OpGroupNonUniformQuadSwap");
}
vtn_build_subgroup_instr(b, op, val->ssa, vtn_ssa_value(b, w[4]),
NULL, 0, 0);