Vulkan: prevent volk reloading on null instance and devices

Bug: angleproject:4419 Change-Id: I82f9bb157e88754efd074358dccef1bb82cab0f7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2068902Reviewed-by: Tobin Ehlis <tobine@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Vulkan: prevent volk reloading on null instance and devices
46cb0f62 · Brandon Schade · Commit Bot · 14a2983f · 46cb0f62
Commit 46cb0f62 authored Feb 21, 2020 by Brandon Schade Committed by Commit Bot Feb 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +2 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -2048,12 +2048,12 @@ void RendererVk::onCompletedSerial(Serial serial)

 void RendererVk::reloadVolkIfNeeded() const
 {
-    if (volkGetLoadedInstance() != mInstance)
+    if ((mInstance != VK_NULL_HANDLE) && (volkGetLoadedInstance() != mInstance))
    {
        volkLoadInstance(mInstance);
    }

-    if (volkGetLoadedDevice() != mDevice)
+    if ((mDevice != VK_NULL_HANDLE) && (volkGetLoadedDevice() != mDevice))
    {
        volkLoadDevice(mDevice);
    }