瀏覽代碼

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: 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>
tags/11.1-branchpoint
Ilia Mirkin 10 年之前
父節點
當前提交
13bfa52011
共有 3 個檔案被更改,包括 6 行新增8 行删除
  1. 0
    4
      src/util/Makefile.am
  2. 2
    4
      src/util/Makefile.sources
  3. 4
    0
      src/util/mesa-sha1.c

+ 0
- 4
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


+ 2
- 4
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 \

+ 4
- 0
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

Loading…
取消
儲存