Mesa (staging/21.1): android: nir: add nir_lower_fragcolor.c to Makefile.sources

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: d241a5afb5d8f61594dfa9dc12412e3df6abe8fb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d241a5afb5d8f61594dfa9dc12412e3df6abe8fb

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat May  8 12:42:10 2021 +0200

android: nir: add nir_lower_fragcolor.c to Makefile.sources

Fixes the following building error:

FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so
...
ld.lld: error: undefined symbol: nir_lower_fragcolor
>>> referenced by pan_assemble.c:81 (external/mesa/src/gallium/drivers/panfrost/pan_assemble.c:81)

Cc: 21.0 21.1 <mesa-stable at lists.freedesktop.org>
Fixes: 1fd356302590 ("nir: add lowering pass for fragcolor -> fragdata")
Acked-by: Rob Clark <robclark at freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10712>
(cherry picked from commit 2736ae0454d574a1909863d7870fa4f1fe91bd7d)

---

 .pick_status.json             | 2 +-
 src/compiler/Makefile.sources | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8ddb8877011..cbeccdc8cc9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -787,7 +787,7 @@
         "description": "android: nir: add nir_lower_fragcolor.c to Makefile.sources",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "1fd356302590b30524fb190360247a6c45e1d96c"
     },
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index 66777c7213e..3a517935edd 100644
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -260,6 +260,7 @@ NIR_FILES = \
 	nir/nir_lower_fb_read.c \
 	nir/nir_lower_flatshade.c \
 	nir/nir_lower_flrp.c \
+	nir/nir_lower_fragcolor.c \
 	nir/nir_lower_fragcoord_wtrans.c \
 	nir/nir_lower_frexp.c \
 	nir/nir_lower_global_vars_to_local.c \