Mesa (main): llvmpipe/linear: fix ppc64/s390 build

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: fd9cc1d00701bad61a4ddde67c4a3eb97f76eeaf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd9cc1d00701bad61a4ddde67c4a3eb97f76eeaf

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri May 14 11:00:41 2021 +1000

llvmpipe/linear: fix ppc64/s390 build

Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11969>

---

 src/gallium/drivers/llvmpipe/lp_linear.c          | 5 +++++
 src/gallium/drivers/llvmpipe/lp_linear_fastpath.c | 1 -
 src/gallium/drivers/llvmpipe/lp_linear_priv.h     | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_linear.c b/src/gallium/drivers/llvmpipe/lp_linear.c
index 999e7781a9b..62939a39750 100644
--- a/src/gallium/drivers/llvmpipe/lp_linear.c
+++ b/src/gallium/drivers/llvmpipe/lp_linear.c
@@ -360,4 +360,9 @@ fail:
 }
 
 
+#else
+void
+lp_linear_check_variant(struct lp_fragment_shader_variant *variant)
+{
+}
 #endif
diff --git a/src/gallium/drivers/llvmpipe/lp_linear_fastpath.c b/src/gallium/drivers/llvmpipe/lp_linear_fastpath.c
index be2802976a0..b97ea1b88e1 100644
--- a/src/gallium/drivers/llvmpipe/lp_linear_fastpath.c
+++ b/src/gallium/drivers/llvmpipe/lp_linear_fastpath.c
@@ -227,7 +227,6 @@ lp_linear_check_fastpath(struct lp_fragment_shader_variant *variant)
    return variant->jit_linear != NULL;
 }
 #else
-void
 boolean
 lp_linear_check_fastpath(struct lp_fragment_shader_variant *variant)
 {
diff --git a/src/gallium/drivers/llvmpipe/lp_linear_priv.h b/src/gallium/drivers/llvmpipe/lp_linear_priv.h
index 756e2398e57..6ae1f77aeb9 100644
--- a/src/gallium/drivers/llvmpipe/lp_linear_priv.h
+++ b/src/gallium/drivers/llvmpipe/lp_linear_priv.h
@@ -52,9 +52,11 @@ struct lp_linear_sampler {
 struct lp_linear_interp {
    struct lp_linear_elem base;
 
+#if defined(PIPE_ARCH_SSE)
    __m128i a0;
    __m128i dadx;
    __m128i dady;
+#endif
 
    int width;                   /* rounded up to multiple of 4 */