Mesa (staging/18.2): radv: Fix missing Android platform define.

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: bbd95de921b443b6c63cbe1ff7d246c7428d9b6e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bbd95de921b443b6c63cbe1ff7d246c7428d9b6e

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Fri Aug 10 02:26:19 2018 +0200

radv: Fix missing Android platform define.

CC: <mesa-stable at lists.freedesktop.org>
Acked-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
(cherry picked from commit bf33ca751252e9735418e33bacd257a8b431b102)

---

 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 cee3744f40..51b03561fa 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 e7ccc58a28..e28f032cbe 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)