diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-09-04 16:43:22 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-09-06 16:11:24 -0400 |
| commit | 13bfa5201162185005fa9a45f7bc76e5909ab193 (patch) | |
| tree | 6b81a9395443997e0db17002df135471c57741d7 | |
| parent | e40f32d5626c87d9e77bbc261df3648cd54bd066 (diff) | |
util: always include sha1 into the build
SHA1 is now used in all builds when HAVE_SHA1 is defined. Adjust src to
do the same thing, rather than predicating on shader cache.
Fixes: 04e201d0c02 ("mesa: change 'SHADER_SUBST' facility to work with env variables")
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@gmail.com>
| -rw-r--r-- | src/util/Makefile.am | 4 | ||||
| -rw-r--r-- | src/util/Makefile.sources | 6 | ||||
| -rw-r--r-- | src/util/mesa-sha1.c | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 1e087b40d3..761023d186 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -44,11 +44,7 @@ libmesautil_la_SOURCES = \ $(MESA_UTIL_FILES) \ $(MESA_UTIL_GENERATED_FILES) -if ENABLE_SHADER_CACHE -libmesautil_la_SOURCES += $(MESA_UTIL_SHADER_CACHE_FILES) - libmesautil_la_LIBADD = $(SHA1_LIBS) -endif roundeven_test_LDADD = -lm diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 82df3bcb00..afdd0cb3b5 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -1,7 +1,3 @@ -MESA_UTIL_SHADER_CACHE_FILES := \ - mesa-sha1.c \ - mesa-sha1.h - MESA_UTIL_FILES := \ bitset.h \ format_srgb.h \ @@ -9,6 +5,8 @@ MESA_UTIL_FILES := \ hash_table.h \ list.h \ macros.h \ + mesa-sha1.c \ + mesa-sha1.h \ ralloc.c \ ralloc.h \ register_allocate.c \ diff --git a/src/util/mesa-sha1.c b/src/util/mesa-sha1.c index fa28193777..7614b21c8b 100644 --- a/src/util/mesa-sha1.c +++ b/src/util/mesa-sha1.c @@ -290,6 +290,8 @@ _mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20]) #endif +#ifdef HAVE_SHA1 + void _mesa_sha1_compute(const void *data, size_t size, unsigned char result[20]) { @@ -314,3 +316,5 @@ _mesa_sha1_format(char *buf, const unsigned char *sha1) return buf; } + +#endif |