3 files changed, 1 insertions, 18 deletions
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index d982756cc3..cb5ea79ff9 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -17,7 +17,6 @@ GrVkCaps::GrVkCaps(const GrContextOptions& contextOptions, const GrVkInterface*
     : INHERITED(contextOptions) {
     fCanUseGLSLForShaderModule = false;
     fMustDoCopiesFromOrigin = false;
-    fAllowInitializationErrorOnTearDown = false;
     fSupportsCopiesAsDraws = false;
     fMustSubmitCommandsBeforeCopyOp = false;
 
@@ -73,7 +72,6 @@ void GrVkCaps::init(const GrContextOptions& contextOptions, const GrVkInterface*
 
     if (kQualcomm_VkVendor == properties.vendorID) {
         fMustDoCopiesFromOrigin = true;
-        fAllowInitializationErrorOnTearDown = true;
     }
 
     if (kNvidia_VkVendor == properties.vendorID) {
diff --git a/src/gpu/vk/GrVkCaps.h b/src/gpu/vk/GrVkCaps.h
index a4ce35aa03..abc0dc9a1d 100644
--- a/src/gpu/vk/GrVkCaps.h
+++ b/src/gpu/vk/GrVkCaps.h
@@ -66,10 +66,6 @@ public:
         return fMustDoCopiesFromOrigin;
     }
 
-    bool allowInitializationErrorOnTearDown() const {
-        return fAllowInitializationErrorOnTearDown;
-    }
-
     bool supportsCopiesAsDraws() const {
         return fSupportsCopiesAsDraws;
     }
@@ -132,11 +128,6 @@ private:
     // copyImageToBuffer. This flag says that we must do the copy starting from the origin always.
     bool fMustDoCopiesFromOrigin;
 
-    // On Adreno, there is a bug where vkQueueWaitIdle will once in a while return
-    // VK_ERROR_INITIALIZATION_FAILED instead of the required VK_SUCCESS or VK_DEVICE_LOST. This
-    // flag says we will accept VK_ERROR_INITIALIZATION_FAILED as well.
-    bool fAllowInitializationErrorOnTearDown;
-
     // Check whether we support using draws for copies.
     bool fSupportsCopiesAsDraws;
 
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 7d75921c23..f7239d64ba 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -182,13 +182,7 @@ GrVkGpu::~GrVkGpu() {
 #endif
 
 #ifdef SK_DEBUG
-    if (this->vkCaps().allowInitializationErrorOnTearDown()) {
-        SkASSERT(VK_SUCCESS == res ||
-                 VK_ERROR_DEVICE_LOST == res ||
-                 VK_ERROR_INITIALIZATION_FAILED == res);
-    } else {
-        SkASSERT(VK_SUCCESS == res || VK_ERROR_DEVICE_LOST == res);
-    }
+    SkASSERT(VK_SUCCESS == res || VK_ERROR_DEVICE_LOST == res);
 #endif
 
     fCopyManager.destroyResources(this);