Skip to content

A
angle
Commit 572afd90 by Kenneth Russell Committed by Commit Bot
Options

Disable SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS workaround.

It causes incorrect compilation of some shaders. The original graphics driver bugs that motivated enabling it have been fixed, at least on one of the platforms (macOS). Tested with new WebGL conformance test in https://github.com/KhronosGroup/WebGL/pull/3214 . Bug: chromium:1165751 Change-Id: Iee9747769ca918aab143592d6cf158ce02a75ee0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2661024 Commit-Queue: Kenneth Russell <kbr@chromium.org> Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 4a426e1f
Showing with 4 additions and 2 deletions
include/platform/FrontendFeatures.h
...@@ -48,7 +48,7 @@ struct FrontendFeatures : angle::FeatureSetBase ...@@ -48,7 +48,7 @@ struct FrontendFeatures : angle::FeatureSetBase
angle::Feature scalarizeVecAndMatConstructorArgs = { angle::Feature scalarizeVecAndMatConstructorArgs = {
"scalarize_vec_and_mat_constructor_args", angle::FeatureCategory::FrontendWorkarounds, "scalarize_vec_and_mat_constructor_args", angle::FeatureCategory::FrontendWorkarounds,
"Always rewrite vec/mat constructors to be consistent", &members, "Always rewrite vec/mat constructors to be consistent", &members,
"http://crbug.com/398694"}; "http://crbug.com/1165751"};
// Disable support for GL_OES_get_program_binary // Disable support for GL_OES_get_program_binary
angle::Feature disableProgramBinary = { angle::Feature disableProgramBinary = {
......
src/libANGLE/Display.cpp
...@@ -1826,9 +1826,11 @@ void Display::initializeFrontendFeatures() ...@@ -1826,9 +1826,11 @@ void Display::initializeFrontendFeatures()
{ {
// Enable on all Impls // Enable on all Impls
ANGLE_FEATURE_CONDITION((&mFrontendFeatures), loseContextOnOutOfMemory, true); ANGLE_FEATURE_CONDITION((&mFrontendFeatures), loseContextOnOutOfMemory, true);
ANGLE_FEATURE_CONDITION((&mFrontendFeatures), scalarizeVecAndMatConstructorArgs, true);
ANGLE_FEATURE_CONDITION((&mFrontendFeatures), allowCompressedFormats, true); ANGLE_FEATURE_CONDITION((&mFrontendFeatures), allowCompressedFormats, true);
// No longer enable this on any Impl - crbug.com/1165751
ANGLE_FEATURE_CONDITION((&mFrontendFeatures), scalarizeVecAndMatConstructorArgs, false);
mImplementation->initializeFrontendFeatures(&mFrontendFeatures); mImplementation->initializeFrontendFeatures(&mFrontendFeatures);
rx::ApplyFeatureOverrides(&mFrontendFeatures, mState); rx::ApplyFeatureOverrides(&mFrontendFeatures, mState);
......
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