AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove check of INITIALIZATION_FAILED in qcomm vulkan runs

Browse Source 
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>
This commit is contained in:
Greg Daniel 2016-10-31 16:34:42 -04:00 committed by Skia Commit-Bot
parent 3c1b7db243
commit 8a8668b472
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/vk/GrVkCaps.cpp
View File

@ -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) {

9
src/gpu/vk/GrVkCaps.h
View File

@ -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;

8
src/gpu/vk/GrVkGpu.cpp
View File

@ -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);