Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 51ab694

Browse files
bsalomonSkia Commit-Bot
authored andcommitted
Remove RGB8 Mali-400 workaround
Cq-Include-Trybots: luci.skia.skia.primary:Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android Bug: chromium:1150368 Change-Id: I0d66fd16edade9bad33603e73c3708c33662e673 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341723 Commit-Queue: Brian Salomon <[email protected]> Commit-Queue: Greg Daniel <[email protected]> Auto-Submit: Brian Salomon <[email protected]> Reviewed-by: Greg Daniel <[email protected]>
1 parent 8b5f3ac commit 51ab694

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

src/gpu/gl/GrGLCaps.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2345,9 +2345,6 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
23452345
info.fInternalFormatForTexImageOrStorage =
23462346
texImageSupportsSizedInternalFormat ? GR_GL_RGB8 : GR_GL_RGB;
23472347
}
2348-
if (formatWorkarounds.fDisableRGB8ForMali400) {
2349-
info.fFlags = 0;
2350-
}
23512348

23522349
info.fColorTypeInfoCount = 1;
23532350
info.fColorTypeInfos = std::make_unique<ColorTypeInfo[]>(info.fColorTypeInfoCount);
@@ -3991,9 +3988,6 @@ void GrGLCaps::applyDriverCorrectnessWorkarounds(const GrGLContextInfo& ctxInfo,
39913988
kIntel_GrGLDriver == ctxInfo.driver() && GR_IS_GR_GL_ES(ctxInfo.standard());
39923989
#endif
39933990

3994-
// Mali-400 fails ReadPixels tests, mostly with non-0xFF alpha values when read as GL_RGBA8.
3995-
formatWorkarounds->fDisableRGB8ForMali400 = kMali4xx_GrGLRenderer == ctxInfo.renderer();
3996-
39973991
// On the Intel Iris 6100, interacting with LUM16F seems to confuse the driver. After
39983992
// writing to/reading from a LUM16F texture reads from/writes to other formats behave
39993993
// erratically.

src/gpu/gl/GrGLCaps.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ class GrGLCaps : public GrCaps {
483483
bool fDisableSRGBRenderWithMSAAForMacAMD = false;
484484
bool fDisableRGBA16FTexStorageForCrBug1008003 = false;
485485
bool fDisableBGRATextureStorageForIntelWindowsES = false;
486-
bool fDisableRGB8ForMali400 = false;
487486
bool fDisableLuminance16F = false;
488487
bool fDontDisableTexStorageOnAndroid = false;
489488
bool fDisallowDirectRG8ReadPixels = false;

0 commit comments

Comments
 (0)