OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spirv: Add support for MinLod

Browse Source 
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Jason Ekstrand
2018-10-02 21:15:47 -05:00
parent e1ef6c3c29
commit caeffe7549
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/nir/nir.h
View File

@@ -1398,6 +1398,7 @@ typedef enum {
nir_tex_src_offset, nir_tex_src_offset,
nir_tex_src_bias, nir_tex_src_bias,
nir_tex_src_lod, nir_tex_src_lod,
nir_tex_src_min_lod,
nir_tex_src_ms_index, /* MSAA sample index */ nir_tex_src_ms_index, /* MSAA sample index */
nir_tex_src_ms_mcs, /* MSAA compression value */ nir_tex_src_ms_mcs, /* MSAA compression value */
nir_tex_src_ddx, nir_tex_src_ddx,

3
src/compiler/nir/nir_print.c
View File

@@ -846,6 +846,9 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
case nir_tex_src_lod: case nir_tex_src_lod:
fprintf(fp, "(lod)"); fprintf(fp, "(lod)");
break; break;
case nir_tex_src_min_lod:
fprintf(fp, "(min_lod)");
break;
case nir_tex_src_ms_index: case nir_tex_src_ms_index:
fprintf(fp, "(ms_index)"); fprintf(fp, "(ms_index)");
break; break;

1
src/compiler/shader_info.h
View File

@@ -41,6 +41,7 @@ struct spirv_supported_capabilities {
bool image_read_without_format; bool image_read_without_format;
bool image_write_without_format; bool image_write_without_format;
bool int64; bool int64;
bool min_lod;
bool multiview; bool multiview;
bool variable_pointers; bool variable_pointers;
bool storage_16bit; bool storage_16bit;

12
src/compiler/spirv/spirv_to_nir.c
View File

@@ -2174,6 +2174,13 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
texop = nir_texop_txf_ms; texop = nir_texop_txf_ms;
(*p++) = vtn_tex_src(b, w[idx++], nir_tex_src_ms_index); (*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 */ /* We should have now consumed exactly all of the arguments */
vtn_assert(idx == count); vtn_assert(idx == count);
@@ -3419,11 +3426,14 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvCapabilityStorageImageMultisample: case SpvCapabilityStorageImageMultisample:
case SpvCapabilityInt8: case SpvCapabilityInt8:
case SpvCapabilitySparseResidency: case SpvCapabilitySparseResidency:
case SpvCapabilityMinLod:
vtn_warn("Unsupported SPIR-V capability: %s", vtn_warn("Unsupported SPIR-V capability: %s",
spirv_capability_to_string(cap)); spirv_capability_to_string(cap));
break; break;
case SpvCapabilityMinLod:
spv_check_supported(min_lod, cap);
break;
case SpvCapabilityAtomicStorage: case SpvCapabilityAtomicStorage:
spv_check_supported(atomic_storage, cap); spv_check_supported(atomic_storage, cap);
break; break;