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

zink: add a pass to strip out multisample storage image ops

Browse Source 
ARB_shader_image_load_store requires that drivers can compile shaders
containing these tokens, but it doesn't require that they can execute
them. thus, deleting the multisample component is fine since these
shaders will never be executed

affects/fixes:
KHR-GL46.gl_spirv.spirv_validation_capabilities_test

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28078>
This commit is contained in:
Mike Blumenkrantz
2024-03-08 11:58:54 -05:00
committed by Marge Bot
parent 3f122761a1
commit 90cf8d14d6
2 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/zink/ci/zink-anv-tgl-skips.txt
View File

@@ -46,6 +46,3 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv
# would require adding a bunch of VVL exceptions
KHR-GL46.gl_spirv.spirv_validation_capabilities_test

56
src/gallium/drivers/zink/zink_compiler.c
View File

@@ -4771,6 +4771,60 @@ split_bitfields(nir_shader *shader)
return nir_shader_instructions_pass(shader, split_bitfields_instr, nir_metadata_dominance, NULL);
}
static bool
strip_tex_ms_instr(nir_builder *b, nir_instr *in, void *data)
{
if (in->type != nir_instr_type_intrinsic)
return false;
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(in);
switch (intr->intrinsic) {
case nir_intrinsic_image_deref_store:
case nir_intrinsic_image_deref_load:
break;
default:
return false;
}
enum glsl_sampler_dim dim = nir_intrinsic_image_dim(intr);
if (dim != GLSL_SAMPLER_DIM_MS)
return false;
nir_deref_instr *deref = nir_src_as_deref(intr->src[0]);
nir_variable *var = nir_deref_instr_get_variable(deref);
nir_deref_instr *parent = nir_deref_instr_parent(deref);
if (parent) {
parent->type = var->type;
deref->type = glsl_without_array(var->type);
} else {
deref->type = var->type;
}
nir_intrinsic_set_image_dim(intr, GLSL_SAMPLER_DIM_2D);
return true;
}
static bool
strip_tex_ms(nir_shader *shader)
{
bool progress = false;
nir_foreach_image_variable(var, shader) {
const struct glsl_type *bare_type = glsl_without_array(var->type);
if (glsl_get_sampler_dim(bare_type) != GLSL_SAMPLER_DIM_MS)
continue;
unsigned array_size = 0;
if (glsl_type_is_array(var->type))
array_size = glsl_array_size(var->type);
const struct glsl_type *new_type = glsl_image_type(GLSL_SAMPLER_DIM_2D, glsl_sampler_type_is_array(bare_type), glsl_get_sampler_result_type(bare_type));
if (array_size)
new_type = glsl_array_type(new_type, array_size, glsl_get_explicit_stride(var->type));
var->type = new_type;
progress = true;
}
if (!progress)
return false;
return nir_shader_instructions_pass(shader, strip_tex_ms_instr, nir_metadata_all, NULL);
}
static void
rewrite_cl_derefs(nir_shader *nir, nir_variable *var)
{
@@ -5515,6 +5569,8 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir)
NIR_PASS_V(nir, lower_baseinstance);
NIR_PASS_V(nir, lower_sparse_and);
NIR_PASS_V(nir, split_bitfields);
if (!screen->info.feats.features.shaderStorageImageMultisample)
NIR_PASS_V(nir, strip_tex_ms);
NIR_PASS_V(nir, nir_lower_frexp); /* TODO: Use the spirv instructions for this. */
if (screen->info.have_EXT_shader_demote_to_helper_invocation) {