diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index 4eb4fdf081d..fc498fc8a24 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -1102,22 +1102,6 @@ nir_visitor::visit(ir_call *ir) case ir_intrinsic_image_sparse_load: op = nir_intrinsic_image_deref_sparse_load; break; - case ir_intrinsic_ssbo_store: - case ir_intrinsic_ssbo_load: - case ir_intrinsic_ssbo_atomic_add: - case ir_intrinsic_ssbo_atomic_and: - case ir_intrinsic_ssbo_atomic_or: - case ir_intrinsic_ssbo_atomic_xor: - case ir_intrinsic_ssbo_atomic_min: - case ir_intrinsic_ssbo_atomic_max: - case ir_intrinsic_ssbo_atomic_exchange: - case ir_intrinsic_ssbo_atomic_comp_swap: - /* SSBO store/loads should only have been lowered in GLSL IR for - * non-nir drivers, NIR drivers make use of gl_nir_lower_buffers() - * instead. - */ - unreachable("Invalid operation nir doesn't want lowered ssbo " - "store/loads"); case ir_intrinsic_shader_clock: op = nir_intrinsic_shader_clock; break; diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index c9280aef438..792f40cd072 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -1128,17 +1128,6 @@ enum ir_intrinsic_id { ir_intrinsic_image_atomic_dec_wrap, ir_intrinsic_image_sparse_load, - ir_intrinsic_ssbo_load, - ir_intrinsic_ssbo_store = MAKE_INTRINSIC_FOR_TYPE(store, ssbo), - ir_intrinsic_ssbo_atomic_add = MAKE_INTRINSIC_FOR_TYPE(atomic_add, ssbo), - ir_intrinsic_ssbo_atomic_and = MAKE_INTRINSIC_FOR_TYPE(atomic_and, ssbo), - ir_intrinsic_ssbo_atomic_or = MAKE_INTRINSIC_FOR_TYPE(atomic_or, ssbo), - ir_intrinsic_ssbo_atomic_xor = MAKE_INTRINSIC_FOR_TYPE(atomic_xor, ssbo), - ir_intrinsic_ssbo_atomic_min = MAKE_INTRINSIC_FOR_TYPE(atomic_min, ssbo), - ir_intrinsic_ssbo_atomic_max = MAKE_INTRINSIC_FOR_TYPE(atomic_max, ssbo), - ir_intrinsic_ssbo_atomic_exchange = MAKE_INTRINSIC_FOR_TYPE(atomic_exchange, ssbo), - ir_intrinsic_ssbo_atomic_comp_swap = MAKE_INTRINSIC_FOR_TYPE(atomic_comp_swap, ssbo), - ir_intrinsic_memory_barrier, ir_intrinsic_shader_clock, ir_intrinsic_group_memory_barrier,