[ptxdist] [PATCH] mesalib: fix glvnd-vendor-name and shader-cache-max-size options

[ptxdist] [PATCH] mesalib: fix glvnd-vendor-name and shader-cache-max-size options

[Philipp Zabel]

These have been renamed in 21.0 from glvnd-name and
shader-max-cache-size, respectively.

Fixes: 97981367fe85 ("mesalib: version bump 20.3.3 -> 21.0.1")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/mesalib.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index d6f8230c5d4f..5d8f3aad308d 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -134,8 +134,8 @@ MESALIB_CONF_OPT	:= \
 	-Dgles-lib-suffix= \
 	-Dgles1=$(call ptx/endis, PTXCONF_MESALIB_GLES1)d \
 	-Dgles2=$(call ptx/endis, PTXCONF_MESALIB_GLES2)d \
-	-Dglvnd-name= \
 	-Dglvnd=false \
+	-Dglvnd-vendor-name= \
 	-Dglx=$(call ptx/ifdef, PTXCONF_MESALIB_GLX, dri, disabled) \
 	-Dglx-direct=true \
 	-Dglx-read-only-text=false \
@@ -155,9 +155,9 @@ MESALIB_CONF_OPT	:= \
 	-Dpower8=disabled \
 	-Dprefer-iris=true \
 	-Dselinux=false \
-	-Dshader-cache-default=true \
 	-Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_VULKAN_AMD)d \
-	-Dshader-max-cache-size=1G \
+	-Dshader-cache-default=true \
+	-Dshader-cache-max-size=1G \
 	-Dshared-glapi=enabled \
 	-Dshared-llvm=disabled \
 	-Dshared-swr=true \
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] mesalib: fix glvnd-vendor-name and shader-cache-max-size options

[Michael Olbrich]

Thanks, applied as bbeab38ad09c26dd1295fcff8eadd280229799fa.

Michael

[sent from post-receive hook]

On Fri, 23 Apr 2021 15:47:39 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> These have been renamed in 21.0 from glvnd-name and
> shader-max-cache-size, respectively.
> 
> Fixes: 97981367fe85 ("mesalib: version bump 20.3.3 -> 21.0.1")
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210422075719.20905-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index d6f8230c5d4f..5d8f3aad308d 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -134,8 +134,8 @@ MESALIB_CONF_OPT	:= \
>  	-Dgles-lib-suffix= \
>  	-Dgles1=$(call ptx/endis, PTXCONF_MESALIB_GLES1)d \
>  	-Dgles2=$(call ptx/endis, PTXCONF_MESALIB_GLES2)d \
> -	-Dglvnd-name= \
>  	-Dglvnd=false \
> +	-Dglvnd-vendor-name= \
>  	-Dglx=$(call ptx/ifdef, PTXCONF_MESALIB_GLX, dri, disabled) \
>  	-Dglx-direct=true \
>  	-Dglx-read-only-text=false \
> @@ -155,9 +155,9 @@ MESALIB_CONF_OPT	:= \
>  	-Dpower8=disabled \
>  	-Dprefer-iris=true \
>  	-Dselinux=false \
> -	-Dshader-cache-default=true \
>  	-Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_VULKAN_AMD)d \
> -	-Dshader-max-cache-size=1G \
> +	-Dshader-cache-default=true \
> +	-Dshader-cache-max-size=1G \
>  	-Dshared-glapi=enabled \
>  	-Dshared-llvm=disabled \
>  	-Dshared-swr=true \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de