This is the v2 series of patches for Android. Tested OK with Android-x86 lollipop-x86 branch. Summary of the changes:
* Use C++11 compliant unordered_set to fix nouveau driver with Android stlport and libcxx (lollipop). * Add gallium_dri.so for Android. This fixes gallium support since 5564c36. * Enable radeonsi driver for Android. * Miscellaneous fixes. Chih-Wei Huang (15): android: loader: export the path to be included android: export more dirs from libmesa_dri_common android: add rules to build gallium/state_trackers/dri android: add rules to build gallium_dri.so android: enable the rules to build gallium st/dri android: try to load gallium_dri.so directly android: clean up the makefile of libGLES_mesa egl/main: let EGL_RECORDABLE_ANDROID be a valid attrib android: generate files by $(call es-gen) android: enable the radeonsi driver android: avoid building errors with stlport nv50/ir: optimize the use of std::tr1::unordered_set nv50/ir: use C++11 compliant unordered_set if possible android: nv50/ir: make the code be compatible with stlport android: build with libcxx of android lollipop Android.common.mk | 10 ++ Android.mk | 8 +- CleanSpec.mk | 1 + src/egl/drivers/dri2/Android.mk | 1 - src/egl/drivers/dri2/egl_dri2.c | 4 + src/egl/main/Android.mk | 83 +------------- src/egl/main/eglconfig.h | 2 + src/gallium/Android.common.mk | 8 ++ src/gallium/Android.mk | 10 +- src/gallium/auxiliary/Android.mk | 6 + src/gallium/drivers/nouveau/Android.mk | 4 + src/gallium/drivers/nouveau/codegen/nv50_ir.h | 37 ++++++- .../nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 4 +- .../nouveau/codegen/nv50_ir_lowering_nvc0.h | 4 +- src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 5 +- src/gallium/drivers/r600/Android.mk | 4 + src/gallium/drivers/radeon/Android.mk | 4 + src/gallium/state_trackers/dri/Android.mk | 64 +++++++++++ src/gallium/targets/dri/Android.mk | 123 +++++++++++++++++++++ src/gallium/winsys/sw/dri/Android.mk | 35 ++++++ src/gallium/winsys/sw/kms-dri/Android.mk | 37 +++++++ src/glsl/Android.mk | 1 - src/loader/Android.mk | 2 + src/mesa/Android.gen.mk | 16 ++- src/mesa/drivers/dri/common/Android.mk | 4 +- src/util/list.h | 2 + 26 files changed, 373 insertions(+), 106 deletions(-) create mode 100644 src/gallium/state_trackers/dri/Android.mk create mode 100644 src/gallium/targets/dri/Android.mk create mode 100644 src/gallium/winsys/sw/dri/Android.mk create mode 100644 src/gallium/winsys/sw/kms-dri/Android.mk -- 1.9.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev