diff options
| author | Marek Olšák <[email protected]> | 2017-02-18 17:08:34 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-02-21 21:27:23 +0100 |
| commit | 63c462226ef2bda691b28837e143853fcbcfd0a5 (patch) | |
| tree | bfb4188185c8ec53fc89a01c6cbe7582f465a421 | |
| parent | 52581606c2e9a5c8f755b9f3fd0d4fd57869ed7d (diff) | |
radeonsi: fix issues with monolithic shaders
R600_DEBUG=mono has had no effect since:
commit 1fabb297177069e95ec1bb7053acb32f8ec3e092
Author: Marek Olšák <[email protected]>
Date: Tue Feb 14 22:08:32 2017 +0100
radeonsi: have separate LS and ES main shader parts in the shader selector
Also, this assertion was failing:
si_state_shaders.c:1307: si_shader_select_with_key: Assertion
`!shader->is_optimized' failed.
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index bcfff0c2770..0e85c129437 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1245,6 +1245,7 @@ again: * if the initial guess was wrong. */ struct si_shader **mainp = si_get_main_shader_part(sel, key); bool is_pure_monolithic = + sscreen->use_monolithic_shaders || memcmp(&key->mono, &zeroed.mono, sizeof(key->mono)) != 0; if (!*mainp && !is_pure_monolithic) { @@ -1278,7 +1279,7 @@ again: memcmp(&key->opt, &zeroed.opt, sizeof(key->opt)) != 0; shader->is_optimized = - !sscreen->use_monolithic_shaders && + !is_pure_monolithic && memcmp(&key->opt, &zeroed.opt, sizeof(key->opt)) != 0; if (shader->is_optimized) util_queue_fence_init(&shader->optimized_ready); |