Mesa (staging/18.1): anv/android: Fix Autotools build for VK_ANDROID_native_buffer

2018-07-13 Thread GitLab Mirror
Module: Mesa
Branch: staging/18.1
Commit: f7cee0a50e9c62165e2b56178590a7ae321c5158
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7cee0a50e9c62165e2b56178590a7ae321c5158

Author: Chad Versace 
Date:   Wed Jun 27 19:40:44 2018 -0700

anv/android: Fix Autotools build for VK_ANDROID_native_buffer

Changes to vk.xml and anv_entrypoints_gen.py broke the Autotools build
on Android. The changes undef'd the VK_ANDROID_native_buffer entrypoints
in anv_entrypoints.h.

Fix it with CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR.

CC: 
See-Also: 63525ba7 "android: enable VK_ANDROID_native_buffer"
Reviewed-by: Tapani Pälli 
(cherry picked from commit 8e403bc959dee007cad58742147fa118202ccb03)

---

 src/intel/Makefile.vulkan.am | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 4125cb205a..9ff1aa5842 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -164,7 +164,10 @@ VULKAN_LIB_DEPS = \
-lm
 
 if HAVE_PLATFORM_ANDROID
-VULKAN_CPPFLAGS += $(ANDROID_CPPFLAGS)
+VULKAN_CPPFLAGS += \
+$(ANDROID_CPPFLAGS) \
+-DVK_USE_PLATFORM_ANDROID_KHR
+
 VULKAN_CFLAGS += $(ANDROID_CFLAGS)
 VULKAN_LIB_DEPS += $(ANDROID_LIBS)
 VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (staging/18.1): anv/android: Fix Autotools build for VK_ANDROID_native_buffer

2018-07-12 Thread GitLab Mirror
Module: Mesa
Branch: staging/18.1
Commit: ac2236f4d38f22c3d90f35e093c70c5f3244cf63
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac2236f4d38f22c3d90f35e093c70c5f3244cf63

Author: Chad Versace 
Date:   Wed Jun 27 19:40:44 2018 -0700

anv/android: Fix Autotools build for VK_ANDROID_native_buffer

Changes to vk.xml and anv_entrypoints_gen.py broke the Autotools build
on Android. The changes undef'd the VK_ANDROID_native_buffer entrypoints
in anv_entrypoints.h.

Fix it with CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR.

CC: 
See-Also: 63525ba7 "android: enable VK_ANDROID_native_buffer"
Reviewed-by: Tapani Pälli 
(cherry picked from commit 8e403bc959dee007cad58742147fa118202ccb03)

---

 src/intel/Makefile.vulkan.am | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 4125cb205a..9ff1aa5842 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -164,7 +164,10 @@ VULKAN_LIB_DEPS = \
-lm
 
 if HAVE_PLATFORM_ANDROID
-VULKAN_CPPFLAGS += $(ANDROID_CPPFLAGS)
+VULKAN_CPPFLAGS += \
+$(ANDROID_CPPFLAGS) \
+-DVK_USE_PLATFORM_ANDROID_KHR
+
 VULKAN_CFLAGS += $(ANDROID_CFLAGS)
 VULKAN_LIB_DEPS += $(ANDROID_LIBS)
 VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit