diff options
author | 2016-10-31 16:34:42 -0400 | |
---|---|---|
committer | 2016-10-31 22:49:07 +0000 | |
commit | 8a8668b4721097de657ad8b30d45f60f62433c6f (patch) | |
tree | 77bb4033cb295a8faafa61db27594a4990a45b56 /src | |
parent | 3c1b7db2432d136df0fc50c2e3ee0b3792b01dd6 (diff) |
Remove check of INITIALIZATION_FAILED in qcomm vulkan runs
This was another workaround for a flaky bug that happened on Adreno devices.
With all the devices updated to newer drivers I want to see if it still
happens. I haven't been able to repo the original bug locally with multiple
runs, so I think it is time to step it up to the bots.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4212
Change-Id: Idc260785096b054cf0fb30ce9ff0d97178c10ed6
Reviewed-on: https://skia-review.googlesource.com/4212
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/vk/GrVkCaps.cpp | 2 | ||||
-rw-r--r-- | src/gpu/vk/GrVkCaps.h | 9 | ||||
-rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 8 |
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); |