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

st/mesa: assert that all incoming shaders use lowered IO

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33146>
This commit is contained in:
Marek Olšák
2024-12-24 13:56:29 -05:00
committed by Marge Bot
parent aa37e2e5cb
commit 3e32ea3232
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/state_tracker/st_nir_builtins.c
View File

@@ -74,6 +74,8 @@ st_nir_finish_builtin_nir(struct st_context *st, nir_shader *nir)
if (!screen->caps.nir_images_as_deref)
NIR_PASS(_, nir, gl_nir_lower_images, false);
assert(nir->info.stage == MESA_SHADER_COMPUTE || nir->info.io_lowered);
if (nir->info.io_lowered &&
!(nir->options->io_options & nir_io_has_intrinsics)) {
NIR_PASS(_, nir, st_nir_unlower_io_to_vars);

5
src/mesa/state_tracker/st_program.c
View File

@@ -853,6 +853,9 @@ st_create_common_variant(struct st_context *st,
key->is_draw_shader);
}
assert(state.ir.nir->info.stage == MESA_SHADER_COMPUTE ||
state.ir.nir->info.io_lowered);
/* This should be after all passes that touch IO. */
if (state.ir.nir->info.io_lowered &&
(!(state.ir.nir->options->io_options & nir_io_has_intrinsics) ||
@@ -1245,6 +1248,8 @@ st_create_fp_variant(struct st_context *st,
finalize = true;
}
assert(state.ir.nir->info.io_lowered);
/* This should be after all passes that touch IO. */
if (state.ir.nir->info.io_lowered &&
!(state.ir.nir->options->io_options & nir_io_has_intrinsics)) {