fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: add options.inline_uniforms to the shader cache key

Browse source 
It affects how shaders are finalized before caching.

Fixes: b7501184b9 ("radeonsi: implement inlinable uniforms")

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542>
(cherry picked from commit 025bc9e50e)

Conflicts:
	src/gallium/drivers/radeonsi/si_state_shaders.c
This commit is contained in:
Marek Olšák 2020-11-10 18:48:22 -05:00 • committed by Dylan Baker
parent d247a0720a
commit f396e154f1
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -643,7 +643,7 @@
"description": "radeonsi: add options.inline_uniforms to the shader cache key",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "b7501184b90a20015885b3f2276a7a5ceaef31a7"
},

2
src/gallium/drivers/radeonsi/si_state_shaders.c
View file

@ -89,6 +89,8 @@ void si_get_ir_cache_key(struct si_shader_selector *sel, bool ngg, bool es,
shader_variant_flags |= 1 << 8;
if (sel->screen->debug_flags & DBG(GISEL))
shader_variant_flags |= 1 << 9;
if (sel->screen->options.inline_uniforms)
shader_variant_flags |= 1 << 11;
struct mesa_sha1 ctx;
_mesa_sha1_init(&ctx);