Changeset 249765 in webkit


Ignore:
Timestamp:
Sep 11, 2019 9:01:33 AM (5 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r249758.

Breaks the watchOS build.

Reverted changeset:

"[WHLSL] Ensure structs/arrays with pointers as fields are
disallowed"
https://bugs.webkit.org/show_bug.cgi?id=201525
https://trac.webkit.org/changeset/249758

Location:
trunk
Files:
4 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r249763 r249765  
     12019-09-11  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r249758.
     4
     5        Breaks the watchOS build.
     6
     7        Reverted changeset:
     8
     9        "[WHLSL] Ensure structs/arrays with pointers as fields are
     10        disallowed"
     11        https://bugs.webkit.org/show_bug.cgi?id=201525
     12        https://trac.webkit.org/changeset/249758
     13
    1142019-09-11  Chris Dumez  <cdumez@apple.com>
    215
  • trunk/LayoutTests/webgpu/whlsl/array-spec-tests.html

    r249758 r249765  
    3030        }
    3131    `;
    32     await checkFail(program);
     32    assert_equals(await callIntFunction(program, "foo", []), 76 + 39 + 83);
    3333}
    3434
  • trunk/LayoutTests/webgpu/whlsl/js/test-harness.js

    r249758 r249765  
    159159    constructor ()
    160160    {
    161         this._loaded = false;
    162161    }
    163162
     
    171170            // FIXME: Add support for GPUAdapterRequestOptions and GPUDeviceDescriptor,
    172171            // and differentiate between descriptor validation errors and no WebGPU support.
    173         } finally {
    174             this._loaded = true;
    175172        }
    176173    }
     
    186183    async callTypedFunction(type, functions, name, args)
    187184    {   
    188         if (!this._loaded)
    189             throw new Error("GPU device not loaded.");
    190 
    191185        if (this._device === undefined)
    192186            throw new WebGPUUnsupportedError();
     
    270264    async checkCompileFail(source)
    271265    {
    272         if (!this._loaded)
    273             throw new Error("GPU device not loaded.");
    274 
    275266        if (this._device === undefined)
    276             throw new WebGPUUnsupportedError();
     267            return;
    277268       
    278269        let entryPointCode = `
     
    529520function runTests(obj) {
    530521    window.addEventListener("load", async () => {
    531         await harness.requestDevice();
    532522        try {
    533523            for (const name in obj) {
  • trunk/LayoutTests/webgpu/whlsl/pointer-spec-tests.html

    r249758 r249765  
    3030            return result;
    3131        }
    32     `;
    33     await checkFail(program);
     32    `;;
     33    assert_equals(await callIntFunction(program, "foo", []), 76 + 39 + 83);
    3434}
    3535
  • trunk/LayoutTests/webgpu/whlsl/test-harness-test.html

    r249758 r249765  
    187187};
    188188
    189 window.addEventListener("load", async () => {
     189window.addEventListener("load", () => {
    190190    try {
    191         await harness.requestDevice();
    192191        for (const name in whlslTests) {
    193192            if (!name.startsWith("_"))
  • trunk/Source/WebCore/ChangeLog

    r249762 r249765  
     12019-09-11  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r249758.
     4
     5        Breaks the watchOS build.
     6
     7        Reverted changeset:
     8
     9        "[WHLSL] Ensure structs/arrays with pointers as fields are
     10        disallowed"
     11        https://bugs.webkit.org/show_bug.cgi?id=201525
     12        https://trac.webkit.org/changeset/249758
     13
    1142019-09-11  Ali Juma  <ajuma@chromium.org>
    215
  • trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp

    r249758 r249765  
    937937        if (is<AST::PointerType>(unnamedType)) {
    938938            auto& pointerType = downcast<AST::PointerType>(unnamedType);
     939            // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198163 Save the fact that we're not targetting the item; we're targetting the item's inner element.
    939940            assignConcreteType(makeArrayReferenceExpression, AST::ArrayReferenceType::create(makeArrayReferenceExpression.codeLocation(), pointerType.addressSpace(), pointerType.elementType()));
    940941            return;
  • trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLPrepare.cpp

    r249758 r249765  
    3232#include "WHLSLCheckDuplicateFunctions.h"
    3333#include "WHLSLCheckTextureReferences.h"
    34 #include "WHLSLCheckReferenceTypes.h"
    3534#include "WHLSLChecker.h"
    3635#include "WHLSLComputeDimensions.h"
     
    233232    RUN_PASS(checkLiteralTypes, program);
    234233    CHECK_PASS(checkTextureReferences, program);
    235     CHECK_PASS(checkReferenceTypes, program);
    236234    RUN_PASS(resolveProperties, program);
    237235    RUN_PASS(findHighZombies, program);
  • trunk/Source/WebCore/Sources.txt

    r249758 r249765  
    314314Modules/webgpu/WHLSL/WHLSLPruneUnreachableStandardLibraryFunctions.cpp
    315315Modules/webgpu/WHLSL/WHLSLCheckTextureReferences.cpp
    316 Modules/webgpu/WHLSL/WHLSLCheckReferenceTypes.cpp
    317316Modules/webgpu/WHLSL/WHLSLChecker.cpp
    318317Modules/webgpu/WHLSL/WHLSLGatherEntryPointItems.cpp
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r249758 r249765  
    83328332                522E1A172297D6D400E5D36A /* WHLSLPreserveVariableLifetimes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLPreserveVariableLifetimes.cpp; sourceTree = "<group>"; };
    83338333                522E1A192297D6D400E5D36A /* WHLSLPreserveVariableLifetimes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLPreserveVariableLifetimes.h; sourceTree = "<group>"; };
    8334                 524BD47E23277E15008F56C1 /* WHLSLCheckReferenceTypes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLCheckReferenceTypes.cpp; sourceTree = "<group>"; };
    8335                 524BD48023277E16008F56C1 /* WHLSLCheckReferenceTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLCheckReferenceTypes.h; sourceTree = "<group>"; };
    83368334                526724F11CB2FDF60075974D /* TextTrackRepresentationCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextTrackRepresentationCocoa.mm; sourceTree = "<group>"; };
    83378335                526724F21CB2FDF60075974D /* TextTrackRepresentationCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRepresentationCocoa.h; sourceTree = "<group>"; };
     
    2558225580                                1C281C6D22B87B9800691C00 /* WHLSLCheckTextureReferences.cpp */,
    2558325581                                1C281C6E22B87B9800691C00 /* WHLSLCheckTextureReferences.h */,
    25584                                 524BD47E23277E15008F56C1 /* WHLSLCheckReferenceTypes.cpp */,
    25585                                 524BD48023277E16008F56C1 /* WHLSLCheckReferenceTypes.h */,
    2558625582                                522BAB9622E6A36200C54CE9 /* WHLSLCodeLocation.h */,
    2558725583                                1C86CA4B22AA19FF001BF961 /* WHLSLComputeDimensions.cpp */,
Note: See TracChangeset for help on using the changeset viewer.