Mesa (master): android: panfrost/encoder: add libmesa_nir static dependency

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9e9c8e2f794458404441e4bdb51e7a43f6b848e8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e9c8e2f794458404441e4bdb51e7a43f6b848e8

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Jul 18 00:11:51 2020 +0200

android: panfrost/encoder: add libmesa_nir static dependency

Fixes the following build error:

In file included from external/mesa/src/panfrost/encoder/pan_blit.c:34:
In file included from external/mesa/src/panfrost/encoder/../midgard/midgard_compile.h:27:
external/mesa/src/compiler/nir/nir.h:52:10: fatal error: 'nir_opcodes.h' file not found
         ^~~~~~~~~~~~~~~
1 error generated.

Fixes: 293f251871b ("panfrost: Use Midgard-specific reloads")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5961>

---

 src/panfrost/Android.encoder.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/panfrost/Android.encoder.mk b/src/panfrost/Android.encoder.mk
index d913f45b177..9e57adc4060 100644
--- a/src/panfrost/Android.encoder.mk
+++ b/src/panfrost/Android.encoder.mk
@@ -32,6 +32,7 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/panfrost/include/
 
 LOCAL_STATIC_LIBRARIES := \
+	libmesa_nir
 
 LOCAL_GENERATED_SOURCES := \