Merge "Add support for vulkan synchronization primitives" into nyc-dev
authorDavid Sodman <dsodman@google.com>
Thu, 17 Mar 2016 22:54:13 +0000 (22:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Mar 2016 22:54:13 +0000 (22:54 +0000)
1  2 
Android.mk
android/cts/master/com.drawelements.deqp.vk.xml
android/cts/master/vk-master.txt

diff --cc Android.mk
Simple merge
@@@ -80291,6 -80291,7 +80291,9 @@@ dEQP-VK.image.image_size.buffer.readonl
  dEQP-VK.wsi.android.surface.create
  dEQP-VK.wsi.android.surface.query_support
  dEQP-VK.wsi.android.surface.query_capabilities
 +dEQP-VK.wsi.android.surface.query_formats
 +dEQP-VK.wsi.android.surface.query_present_modes
  dEQP-VK.wsi.android.surface.initial_size
+ dEQP-VK.synchronization.fences
+ dEQP-VK.synchronization.semaphores
+ dEQP-VK.synchronization.events