Commit ebdd8abb by Alexey Knyazev Committed by Commit Bot

OpenGL: Remove avoidDXT1sRGBTextureFormat workaround

Bug: angleproject:5543 Change-Id: I2a7e2d563aa60e6e53dd6b6c32fbc449368e4e06 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2627425Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Commit-Queue: Alexey Knyazev <lexa.knyazev@gmail.com>
parent 738cb55b
...@@ -693,15 +693,6 @@ static GLenum GetNativeCompressedFormat(const FunctionsGL *functions, ...@@ -693,15 +693,6 @@ static GLenum GetNativeCompressedFormat(const FunctionsGL *functions,
} }
} }
if (features.avoidDXT1sRGBTextureFormat.enabled)
{
if (format == GL_COMPRESSED_SRGB_S3TC_DXT1_EXT)
{
// Pass GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT instead to workaround driver bug.
result = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
}
}
return result; return result;
} }
......
...@@ -1816,9 +1816,6 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature ...@@ -1816,9 +1816,6 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
// TODO(anglebug.com/2273): diagnose crashes with this workaround. // TODO(anglebug.com/2273): diagnose crashes with this workaround.
false); false);
// Workaround for incorrect sampling from DXT1 sRGB textures in Intel OpenGL on Windows.
ANGLE_FEATURE_CONDITION(features, avoidDXT1sRGBTextureFormat, IsWindows() && isIntel);
ANGLE_FEATURE_CONDITION(features, disableDrawBuffersIndexed, IsWindows() && isAMD); ANGLE_FEATURE_CONDITION(features, disableDrawBuffersIndexed, IsWindows() && isAMD);
ANGLE_FEATURE_CONDITION( ANGLE_FEATURE_CONDITION(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment