<div dir="ltr"><div><div><div><div>Thanks for this.<br><br></div>This at least lets me build a 32-bit mesa on 64-bit host again by disabling the cache.<br><br></div>Tested-by: Aaron Watry <<a href="mailto:awatry@gmail.com">awatry@gmail.com</a>><br><br></div>Tim: Just FYI, I get test failures for 32-bit builds on my x86-64 host. With this patch, it no longer segfaults at least, just fails tests. If you need more info, I can dig a bit. I do get a bunch of warnings when building cache_test.c, so some of those could be responsible... haven't looked into it yet.<br><br></div>--Aaron<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Oct 5, 2016 at 3:22 PM, Ian Romanick <span dir="ltr"><<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
<br>
Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
Cc: Timothy Arceri <<a href="mailto:timothy.arceri@collabora.com">timothy.arceri@collabora.com</a>><br>
---<br>
src/compiler/glsl/tests/cache_<wbr>test.c | 4 ++++<br>
1 file changed, 4 insertions(+)<br>
<br>
diff --git a/src/compiler/glsl/tests/<wbr>cache_test.c b/src/compiler/glsl/tests/<wbr>cache_test.c<br>
index 1b0403c..724dfcd 100644<br>
--- a/src/compiler/glsl/tests/<wbr>cache_test.c<br>
+++ b/src/compiler/glsl/tests/<wbr>cache_test.c<br>
@@ -36,6 +36,7 @@<br>
<br>
bool error = false;<br>
<br>
+#ifdef ENABLE_SHADER_CACHE<br>
void<br>
_mesa_warning(void *ctx, const char *fmt, ...);<br>
<br>
@@ -397,10 +398,12 @@ test_put_key_and_get_key(void)<br>
<br>
cache_destroy(cache);<br>
}<br>
+#endif /* ENABLE_SHADER_CACHE */<br>
<br>
int<br>
main(void)<br>
{<br>
+#ifdef ENABLE_SHADER_CACHE<br>
int err;<br>
<br>
test_cache_create();<br>
@@ -411,6 +414,7 @@ main(void)<br>
<br>
err = rmrf_local(CACHE_TEST_TMP);<br>
expect_equal(err, 0, "Removing " CACHE_TEST_TMP " again");<br>
+#endif /* ENABLE_SHADER_CACHE */<br>
<br>
return error ? 1 : 0;<br>
}<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.5.5<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>