Changeset 246393 in webkit


Ignore:
Timestamp:
Jun 12, 2019 10:10:11 PM (5 years ago)
Author:
Justin Fan
Message:

[WebGL] ANGLE Extension directive location incorrectly enforced for webgl 1.0
https://bugs.webkit.org/show_bug.cgi?id=198811

Reviewed by Dean Jackson.

Source/ThirdParty/ANGLE:

Apply ANGLE change from https://chromium-review.googlesource.com/c/angle/angle/+/1648661 to
prevent enforcing ESSL late extension rule on WebGL 1.0 shaders.

  • src/compiler/preprocessor/DiagnosticsBase.cpp:

(angle::pp::Diagnostics::message):

  • src/compiler/preprocessor/DiagnosticsBase.h:
  • src/compiler/preprocessor/DirectiveParser.cpp:

(angle::pp::DirectiveParser::parseExtension):

LayoutTests:

ANGLE was updated so that this case should not be an error.

  • webgl/webgl-extension-directive-location-no-error-expected.txt: Added.
  • webgl/webgl-extension-directive-location-no-error.html: Added.
Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r246391 r246393  
     12019-06-12  Justin Fan  <justin_fan@apple.com>
     2
     3        [WebGL] ANGLE Extension directive location incorrectly enforced for webgl 1.0
     4        https://bugs.webkit.org/show_bug.cgi?id=198811
     5
     6        Reviewed by Dean Jackson.
     7
     8        ANGLE was updated so that this case should not be an error.
     9
     10        * webgl/webgl-extension-directive-location-no-error-expected.txt: Added.
     11        * webgl/webgl-extension-directive-location-no-error.html: Added.
     12
    1132019-06-12  Carlos Garcia Campos  <cgarcia@igalia.com>
    214
  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r245723 r246393  
     12019-06-12  Justin Fan  <justin_fan@apple.com>
     2
     3        [WebGL] ANGLE Extension directive location incorrectly enforced for webgl 1.0
     4        https://bugs.webkit.org/show_bug.cgi?id=198811
     5
     6        Reviewed by Dean Jackson.
     7
     8        Apply ANGLE change from https://chromium-review.googlesource.com/c/angle/angle/+/1648661 to
     9        prevent enforcing ESSL late extension rule on WebGL 1.0 shaders.
     10
     11        * src/compiler/preprocessor/DiagnosticsBase.cpp:
     12        (angle::pp::Diagnostics::message):
     13        * src/compiler/preprocessor/DiagnosticsBase.h:
     14        * src/compiler/preprocessor/DirectiveParser.cpp:
     15        (angle::pp::DirectiveParser::parseExtension):
     16
    1172019-05-23  Don Olmstead  <don.olmstead@sony.com>
    218
  • trunk/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp

    r245088 r246393  
    116116        case PP_INVALID_LINE_DIRECTIVE:
    117117            return "invalid line directive";
     118        case PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1:
     119            return "extension directive must occur before any non-preprocessor tokens in ESSL1";
    118120        case PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL3:
    119121            return "extension directive must occur before any non-preprocessor tokens in ESSL3";
     
    130132        case PP_UNRECOGNIZED_PRAGMA:
    131133            return "unrecognized pragma";
    132         case PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1:
     134        case PP_NON_PP_TOKEN_BEFORE_EXTENSION_WEBGL:
    133135            return "extension directive should occur before any non-preprocessor tokens";
    134136        case PP_WARNING_MACRO_NAME_RESERVED:
  • trunk/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h

    r245088 r246393  
    7474        PP_EOF_IN_DIRECTIVE,
    7575        PP_UNRECOGNIZED_PRAGMA,
     76        PP_NON_PP_TOKEN_BEFORE_EXTENSION_WEBGL,
    7677        PP_WARNING_MACRO_NAME_RESERVED,
    7778        PP_WARNING_END
  • trunk/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp

    r245088 r246393  
    677677        else
    678678        {
    679             mDiagnostics->report(Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1,
    680                                  token->location, token->text);
     679            if (mSettings.shaderSpec == SH_WEBGL_SPEC)
     680            {
     681                mDiagnostics->report(Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_WEBGL,
     682                                     token->location, token->text);
     683            }
     684            else
     685            {
     686                mDiagnostics->report(Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1,
     687                                     token->location, token->text);
     688            }
    681689        }
    682690    }
Note: See TracChangeset for help on using the changeset viewer.