commit 2778029563f218ab744adfae263fe81c8638f8f1
author Yuly Novikov <ynovikov@chromium.org> Fri Nov 09 11:19:49 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Nov 13 17:09:42 2018 +0000
tree bcd48aae478771a6948b413b2f7a9f745869ebaa
parent 0864a7ac638c80d3af2010a3976ff4cff1d4a79a

Vulkan: refactor WrappedObject descendants

Methods receive VkDevice instead of Context
and return VkResult instead of angle::Result now.

Bug: angleproject:2657
Change-Id: I3eca8692ad0b3b6e96e31fd433ed14e04384990e
Reviewed-on: https://chromium-review.googlesource.com/c/1330105
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

src/libANGLE/renderer/vulkan/QueryVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/QueryVk.cpp b/src/libANGLE/renderer/vulkan/QueryVk.cpp
index 6535e58..b710851 100644
--- a/src/libANGLE/renderer/vulkan/QueryVk.cpp
+++ b/src/libANGLE/renderer/vulkan/QueryVk.cpp
@@ -135,18 +135,17 @@
 
     VkQueryResultFlags flags = (wait ? VK_QUERY_RESULT_WAIT_BIT : 0) | VK_QUERY_RESULT_64_BIT;
 
-    angle::Result result = mQueryHelper.getQueryPool()->getResults(
-        contextVk, mQueryHelper.getQuery(), 1, sizeof(mCachedResult), &mCachedResult,
+    VkResult result = mQueryHelper.getQueryPool()->getResults(
+        contextVk->getDevice(), mQueryHelper.getQuery(), 1, sizeof(mCachedResult), &mCachedResult,
         sizeof(mCachedResult), flags);
-    ANGLE_TRY(result);
-
     // If the results are not ready, do nothing.  mCachedResultValid remains false.
-    if (result == angle::Result::Incomplete())
+    if (result == VK_NOT_READY)
     {
-        // If VK_QUERY_RESULT_WAIT_BIT was given, Incomplete() cannot have been returned.
+        // If VK_QUERY_RESULT_WAIT_BIT was given, VK_NOT_READY cannot have been returned.
         ASSERT(!wait);
         return angle::Result::Continue();
     }
+    ANGLE_VK_TRY(contextVk, result);
 
     // Fix up the results to what OpenGL expects.
     switch (getType())
@@ -163,13 +162,12 @@
             uint64_t timeElapsedEnd = mCachedResult;
 
             result = mQueryHelperTimeElapsedBegin.getQueryPool()->getResults(
-                contextVk, mQueryHelperTimeElapsedBegin.getQuery(), 1, sizeof(mCachedResult),
-                &mCachedResult, sizeof(mCachedResult), flags);
-            ANGLE_TRY(result);
-
+                contextVk->getDevice(), mQueryHelperTimeElapsedBegin.getQuery(), 1,
+                sizeof(mCachedResult), &mCachedResult, sizeof(mCachedResult), flags);
             // Since the result of the end query of time-elapsed is already available, the
             // result of begin query must be available too.
-            ASSERT(result != angle::Result::Incomplete());
+            ASSERT(result != VK_NOT_READY);
+            ANGLE_VK_TRY(contextVk, result);
 
             mCachedResult = timeElapsedEnd - mCachedResult;
             break;