summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2019-08-13 10:34:06 +0300
committerDylan Baker <dylan@pnwbakers.com>2019-09-04 11:52:09 -0700
commit18511e3f5b0ee487a5da72890bb7cdcc025ed0b2 (patch)
tree163dadf5e4b92c9dd4525eda617a9a427dd6b41f
parent7c615873e5c81ee5fec431826d4f201656e483b5 (diff)
downloadmesa-18511e3f5b0ee487a5da72890bb7cdcc025ed0b2.tar.gz
iris/android: fix build and link with libmesa_intel_perf
Fixes: 0fd4359733e "iris/perf: implement routines to return counter info" Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 728ebcdec2bfc38f28fd7feb3b89194c64287ac6)
-rw-r--r--src/gallium/drivers/iris/Android.mk1
-rw-r--r--src/gallium/drivers/iris/Makefile.sources1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/iris/Android.mk b/src/gallium/drivers/iris/Android.mk
index 824ae7a0b10..71ec0cf58f9 100644
--- a/src/gallium/drivers/iris/Android.mk
+++ b/src/gallium/drivers/iris/Android.mk
@@ -165,6 +165,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_blorp \
libmesa_intel_common \
libmesa_intel_compiler \
+ libmesa_intel_perf \
libmesa_iris_gen8 \
libmesa_iris_gen9 \
libmesa_iris_gen10 \
diff --git a/src/gallium/drivers/iris/Makefile.sources b/src/gallium/drivers/iris/Makefile.sources
index d44221078f9..bc8f592d333 100644
--- a/src/gallium/drivers/iris/Makefile.sources
+++ b/src/gallium/drivers/iris/Makefile.sources
@@ -44,6 +44,7 @@ IRIS_C_SOURCES = \
iris_formats.c \
iris_genx_macros.h \
iris_genx_protos.h \
+ iris_monitor.c \
iris_pipe.h \
iris_pipe_control.c \
iris_program.c \