summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Herbst <kherbst@redhat.com>2020-07-06 20:06:40 +0200
committerMarge Bot <eric+marge@anholt.net>2020-07-07 11:32:15 +0000
commitbbf2db20fef7a0cd9188c92790a60eff6900bfdc (patch)
tree2d11951e342a15c4cda7a681d9b59678f21c8060
parent31e344799a701630164f6f7907b09e5699a769d9 (diff)
nv50/ir/nir: fix cache mode conversion
The nir access qualifier is actually a bitfield, so we need to read out like one. Signed-off-by: Karol Herbst <kherbst@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5747>
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
index d5b81b84c35..a972b51b623 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
@@ -2938,14 +2938,11 @@ Converter::getNIRArgCount(TexInstruction::Target& target)
CacheMode
Converter::convert(enum gl_access_qualifier access)
{
- switch (access) {
- case ACCESS_VOLATILE:
+ if (access & ACCESS_VOLATILE)
return CACHE_CV;
- case ACCESS_COHERENT:
+ if (access & ACCESS_COHERENT)
return CACHE_CG;
- default:
- return CACHE_CA;
- }
+ return CACHE_CA;
}
bool