Mesa (master): pan/mdg: Fix non-debug compiliation
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jul 14 16:23:27 UTC 2020
Module: Mesa
Branch: master
Commit: 6493d29f2117d63d7949fc3888c2c5d901eaeb95
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6493d29f2117d63d7949fc3888c2c5d901eaeb95
Author: Icecream95 <ixn at keemail.me>
Date: Tue Jul 14 15:06:09 2020 +1200
pan/mdg: Fix non-debug compiliation
Fixes error when the assert is optimized out:
../src/panfrost/midgard/midgard_compile.c: In function ‘output_load_rt_addr’:
../src/panfrost/midgard/midgard_compile.c:1644:1: error: control reaches end of non-void function [-Werror=return-type]
}
Closes #3270
Fixes: 7781d2c2ead ("pan/mdg: Support MRT in output load lowering")
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5895>
---
src/panfrost/midgard/midgard_compile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 324e6278163..a535ccd266e 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -1640,7 +1640,7 @@ output_load_rt_addr(nir_shader *nir, nir_intrinsic_instr *instr)
if (loc == FRAG_RESULT_STENCIL)
return 0x1E;
- assert(0);
+ unreachable("Invalid RT to load from");
}
static void
More information about the mesa-commit
mailing list