From 8fc7807cc2efe843caf67c82605fdf1f64eb30ec Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam@gmail.com>
Date: Sat, 5 Dec 2020 16:40:12 +0100
Subject: [PATCH] android: gallium/aux: Add GPU tracepoint mechanism

Android rules to build u_trace sources and u_tracepoints generated sources

Changelog:
- add util/u_tracepoints.{c,h} gen rules for Android using $(MESA_PYTHON3)
- update Makefile.sources with the required sources and generated sources

Fixes: 3471af9c6cfa ("gallium/aux: Add GPU tracepoint mechanism")
Acked-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7942>
---
 src/gallium/auxiliary/Android.mk       | 12 ++++++++++++
 src/gallium/auxiliary/Makefile.sources |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index 8ce58a3a9b6..2bed3103c97 100644
--- a/src/gallium/auxiliary/Android.mk
+++ b/src/gallium/auxiliary/Android.mk
@@ -78,6 +78,18 @@ $(intermediates)/indices/u_unfilled_gen.c: $(u_unfilled_gen_deps)
 	@mkdir -p $(dir $@)
 	$(hide) $(MESA_PYTHON3) $< > $@
 
+u_tracepoints_deps := \
+	$(MESA_TOP)/src/gallium/auxiliary/util/u_tracepoints.py \
+	$(MESA_TOP)/src/gallium/auxiliary/util/u_trace.py
+
+u_tracepoints_c := $(intermediates)/util/u_tracepoints.c
+u_tracepoints_h := $(intermediates)/util/u_tracepoints.h
+
+$(intermediates)/util/u_tracepoints.c \
+$(intermediates)/util/u_tracepoints.h: $(u_tracepoints_deps)
+	@mkdir -p $(dir $@)
+	$(hide) $(MESA_PYTHON3) $< -p $(MESA_TOP)/src/gallium/auxiliary/util -C $(u_tracepoints_c) -H $(u_tracepoints_h)
+
 LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H)
 
 include $(GALLIUM_COMMON_MK)
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index c3d477baad7..e2c5f4f9998 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -298,6 +298,9 @@ C_SOURCES := \
 	util/u_texture.h \
 	util/u_tile.c \
 	util/u_tile.h \
+	util/u_trace.c \
+	util/u_trace.h \
+	util/u_trace_priv.h \
 	util/u_transfer.c \
 	util/u_transfer.h \
 	util/u_transfer_helper.c \
@@ -377,7 +380,9 @@ VL_STUB_SOURCES := \
 
 GENERATED_SOURCES := \
 	indices/u_indices_gen.c \
-	indices/u_unfilled_gen.c
+	indices/u_unfilled_gen.c \
+	util/u_tracepoints.c \
+	util/u_tracepoints.h
 
 GALLIVM_SOURCES := \
 	gallivm/lp_bld_arit.c \