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

mesa/st: when creating draw shader variants, use the base nir and skip driver opts

Browse source 
draw module shaders are sometimes incompatible with driver-specific
lowering passes, so ensure that the shaders received by draw are as
close to the originating source as possible

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28189>
This commit is contained in:
Mike Blumenkrantz 2024-03-13 15:33:41 -04:00 • committed by Marge Bot
parent 1f7a4cf191
commit 5eb0136a3c
1 changed files with 66 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/mesa/state_tracker/st_program.c
View file

@ -575,10 +575,62 @@ st_translate_vertex_program(struct st_context *st,
return true; return true;
} }
static const struct nir_shader_compiler_options draw_nir_options = {
.lower_scmp = true,
.lower_flrp32 = true,
.lower_flrp64 = true,
.lower_fsat = true,
.lower_bitfield_insert = true,
.lower_bitfield_extract = true,
.lower_fdot = true,
.lower_fdph = true,
.lower_ffma16 = true,
.lower_ffma32 = true,
.lower_ffma64 = true,
.lower_flrp16 = true,
.lower_fmod = true,
.lower_hadd = true,
.lower_uadd_sat = true,
.lower_usub_sat = true,
.lower_iadd_sat = true,
.lower_ldexp = true,
.lower_pack_snorm_2x16 = true,
.lower_pack_snorm_4x8 = true,
.lower_pack_unorm_2x16 = true,
.lower_pack_unorm_4x8 = true,
.lower_pack_half_2x16 = true,
.lower_pack_split = true,
.lower_unpack_snorm_2x16 = true,
.lower_unpack_snorm_4x8 = true,
.lower_unpack_unorm_2x16 = true,
.lower_unpack_unorm_4x8 = true,
.lower_unpack_half_2x16 = true,
.lower_extract_byte = true,
.lower_extract_word = true,
.lower_insert_byte = true,
.lower_insert_word = true,
.lower_uadd_carry = true,
.lower_usub_borrow = true,
.lower_mul_2x32_64 = true,
.lower_ifind_msb = true,
.lower_int64_options = nir_lower_imul_2x32_64,
.lower_doubles_options = nir_lower_dround_even,
.max_unroll_iterations = 32,
.use_interpolated_input_intrinsics = true,
.lower_to_scalar = true,
.lower_uniforms_to_ubo = true,
.lower_vector_cmp = true,
.lower_device_index_to_zero = true,
.support_16bit_alu = true,
.lower_fisnormal = true,
.lower_fquantize2f16 = true,
.driver_functions = true,
};
static struct nir_shader * static struct nir_shader *
get_nir_shader(struct st_context *st, struct gl_program *prog) get_nir_shader(struct st_context *st, struct gl_program *prog, bool is_draw)
{ {
if (prog->nir) { if (!is_draw && prog->nir) {
nir_shader *nir = prog->nir; nir_shader *nir = prog->nir;
/* The first shader variant takes ownership of NIR, so that there is /* The first shader variant takes ownership of NIR, so that there is
@ -592,9 +644,15 @@ get_nir_shader(struct st_context *st, struct gl_program *prog)
struct blob_reader blob_reader; struct blob_reader blob_reader;
const struct nir_shader_compiler_options *options = const struct nir_shader_compiler_options *options =
st_get_nir_compiler_options(st, prog->info.stage); is_draw ? &draw_nir_options : st_get_nir_compiler_options(st, prog->info.stage);
blob_reader_init(&blob_reader, prog->serialized_nir, prog->serialized_nir_size); if (is_draw) {
assert(prog->base_serialized_nir);
blob_reader_init(&blob_reader, prog->base_serialized_nir, prog->base_serialized_nir_size);
} else {
assert(prog->serialized_nir);
blob_reader_init(&blob_reader, prog->serialized_nir, prog->serialized_nir_size);
}
return nir_deserialize(NULL, options, &blob_reader); return nir_deserialize(NULL, options, &blob_reader);
} }
@ -660,7 +718,7 @@ st_create_common_variant(struct st_context *st,
bool finalize = false; bool finalize = false;
state.type = PIPE_SHADER_IR_NIR; state.type = PIPE_SHADER_IR_NIR;
state.ir.nir = get_nir_shader(st, prog); state.ir.nir = get_nir_shader(st, prog, key->is_draw_shader);
const nir_shader_compiler_options *options = ((nir_shader *)state.ir.nir)->options; const nir_shader_compiler_options *options = ((nir_shader *)state.ir.nir)->options;
if (key->clamp_color) { if (key->clamp_color) {
@ -696,9 +754,9 @@ st_create_common_variant(struct st_context *st,
NIR_PASS(_, state.ir.nir, nir_lower_tex, &tex_opts); NIR_PASS(_, state.ir.nir, nir_lower_tex, &tex_opts);
} }
if (finalize || !st->allow_st_finalize_nir_twice) { if (finalize || !st->allow_st_finalize_nir_twice || key->is_draw_shader) {
char *msg = st_finalize_nir(st, prog, prog->shader_program, state.ir.nir, char *msg = st_finalize_nir(st, prog, prog->shader_program, state.ir.nir,
true, false, false); true, false, key->is_draw_shader);
free(msg); free(msg);
/* Clip lowering and edgeflags may have introduced new varyings, so /* Clip lowering and edgeflags may have introduced new varyings, so
@ -879,7 +937,7 @@ st_create_fp_variant(struct st_context *st,
/* Translate ATI_fs to NIR at variant time because that's when we have the /* Translate ATI_fs to NIR at variant time because that's when we have the
* texture types. * texture types.
*/ */
state.ir.nir = get_nir_shader(st, fp); state.ir.nir = get_nir_shader(st, fp, false);
state.type = PIPE_SHADER_IR_NIR; state.type = PIPE_SHADER_IR_NIR;
bool finalize = false; bool finalize = false;