diff options
| author | Mauro Rossi <[email protected]> | 2016-09-13 01:15:16 +0200 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-09-13 10:06:04 +1000 |
| commit | 6b9d7e69ee7fd1162f7ac231a337630d859c493b (patch) | |
| tree | f23f576d19ee68b55414db79876149699a273252 /src/gallium | |
| parent | 0fe9152868fd7429aca63c58a0930542b8a95219 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/Android.mk | 9 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index 64760912697..eac31162456 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 1a9e5472c92..e35f6b13d30 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 24c4bfa4e36..a30bcf077e5 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 0a261567184..9030a83880d 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 |