commit 53abcf15956bd8d30051a96ec7e148edb7ba5739
author Mohan Maiya <m.maiya@samsung.com> Tue Oct 25 22:26:44 2022
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Oct 26 02:07:06 2022
tree b51a8225e51c594386b5547c2656d1b4173e14fb
parent 81a244de0a1cfc76e1f47ed00812d5f61313be0b

Vulkan: Bug fix in supportsTimestampSurfaceAttribute

Move the initialization of "vkGetPastPresentationTimingGOOGLE"
and the assert check to after vkDevice creation.

Bug: angleproject:7489
Change-Id: I1ef50d64af3bea44a182be95dd182532b2c60d36
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3979994
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

src/libANGLE/renderer/vulkan/RendererVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index feaaeb8..572e603 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -2548,10 +2548,6 @@
     if (getFeatures().supportsTimestampSurfaceAttribute.enabled)
     {
         mEnabledDeviceExtensions.push_back(VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME);
-#if !defined(ANGLE_SHARED_LIBVULKAN)
-        InitGetPastPresentationTimingGoogleFunction(mDevice);
-#endif  // !defined(ANGLE_SHARED_LIBVULKAN)
-        ASSERT(vkGetPastPresentationTimingGOOGLE);
     }
 
     std::sort(mEnabledDeviceExtensions.begin(), mEnabledDeviceExtensions.end(), StrLess);
@@ -2989,6 +2985,11 @@
                        InitFragmentShadingRateKHRDeviceFunction(mDevice);
                        ASSERT(vkCmdSetFragmentShadingRateKHR);
     }
+    if (getFeatures().supportsTimestampSurfaceAttribute.enabled)
+    {
+                       InitGetPastPresentationTimingGoogleFunction(mDevice);
+                       ASSERT(vkGetPastPresentationTimingGOOGLE);
+    }
 #endif  // !defined(ANGLE_SHARED_LIBVULKAN)
 
     if (getFeatures().forceMaxUniformBufferSize16KB.enabled)