aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYimin Li <ymli@google.com>2022-10-21 20:58:01 -0700
committerYimin Li <ymli@google.com>2022-10-21 20:58:01 -0700
commit638bf002bc3ae71bacfc58de4070c1e269a41e9a (patch)
tree426e25619595c8f9691c48ac5b3a3dd049ec80db
parent814e03dabb67e1b5d41b2113d2d34b820d4df9f4 (diff)
parent4bf6c177d18276f18982cb763350330a7c3a765f (diff)
downloadangle-638bf002bc3ae71bacfc58de4070c1e269a41e9a.tar.gz
Merge commit '4bf6c177d18276f18982cb763350330a7c3a765f' of sso://googleplex-android/platform/external/angle into HEAD
Change-Id: I6c8691518ad4cb77dff2e0cbfbdbe05c2f6423b7
-rw-r--r--src/libANGLE/renderer/vulkan/RendererVk.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index 5ca545e07a..db519f072b 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -3089,8 +3089,9 @@ void RendererVk::initFeatures(DisplayVk *displayVk,
ANGLE_FEATURE_CONDITION(&mFeatures, bindEmptyForUnusedDescriptorSets,
IsAndroid() && isQualcomm);
- ANGLE_FEATURE_CONDITION(&mFeatures, perFrameWindowSizeQuery,
- isIntel || (IsWindows() && isAMD) || IsFuchsia() || isSamsung);
+ ANGLE_FEATURE_CONDITION(
+ &mFeatures, perFrameWindowSizeQuery,
+ IsAndroid() || isIntel || (IsWindows() && isAMD) || IsFuchsia() || isSamsung);
// Disabled on AMD/windows due to buggy behavior.
ANGLE_FEATURE_CONDITION(&mFeatures, disallowSeamfulCubeMapEmulation, IsWindows() && isAMD);