commit a3a7a1d37bdfad56245b75edac49f8aceded321d
author Jesse Hall <jessehall@google.com> Tue Nov 24 11:37:23 2015 -0800
committer Jesse Hall <jessehall@google.com> Mon Jan 25 13:49:31 2016 -0800
tree 6a42898a865ee6c0702412e4cfd0919c589fd983
parent 6f39a6d1c6202b5d1bb0aa0dc9b2e130e5b73666

vulkan: Update from version 0.185.0 to 0.186.0

Change-Id: I6acb7742a1d4628930bc0807adfd222bc8349c43
(cherry picked from commit 9148de67a84540aa7d70ae72fbf587e26cbd0891)

vulkan/libvulkan/entry.cpp

diff --git a/vulkan/libvulkan/entry.cpp b/vulkan/libvulkan/entry.cpp
index c69b99f..255ad97 100644
--- a/vulkan/libvulkan/entry.cpp
+++ b/vulkan/libvulkan/entry.cpp
@@ -712,8 +712,8 @@
 }
 
 __attribute__((visibility("default")))
-void vkCmdWriteTimestamp(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer destBuffer, VkDeviceSize destOffset) {
-    GetVtbl(cmdBuffer).CmdWriteTimestamp(cmdBuffer, pipelineStage, destBuffer, destOffset);
+void vkCmdWriteTimestamp(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) {
+    GetVtbl(cmdBuffer).CmdWriteTimestamp(cmdBuffer, pipelineStage, queryPool, slot);
 }
 
 __attribute__((visibility("default")))

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 6813680..2922465 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -90,7 +90,7 @@
 }
 
 Surface* SurfaceFromHandle(VkSurfaceKHR handle) {
-    return reinterpret_cast<Surface*>(handle.handle);
+    return reinterpret_cast<Surface*>(handle);
 }
 
 struct Swapchain {
@@ -118,7 +118,7 @@
 }
 
 Swapchain* SwapchainFromHandle(VkSwapchainKHR handle) {
-    return reinterpret_cast<Swapchain*>(handle.handle);
+    return reinterpret_cast<Swapchain*>(handle);
 }
 
 }  // anonymous namespace