diff options
| author | Mauro Rossi <[email protected]> | 2020-02-22 16:20:10 +0100 |
|---|---|---|
| committer | Mauro Rossi <[email protected]> | 2020-03-04 22:25:36 +0100 |
| commit | 88c68c0ac7618c56ba17755ea6b93827437dd46a (patch) | |
| tree | 19b7ffe439acc5ba82e202f0744f5da38be5096d | |
| parent | 01778d1e3cc675e6c7627e5b7ef7acd5ad290bfb (diff) | |
android: r600/sfn: fix includes and libmesa_nir dependency
Fixes the following building errors:
In file included from external/mesa/src/gallium/drivers/r600/sfn/sfn_debug.cpp:28:
In file included from external/mesa/src/gallium/drivers/r600/sfn/sfn_debug.h:34:
In file included from external/mesa/src/compiler/nir/nir.h:41:
In file included from external/mesa/src/compiler/nir_types.h:36:
external/mesa/src/compiler/glsl_types.h:38:10: fatal error: 'main/config.h' file not found
#include "main/config.h"
^~~~~~~~~~~~~~~
1 error generated.
In file included from external/mesa/src/gallium/drivers/r600/sfn/sfn_debug.cpp:28:
In file included from external/mesa/src/gallium/drivers/r600/sfn/sfn_debug.h:34:
external/mesa/src/compiler/nir/nir.h:50:10: fatal error: 'nir_opcodes.h' file not found
#include "nir_opcodes.h"
^~~~~~~~~~~~~~~
1 error generated.
Fixes: f718ac62 ("r600/sfn: Add a basic nir shader backend")
Signed-off-by: Mauro Rossi <[email protected]>
Reviewed-by: Gert Wollny <[email protected]>
| -rw-r--r-- | src/gallium/drivers/r600/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index 19a3ba8209f..296aa3ac9b9 100644 --- a/src/gallium/drivers/r600/Android.mk +++ b/src/gallium/drivers/r600/Android.mk @@ -32,8 +32,10 @@ LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES) LOCAL_C_INCLUDES += \ $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/amd/llvm + $(MESA_TOP)/src/amd/llvm \ + $(MESA_TOP)/src/mesa +LOCAL_STATIC_LIBRARIES := libmesa_nir LOCAL_SHARED_LIBRARIES := libdrm_radeon LOCAL_MODULE := libmesa_pipe_r600 |