[RFC][PATCH 2/3] mesa: android: freedreno: build libfreedreno_{drm, ir3} static libs
John Stultz
john.stultz at linaro.org
Thu May 2 18:03:45 UTC 2019
From: Amit Pundir <amit.pundir at linaro.org>
Add libfreedreno_drm/ir3 to the build
Cc: Rob Clark <robdclark at chromium.org>
Cc: Emil Velikov <emil.l.velikov at gmail.com>
Cc: Amit Pundir <amit.pundir at linaro.org>
Cc: Sumit Semwal <sumit.semwal at linaro.org>
Cc: Alistair Strachan <astrachan at google.com>
Cc: Greg Hartman <ghartman at google.com>
Cc: Tapani Pälli <tapani.palli at intel.com>
Cc: Jason Ekstrand <jason at jlekstrand.net>
Signed-off-by: Amit Pundir <amit.pundir at linaro.org>
[jstultz: Tweaked to add extra ir3 files from master]
Signed-off-by: John Stultz <john.stultz at lianro.org>
---
Android.mk | 1 +
src/freedreno/Android.drm.mk | 41 +++++++++++++++++++
src/freedreno/Android.ir3.mk | 51 ++++++++++++++++++++++++
src/freedreno/Android.mk | 30 ++++++++++++++
src/freedreno/Makefile.sources | 2 +
src/gallium/Android.common.mk | 5 ++-
src/gallium/drivers/freedreno/Android.mk | 2 +-
src/gallium/targets/dri/Android.mk | 4 ++
8 files changed, 134 insertions(+), 2 deletions(-)
create mode 100644 src/freedreno/Android.drm.mk
create mode 100644 src/freedreno/Android.ir3.mk
create mode 100644 src/freedreno/Android.mk
diff --git a/Android.mk b/Android.mk
index d2b12ea4473..5fe028c6d19 100644
--- a/Android.mk
+++ b/Android.mk
@@ -110,6 +110,7 @@ endef
# add subdirectories
SUBDIRS := \
+ src/freedreno \
src/gbm \
src/loader \
src/mapi \
diff --git a/src/freedreno/Android.drm.mk b/src/freedreno/Android.drm.mk
new file mode 100644
index 00000000000..dfa9bed7d2e
--- /dev/null
+++ b/src/freedreno/Android.drm.mk
@@ -0,0 +1,41 @@
+# Mesa 3-D graphics library
+#
+# Copyright (C)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# Android.mk for libfreedreno_drm.a
+
+# ---------------------------------------
+# Build libfreedreno_drm
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ $(drm_SOURCES)
+
+LOCAL_C_INCLUDES := \
+ $(MESA_TOP)/src/gallium/include \
+ $(MESA_TOP)/src/gallium/auxiliary
+
+LOCAL_MODULE := libfreedreno_drm
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk
new file mode 100644
index 00000000000..c6a9d3288d7
--- /dev/null
+++ b/src/freedreno/Android.ir3.mk
@@ -0,0 +1,51 @@
+# Mesa 3-D graphics library
+#
+# Copyright (C)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# Android.mk for libfreedreno_ir3.a
+
+# ---------------------------------------
+# Build libfreedreno_ir3
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ $(ir3_SOURCES)
+
+LOCAL_C_INCLUDES := \
+ $(MESA_TOP)/src/compiler/nir \
+ $(MESA_TOP)/src/gallium/include \
+ $(MESA_TOP)/src/gallium/auxiliary \
+ $(MESA_TOP)/prebuilt-intermediates/nir \
+
+# We need libmesa_nir to get NIR's generated include directories.
+LOCAL_STATIC_LIBRARIES := \
+ libmesa_nir
+
+LOCAL_MODULE := libfreedreno_ir3
+
+LOCAL_GENERATED_SOURCES := \
+ $(MESA_GEN_GLSL_H) \
+ $(MESA_GEN_NIR_H)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/freedreno/Android.mk b/src/freedreno/Android.mk
new file mode 100644
index 00000000000..e46e2199dc1
--- /dev/null
+++ b/src/freedreno/Android.mk
@@ -0,0 +1,30 @@
+# Mesa 3-D graphics library
+#
+# Copyright (C)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# Android.mk for libfreedreno_*
+
+LOCAL_PATH := $(call my-dir)
+
+include $(LOCAL_PATH)/Makefile.sources
+include $(MESA_TOP)/src/gallium/drivers/freedreno/Android.gen.mk
+include $(LOCAL_PATH)/Android.drm.mk
+include $(LOCAL_PATH)/Android.ir3.mk
diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources
index aa8edec82f2..a46a2c30913 100644
--- a/src/freedreno/Makefile.sources
+++ b/src/freedreno/Makefile.sources
@@ -36,6 +36,8 @@ ir3_SOURCES := \
ir3/ir3_nir.c \
ir3/ir3_nir.h \
ir3/ir3_nir_analyze_ubo_ranges.c \
+ ir3/ir3_nir_lower_load_barycentric_at_sample.c \
+ ir3/ir3_nir_lower_load_barycentric_at_offset.c \
ir3/ir3_nir_lower_io_offsets.c \
ir3/ir3_nir_lower_tg4_to_tex.c \
ir3/ir3_nir_move_varying_inputs.c \
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index 782510ff0f4..0d55f04ac94 100644
--- a/src/gallium/Android.common.mk
+++ b/src/gallium/Android.common.mk
@@ -27,6 +27,9 @@ LOCAL_C_INCLUDES += \
$(GALLIUM_TOP)/include \
$(GALLIUM_TOP)/auxiliary \
$(GALLIUM_TOP)/winsys \
- $(GALLIUM_TOP)/drivers
+ $(GALLIUM_TOP)/drivers \
+ $(MESA_TOP)/src/freedreno \
+ $(MESA_TOP)/src/freedreno/ir3 \
+ $(MESA_TOP)/src/freedreno/registers
include $(MESA_COMMON_MK)
diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk
index ccd88a7d16c..f0ae361cd6a 100644
--- a/src/gallium/drivers/freedreno/Android.mk
+++ b/src/gallium/drivers/freedreno/Android.mk
@@ -44,7 +44,7 @@ LOCAL_C_INCLUDES := \
LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
LOCAL_SHARED_LIBRARIES := libdrm
-LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir
+LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir libfreedreno_drm libfreedreno_ir3
LOCAL_MODULE := libmesa_pipe_freedreno
include $(LOCAL_PATH)/Android.gen.mk
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 6134251b5ca..10b27a80ef3 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -53,6 +53,10 @@ LOCAL_SHARED_LIBRARIES += \
libexpat
endif
+LOCAL_STATIC_LIBRARIES += \
+ libfreedreno_drm \
+ libfreedreno_ir3
+
ifeq ($(USE_LIBBACKTRACE),true)
LOCAL_SHARED_LIBRARIES += libbacktrace
endif
--
2.17.1
More information about the dri-devel
mailing list