Revert "Revert "Expand partial render target write pixels workaround.""
New version limits the workaround to unorm configs.
This reverts commit fdd117025fb846771e9e47cbf825d9071745fa98.
Change-Id: I47a08a0ea4cf1acd88ca3c1bf9922cf0a8d215cc
Reviewed-on: https://skia-review.googlesource.com/19490
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 8287580..d52b73b 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -57,6 +57,8 @@
fClearTextureSupport = false;
fDrawArraysBaseVertexIsBroken = false;
fUseDrawToClearStencilClip = false;
+ fDisallowTexSubImageForUnormConfigTexturesEverBoundToFBO = false;
+ fUseDrawInsteadOfAllRenderTargetWrites = false;
fRequiresCullFaceEnableDisableWhenDrawingLinesAfterNonLines = false;
fBlitFramebufferFlags = kNoSupport_BlitFramebufferFlag;
@@ -523,12 +525,12 @@
}
if (kAdreno4xx_GrGLRenderer == ctxInfo.renderer()) {
- fUseDrawInsteadOfPartialRenderTargetWrite = true;
// This is known to be fixed sometime between driver 145.0 and 219.0
if (ctxInfo.driver() == kQualcomm_GrGLDriver &&
ctxInfo.driverVersion() <= GR_GL_DRIVER_VER(219, 0)) {
fUseDrawToClearStencilClip = true;
}
+ fDisallowTexSubImageForUnormConfigTexturesEverBoundToFBO = true;
}
// This was reproduced on the following configurations:
@@ -546,7 +548,7 @@
// Texture uploads sometimes seem to be ignored to textures bound to FBOS on Tegra3.
if (kTegra3_GrGLRenderer == ctxInfo.renderer()) {
- fUseDrawInsteadOfPartialRenderTargetWrite = true;
+ fDisallowTexSubImageForUnormConfigTexturesEverBoundToFBO = true;
fUseDrawInsteadOfAllRenderTargetWrites = true;
}
@@ -1298,6 +1300,10 @@
r.appendf("Texture swizzle support: %s\n", (fTextureSwizzleSupport ? "YES" : "NO"));
r.appendf("BGRA to RGBA readback conversions are slow: %s\n",
(fRGBAToBGRAReadbackConversionsAreSlow ? "YES" : "NO"));
+ r.appendf("Intermediate texture for partial updates of unorm textures ever bound to FBOs: %s\n",
+ fDisallowTexSubImageForUnormConfigTexturesEverBoundToFBO ? "YES" : "NO");
+ r.appendf("Intermediate texture for all updates of textures bound to FBOs: %s\n",
+ fUseDrawInsteadOfAllRenderTargetWrites ? "YES" : "NO");
r.append("Configs\n-------\n");
for (int i = 0; i < kGrPixelConfigCnt; ++i) {
@@ -2217,4 +2223,7 @@
fAvoidInstancedDrawsToFPTargets = true;
#endif
}
+ if (options.fUseDrawInsteadOfPartialRenderTargetWrite) {
+ fUseDrawInsteadOfAllRenderTargetWrites = true;
+ }
}