fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-11 15:40:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

util: always include sha1 into the build

Browse source 
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: 04e201d0c0 ("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>
This commit is contained in:
Ilia Mirkin 2015-09-04 16:43:22 -04:00
parent e40f32d562
commit 13bfa52011
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/util/Makefile.am
View file

@ -44,11 +44,7 @@ libmesautil_la_SOURCES = \
$(MESA_UTIL_FILES) \ $(MESA_UTIL_FILES) \
$(MESA_UTIL_GENERATED_FILES) $(MESA_UTIL_GENERATED_FILES)
if ENABLE_SHADER_CACHE
libmesautil_la_SOURCES += $(MESA_UTIL_SHADER_CACHE_FILES)
libmesautil_la_LIBADD = $(SHA1_LIBS) libmesautil_la_LIBADD = $(SHA1_LIBS)
endif
roundeven_test_LDADD = -lm roundeven_test_LDADD = -lm

6
src/util/Makefile.sources
View file

@ -1,7 +1,3 @@
MESA_UTIL_SHADER_CACHE_FILES := \
mesa-sha1.c \
mesa-sha1.h
MESA_UTIL_FILES := \ MESA_UTIL_FILES := \
bitset.h \ bitset.h \
format_srgb.h \ format_srgb.h \
@ -9,6 +5,8 @@ MESA_UTIL_FILES := \
hash_table.h \ hash_table.h \
list.h \ list.h \
macros.h \ macros.h \
mesa-sha1.c \
mesa-sha1.h \
ralloc.c \ ralloc.c \
ralloc.h \ ralloc.h \
register_allocate.c \ register_allocate.c \

4
src/util/mesa-sha1.c
View file

@ -290,6 +290,8 @@ _mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
#endif #endif
#ifdef HAVE_SHA1
void void
_mesa_sha1_compute(const void *data, size_t size, unsigned char result[20]) _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; return buf;
} }
#endif