[Mesa-dev] [PATCH 1/2] util: import cache.c/h from glsl

[Emil Velikov]

On 15 November 2016 at 19:07, Marek Olšák <maraeo at gmail.com> wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> It's not dependent on GLSL and it can be useful for shader caches that don't
> deal with GLSL.
>
> v2: address review comments
Thank you !

> ---
>  configure.ac                                     |  4 ----
>  src/compiler/Makefile.glsl.am                    |  4 ----
>  src/compiler/Makefile.sources                    |  4 ----
>  src/compiler/glsl/tests/cache_test.c             | 22 +---------------------
>  src/util/Makefile.sources                        |  2 ++
>  src/{compiler/glsl/cache.c => util/disk_cache.c} | 16 +++++++++-------
>  src/{compiler/glsl/cache.h => util/disk_cache.h} | 11 +++++------
>  7 files changed, 17 insertions(+), 46 deletions(-)
>  rename src/{compiler/glsl/cache.c => util/disk_cache.c} (98%)
>  rename src/{compiler/glsl/cache.h => util/disk_cache.h} (99%)
>
> diff --git a/configure.ac b/configure.ac
> index 9d62b90..90845e6 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1354,24 +1354,20 @@ AC_ARG_ENABLE([shader-cache],
>      [if test "x$with_sha1" != "x"; then
>          enable_shader_cache=yes
>       else
>          enable_shader_cache=no
>       fi])
>  if test "x$with_sha1" = "x"; then
>      if test "x$enable_shader_cache" = "xyes"; then
>          AC_MSG_ERROR([Cannot enable shader cache (no SHA-1 implementation found)])
>      fi
>  fi
> -AM_CONDITIONAL([ENABLE_SHADER_CACHE], [test x$enable_shader_cache = xyes])
> -if test "x$enable_shader_cache" = "xyes"; then
> -   AC_DEFINE([ENABLE_SHADER_CACHE], [1], [Enable shader cache])
> -fi
>
Looks like I wasn't unclear - you want to drop the AM_CONDITIONAL and
keep the other three lines. As-is the code is never built so one
cannot really use it.

With that
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

-Emil