summaryrefslogtreecommitdiff
path: root/chromium/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-29 11:52:36 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-29 11:52:36 +0100
commitc1ffb5f937251798307c1834cca3d79266000c06 (patch)
tree65517eab882e238de91a4e7827fda9ab2666ca1c /chromium/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp
parentd878f684916cef110d8e4474eac3658e47f63e9e (diff)
parent45f9ded08bb7526984b24ccb5a5327aaf6821676 (diff)
downloadqtwebengine-chromium-c1ffb5f937251798307c1834cca3d79266000c06.tar.gz
Merge branch 'upstream-master' into 106-based
Change-Id: I772959dc154151e6eaf38cdeaf586c3acf1e90e8
Diffstat (limited to 'chromium/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp')
-rw-r--r--chromium/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp
index 9f475e6633d..6ef5f7225ba 100644
--- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp
+++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp
@@ -303,6 +303,13 @@ angle::Result QueryVk::begin(const gl::Context *context)
{
ContextVk *contextVk = vk::GetImpl(context);
+ // Ensure that we start with the right RenderPass when we begin a new query.
+ if (contextVk->getState().isDrawFramebufferBindingDirty())
+ {
+ ANGLE_TRY(contextVk->flushCommandsAndEndRenderPass(
+ RenderPassClosureReason::FramebufferBindingChange));
+ }
+
mCachedResultValid = false;
// Transform feedback query is handled by a CPU-calculated value when emulated.