diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-07-30 16:19:43 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-07-30 18:26:04 +0200 |
| commit | cf777f9ebc8ae074b2c78ff297662ce25aec2e8f (patch) | |
| tree | 30376d8aa0b9da11df7e796d2177cfb048c5c90a | |
| parent | 67afafcd064740b41471a08be15db5daa6e5ac57 (diff) | |
| download | ptxdist-cf777f9ebc8ae074b2c78ff297662ce25aec2e8f.tar.gz ptxdist-cf777f9ebc8ae074b2c78ff297662ce25aec2e8f.tar.xz | |
mesalib: cleanup shader cache related options
Zstd is not actually used unless the shader cache is enabled.
So add an option to explicitly enable the shader cache instead.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/mesalib.in | 6 | ||||
| -rw-r--r-- | rules/mesalib.make | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/rules/mesalib.in b/rules/mesalib.in index af59bf974..2f64606dc 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -32,7 +32,7 @@ menuconfig MESALIB select XORG_LIB_XSHMFENCE if MESALIB_DRI3 select EXPAT select ZLIB - select ZSTD if MESALIB_ZSTD + select ZSTD if MESALIB_SHADER_CACHE help Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL. See the project homepage for @@ -226,9 +226,9 @@ config MESALIB_VULKAN_OVERLAY bool prompt "Overlay layer" -config MESALIB_ZSTD +config MESALIB_SHADER_CACHE bool - prompt "use Zstandard for shader cache compression" + prompt "enable shader cache" endif diff --git a/rules/mesalib.make b/rules/mesalib.make index acf26b1ad..3ff3a09bd 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -160,7 +160,7 @@ MESALIB_CONF_OPT := \ -Dpower8=disabled \ -Dprefer-iris=true \ -Dselinux=false \ - -Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_VULKAN_AMD)d \ + -Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d \ -Dshader-cache-default=true \ -Dshader-cache-max-size=1G \ -Dshared-glapi=enabled \ @@ -180,7 +180,7 @@ MESALIB_CONF_OPT := \ -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \ -Dxvmc-libs-path=/usr/lib \ -Dzlib=enabled \ - -Dzstd=$(call ptx/endis, PTXCONF_MESALIB_ZSTD)d + -Dzstd=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d # ---------------------------------------------------------------------------- # Compile |