fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 17:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir: rename nir_io_glsl_lower_derefs -> nir_io_has_io_intrinsics

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31968>
This commit is contained in:
Marek Olšák 2024-10-27 16:26:28 -04:00 • committed by Marge Bot
parent adc40aee25
commit 2ca56376a4
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/glsl/gl_nir_linker.c
View file

@ -1508,7 +1508,7 @@ gl_nir_lower_optimize_varyings(const struct gl_constants *consts,
nir_shader *nir = shader->Program->nir;
if (nir->info.stage == MESA_SHADER_COMPUTE ||
!(nir->options->io_options & nir_io_glsl_lower_derefs))
!(nir->options->io_options & nir_io_has_intrinsics))
return;
shaders[num_shaders] = nir;

6
src/compiler/nir/nir.h
View file

@ -3834,13 +3834,13 @@ typedef enum {
*/
nir_io_vectorizer_ignores_types = BITFIELD_BIT(6),
/* Options affecting the GLSL compiler are below. */
/* Options affecting the GLSL compiler or Gallium are below. */
/**
* Lower load_deref/store_deref to load_input/store_output/etc. intrinsics.
* This is only affects GLSL compilation.
* This is only affects GLSL compilation and Gallium.
*/
nir_io_glsl_lower_derefs = BITFIELD_BIT(16),
nir_io_has_intrinsics = BITFIELD_BIT(16),
/**
* Run nir_opt_varyings in the GLSL linker.

3
src/gallium/drivers/radeonsi/si_get.c
View file

@ -1570,8 +1570,7 @@ void si_init_screen_get_functions(struct si_screen *sscreen)
* when execution mode is rtz instead of rtne.
*/
options->force_f2f16_rtz = true;
options->io_options |= (!has_mediump ? nir_io_mediump_is_32bit : 0) |
nir_io_glsl_lower_derefs |
options->io_options |= (!has_mediump ? nir_io_mediump_is_32bit : 0) | nir_io_has_intrinsics |
(sscreen->options.optimize_io ? nir_io_glsl_opt_varyings : 0);
options->lower_mediump_io = has_mediump ? si_lower_mediump_io : NULL;
/* HW supports indirect indexing for: | Enabled in driver

2
src/gallium/drivers/zink/zink_compiler.c
View file

@ -1338,7 +1338,7 @@ zink_screen_init_compiler(struct zink_screen *screen)
{
static const struct nir_shader_compiler_options
default_options = {
.io_options = nir_io_glsl_lower_derefs,
.io_options = nir_io_has_intrinsics,
.lower_ffma16 = true,
.lower_ffma32 = true,
.lower_ffma64 = true,

2
src/mesa/main/glspirv.c
View file

@ -335,7 +335,7 @@ _mesa_spirv_to_nir(struct gl_context *ctx,
NIR_PASS(_, nir, nir_split_per_member_structs);
if (nir->info.stage == MESA_SHADER_VERTEX &&
!(nir->options->io_options & nir_io_glsl_lower_derefs))
!(nir->options->io_options & nir_io_has_intrinsics))
nir_remap_dual_slot_attributes(nir, &linked_shader->Program->DualSlotInputs);
NIR_PASS(_, nir, nir_lower_frexp);