Quoting Bas Nieuwenhuizen (2018-08-15 09:34:41) > On Wed, Aug 15, 2018 at 6:08 PM, Dylan Baker <dy...@pnwbakers.com> wrote: > > Quoting Bas Nieuwenhuizen (2018-08-09 17:27:46) > >> CC: <mesa-sta...@lists.freedesktop.org> > >> --- > >> src/amd/vulkan/Android.mk | 2 ++ > >> src/amd/vulkan/Makefile.am | 2 +- > >> 2 files changed, 3 insertions(+), 1 deletion(-) > >> > >> diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk > >> index cee3744f40b..51b03561fa7 100644 > >> --- a/src/amd/vulkan/Android.mk > >> +++ b/src/amd/vulkan/Android.mk > >> @@ -62,6 +62,7 @@ LOCAL_SRC_FILES := \ > >> $(VULKAN_FILES) > >> > >> LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare > >> LLVMInitializeAMDGPU* functions > >> +LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR > >> > >> $(call mesa-build-with-llvm) > >> > >> @@ -140,6 +141,7 @@ LOCAL_SRC_FILES := \ > >> $(VULKAN_ANDROID_FILES) > >> > >> LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare > >> LLVMInitializeAMDGPU* functions > >> +LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR > >> > >> $(call mesa-build-with-llvm) > >> > >> diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am > >> index e7ccc58a28e..e28f032cbee 100644 > >> --- a/src/amd/vulkan/Makefile.am > >> +++ b/src/amd/vulkan/Makefile.am > >> @@ -124,7 +124,7 @@ VULKAN_LIB_DEPS += \ > >> endif > >> > >> if HAVE_PLATFORM_ANDROID > >> -AM_CPPFLAGS += $(ANDROID_CPPFLAGS) > >> +AM_CPPFLAGS += $(ANDROID_CPPFLAGS) -DVK_USE_PLATFORM_ANDROID_KHR > >> AM_CFLAGS += $(ANDROID_CFLAGS) > >> VULKAN_LIB_DEPS += $(ANDROID_LIBS) > >> VULKAN_SOURCES += $(VULKAN_ANDROID_FILES) > >> -- > >> 2.18.0 > >> > > > > Hi Bas, > > > > I went ahead and pulled this into the staging/18.1 branch, we don't have > > android.mk support for radv in 18.1, so I only pulled in the autotools part. > > Please let me know if you're happy with that or not. > > That works for me, thanks! > > > > > Dylan
Cool, thanks!
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
