diff options
| -rw-r--r-- | src/compiler/spirv/spirv_to_nir.c | 18 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_variables.c | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 7b34dad30cd..86536856b6f 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -262,7 +262,7 @@ vtn_handle_extension(struct vtn_builder *b, SpvOp opcode, if (strcmp((const char *)&w[2], "GLSL.std.450") == 0) { val->ext_handler = vtn_handle_glsl450_instruction; } else { - assert(!"Unsupported extension"); + unreachable("Unsupported extension"); } break; } @@ -724,7 +724,7 @@ translate_image_format(SpvImageFormat format) case SpvImageFormatR16ui: return 0x8234; /* GL_R16UI */ case SpvImageFormatR8ui: return 0x8232; /* GL_R8UI */ default: - assert(!"Invalid image format"); + unreachable("Invalid image format"); return 0; } } @@ -919,7 +919,7 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode, else if (dim == GLSL_SAMPLER_DIM_SUBPASS) dim = GLSL_SAMPLER_DIM_SUBPASS_MS; else - assert(!"Unsupported multisampled image type"); + unreachable("Unsupported multisampled image type"); } val->type->image_format = translate_image_format(format); @@ -934,7 +934,7 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode, val->type->type = glsl_image_type(dim, is_array, glsl_get_base_type(sampled_type)); } else { - assert(!"We need to know if the image will be sampled"); + unreachable("We need to know if the image will be sampled"); } break; } @@ -1378,7 +1378,7 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, break; case SpvOpConstantSampler: - assert(!"OpConstantSampler requires Kernel Capability"); + unreachable("OpConstantSampler requires Kernel Capability"); break; default: @@ -2626,7 +2626,7 @@ gl_primitive_from_spv_execution_mode(SpvExecutionMode mode) case SpvExecutionModeOutputTriangleStrip: return 5; /* GL_TRIANGLE_STRIP */ default: - assert(!"Invalid primitive type"); + unreachable("Invalid primitive type"); return 4; } } @@ -2646,7 +2646,7 @@ vertices_in_from_spv_execution_mode(SpvExecutionMode mode) case SpvExecutionModeInputTrianglesAdjacency: return 6; default: - assert(!"Invalid GS input mode"); + unreachable("Invalid GS input mode"); return 0; } } @@ -2974,7 +2974,7 @@ vtn_handle_execution_mode(struct vtn_builder *b, struct vtn_value *entry_point, break; case SpvExecutionModeXfb: - assert(!"Unhandled execution mode"); + unreachable("Unhandled execution mode"); break; case SpvExecutionModeVecTypeHint: @@ -3008,7 +3008,7 @@ vtn_handle_variable_or_type_instruction(struct vtn_builder *b, SpvOp opcode, case SpvOpMemberDecorate: case SpvOpGroupDecorate: case SpvOpGroupMemberDecorate: - assert(!"Invalid opcode types and variables section"); + unreachable("Invalid opcode types and variables section"); break; case SpvOpTypeVoid: diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 4432e72e54a..d4fd1dea746 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -599,7 +599,7 @@ vtn_type_block_size(struct vtn_type *type) return type->stride * glsl_get_length(type->type); default: - assert(!"Invalid block type"); + unreachable("Invalid block type"); return 0; } } @@ -825,7 +825,7 @@ vtn_block_load(struct vtn_builder *b, struct vtn_pointer *src) &access_offset, &access_size); break; default: - assert(!"Invalid block variable mode"); + unreachable("Invalid block variable mode"); } nir_ssa_def *offset, *index = NULL; @@ -1422,7 +1422,7 @@ vtn_storage_class_to_mode(SpvStorageClass class, mode = vtn_variable_mode_ssbo; nir_mode = 0; } else { - assert(!"Invalid uniform variable type"); + unreachable("Invalid uniform variable type"); } break; case SpvStorageClassStorageBuffer: @@ -1437,7 +1437,7 @@ vtn_storage_class_to_mode(SpvStorageClass class, mode = vtn_variable_mode_sampler; nir_mode = nir_var_uniform; } else { - assert(!"Invalid uniform constant variable type"); + unreachable("Invalid uniform constant variable type"); } break; case SpvStorageClassPushConstant: |