Mesa (master): glsl: Let cache_test build when the shader cache is not enabled

Ian Romanick idr at kemper.freedesktop.org
Fri Oct 7 18:35:23 UTC 2016


Module: Mesa
Branch: master
Commit: f546b41f6ac9b4394b931d9e0ac4e30fc3f2c40f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f546b41f6ac9b4394b931d9e0ac4e30fc3f2c40f

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Oct  5 13:21:53 2016 -0700

glsl: Let cache_test build when the shader cache is not enabled

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri at collabora.com>
Tested-by: Aaron Watry <awatry at gmail.com>

---

 src/compiler/glsl/tests/cache_test.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index 1b0403c..724dfcd 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -36,6 +36,7 @@
 
 bool error = false;
 
+#ifdef ENABLE_SHADER_CACHE
 void
 _mesa_warning(void *ctx, const char *fmt, ...);
 
@@ -397,10 +398,12 @@ test_put_key_and_get_key(void)
 
    cache_destroy(cache);
 }
+#endif /* ENABLE_SHADER_CACHE */
 
 int
 main(void)
 {
+#ifdef ENABLE_SHADER_CACHE
    int err;
 
    test_cache_create();
@@ -411,6 +414,7 @@ main(void)
 
    err = rmrf_local(CACHE_TEST_TMP);
    expect_equal(err, 0, "Removing " CACHE_TEST_TMP " again");
+#endif /* ENABLE_SHADER_CACHE */
 
    return error ? 1 : 0;
 }




More information about the mesa-commit mailing list