diff options
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/nir/nir.h | 1 | ||||
-rw-r--r-- | src/compiler/nir/nir_print.c | 3 | ||||
-rw-r--r-- | src/compiler/shader_info.h | 1 | ||||
-rw-r--r-- | src/compiler/spirv/spirv_to_nir.c | 12 |
4 files changed, 16 insertions, 1 deletions
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index fd1077fe37d..376211d5e74 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -1398,6 +1398,7 @@ typedef enum { nir_tex_src_offset, nir_tex_src_bias, nir_tex_src_lod, + nir_tex_src_min_lod, nir_tex_src_ms_index, /* MSAA sample index */ nir_tex_src_ms_mcs, /* MSAA compression value */ nir_tex_src_ddx, diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index 7124ff09e82..920008468a6 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -846,6 +846,9 @@ print_tex_instr(nir_tex_instr *instr, print_state *state) case nir_tex_src_lod: fprintf(fp, "(lod)"); break; + case nir_tex_src_min_lod: + fprintf(fp, "(min_lod)"); + break; case nir_tex_src_ms_index: fprintf(fp, "(ms_index)"); break; diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index b95cc310fd6..b21db3e60f0 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -41,6 +41,7 @@ struct spirv_supported_capabilities { bool image_read_without_format; bool image_write_without_format; bool int64; + bool min_lod; bool multiview; bool variable_pointers; bool storage_16bit; diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 22efaa276d9..4679fd323e6 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -2174,6 +2174,13 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode, texop = nir_texop_txf_ms; (*p++) = vtn_tex_src(b, w[idx++], nir_tex_src_ms_index); } + + if (operands & SpvImageOperandsMinLodMask) { + vtn_assert(texop == nir_texop_tex || + texop == nir_texop_txb || + texop == nir_texop_txd); + (*p++) = vtn_tex_src(b, w[idx++], nir_tex_src_min_lod); + } } /* We should have now consumed exactly all of the arguments */ vtn_assert(idx == count); @@ -3419,11 +3426,14 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, case SpvCapabilityStorageImageMultisample: case SpvCapabilityInt8: case SpvCapabilitySparseResidency: - case SpvCapabilityMinLod: vtn_warn("Unsupported SPIR-V capability: %s", spirv_capability_to_string(cap)); break; + case SpvCapabilityMinLod: + spv_check_supported(min_lod, cap); + break; + case SpvCapabilityAtomicStorage: spv_check_supported(atomic_storage, cap); break; |