radv: fix shader caching with NaN fixup workaround

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Fixes: 6f21995f98 ("radv: add new drirc option radv_enable_mrt_output_nan_fixup")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7423>
(cherry picked from commit ac65d3b6b8)
This commit is contained in:
Rhys Perry 2020-11-03 10:55:14 +00:00 committed by Dylan Baker
parent f00bce0ee4
commit d0d0c3abc4
3 changed files with 4 additions and 1 deletions

View file

@ -5179,7 +5179,7 @@
"description": "radv: fix shader caching with NaN fixup workaround",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "6f21995f986a8f119c916bef3293991e34774678"
},

View file

@ -221,6 +221,8 @@ static uint32_t get_hash_flags(struct radv_device *device)
hash_flags |= RADV_HASH_SHADER_LLVM;
if (device->instance->debug_flags & RADV_DEBUG_DISCARD_TO_DEMOTE)
hash_flags |= RADV_HASH_SHADER_DISCARD_TO_DEMOTE;
if (device->instance->enable_mrt_output_nan_fixup)
hash_flags |= RADV_HASH_SHADER_MRT_NAN_FIXUP;
return hash_flags;
}

View file

@ -1590,6 +1590,7 @@ struct radv_shader_module;
#define RADV_HASH_SHADER_GE_WAVE32 (1 << 3)
#define RADV_HASH_SHADER_LLVM (1 << 4)
#define RADV_HASH_SHADER_DISCARD_TO_DEMOTE (1 << 5)
#define RADV_HASH_SHADER_MRT_NAN_FIXUP (1 << 6)
void
radv_hash_shaders(unsigned char *hash,