Module: Mesa
Branch: master
Commit: 6b9d7e69ee7fd1162f7ac231a337630d859c493b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b9d7e69ee7fd1162f7ac231a337630d859c493b
Author: Mauro Rossi <issor.or...@gmail.com>
Date: Tue Sep 13 01:15:16 2016 +0200
android: add support for libmesa_amdgpu_addrlib
Android porting of the following commits:
f1f1ba3 "radeonsi: move sid.h/r600d_common.h to a common place."
69fca64 "amd/addrlib: move addrlib from amdgpu winsys to common code"
This patch fixes android building errors
Reviewed-by: Dave Airlie <airl...@redhat.com>
---
Android.mk | 1 +
src/amd/Android.addrlib.mk | 44 ++++++++++++++++++++++++++++++++
src/amd/Android.mk | 28 ++++++++++++++++++++
src/gallium/drivers/r600/Android.mk | 2 ++
src/gallium/drivers/radeonsi/Android.mk | 4 ++-
src/gallium/targets/dri/Android.mk | 2 +-
src/gallium/winsys/amdgpu/drm/Android.mk | 9 ++++---
7 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/Android.mk b/Android.mk
index dfc45c4..fb29105 100644
--- a/Android.mk
+++ b/Android.mk
@@ -95,6 +95,7 @@ SUBDIRS := \
src/mesa \
src/util \
src/egl \
+ src/amd \
src/intel \
src/mesa/drivers/dri
diff --git a/src/amd/Android.addrlib.mk b/src/amd/Android.addrlib.mk
new file mode 100644
index 0000000..d296ce0
--- /dev/null
+++ b/src/amd/Android.addrlib.mk
@@ -0,0 +1,44 @@
+# Copyright © 2016 Red Hat.
+# Copyright © 2016 Mauro Rossi <issor.or...@gmail.com>
+#
+# 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 (including the next
+# paragraph) 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.
+
+# ---------------------------------------
+# Build libmesa_amdgpu_addrlib
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_amdgpu_addrlib
+
+LOCAL_SRC_FILES := $(ADDRLIB_FILES)
+
+LOCAL_CFLAGS := -DBRAHMA_BUILD=1
+
+LOCAL_C_INCLUDES := \
+ $(MESA_TOP)/src \
+ $(MESA_TOP)/src/amd/common \
+ $(MESA_TOP)/src/amd/addrlib \
+ $(MESA_TOP)/src/amd/addrlib/core \
+ $(MESA_TOP)/src/amd/addrlib/inc/chip/r800 \
+ $(MESA_TOP)/src/amd/addrlib/r800/chip
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/amd/Android.mk b/src/amd/Android.mk
new file mode 100644
index 0000000..7b745fe
--- /dev/null
+++ b/src/amd/Android.mk
@@ -0,0 +1,28 @@
+# Copyright © 2016 Red Hat.
+# Copyright © 2016 Mauro Rossi <issor.or...@gmail.com>
+#
+# 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 (including the next
+# paragraph) 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.
+
+LOCAL_PATH := $(call my-dir)
+
+# Import variables
+include $(LOCAL_PATH)/Makefile.sources
+
+include $(LOCAL_PATH)/Android.addrlib.mk
diff --git a/src/gallium/drivers/r600/Android.mk
b/src/gallium/drivers/r600/Android.mk
index 6476091..eac3116 100644
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -30,6 +30,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
+LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common
+
LOCAL_SHARED_LIBRARIES := libdrm_radeon
LOCAL_MODULE := libmesa_pipe_r600
diff --git a/src/gallium/drivers/radeonsi/Android.mk
b/src/gallium/drivers/radeonsi/Android.mk
index 1a9e547..e35f6b1 100644
--- a/src/gallium/drivers/radeonsi/Android.mk
+++ b/src/gallium/drivers/radeonsi/Android.mk
@@ -30,6 +30,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(C_SOURCES)
+LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common
+
LOCAL_SHARED_LIBRARIES := libdrm_radeon
LOCAL_MODULE := libmesa_pipe_radeonsi
@@ -41,7 +43,7 @@ LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,
$(GENERATED_SOURCES))
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
-$(intermediates)/sid_tables.h: $(intermediates)/%.h: $(LOCAL_PATH)/%.py
$(LOCAL_PATH)/sid.h
+$(intermediates)/sid_tables.h: $(intermediates)/%.h: $(LOCAL_PATH)/%.py
$(MESA_TOP)/src/amd/common/sid.h
$(transform-generated-source)
include $(GALLIUM_COMMON_MK)
diff --git a/src/gallium/targets/dri/Android.mk
b/src/gallium/targets/dri/Android.mk
index 24c4bfa..a30bcf0 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -77,7 +77,7 @@ gallium_DRIVERS += libmesa_pipe_radeonsi libmesa_winsys_amdgpu
LOCAL_SHARED_LIBRARIES += libLLVM libdrm_amdgpu
LOCAL_CFLAGS += -DGALLIUM_RADEONSI
endif
-gallium_DRIVERS += libmesa_winsys_radeon libmesa_pipe_radeon
+gallium_DRIVERS += libmesa_winsys_radeon libmesa_pipe_radeon
libmesa_amdgpu_addrlib
LOCAL_SHARED_LIBRARIES += libdrm_radeon
endif
ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),)
diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk
b/src/gallium/winsys/amdgpu/drm/Android.mk
index 0a26156..9030a83 100644
--- a/src/gallium/winsys/amdgpu/drm/Android.mk
+++ b/src/gallium/winsys/amdgpu/drm/Android.mk
@@ -35,10 +35,11 @@ LOCAL_CFLAGS := \
-DBRAHMA_BUILD=1
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/addrlib \
- $(LOCAL_PATH)/addrlib/core \
- $(LOCAL_PATH)/addrlib/inc/chip/r800 \
- $(LOCAL_PATH)/addrlib/r800/chip
+ $(MESA_TOP)/src \
+ $(MESA_TOP)/src/amd \
+ $(MESA_TOP)/src/amd/addrlib/core \
+ $(MESA_TOP)/src/amd/addrlib/inc/chip/r800 \
+ $(MESA_TOP)/src/amd/addrlib/r800/chip
LOCAL_SHARED_LIBRARIES := libdrm_amdgpu
LOCAL_MODULE := libmesa_winsys_amdgpu
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
