Attachment #363717 for bug #195347

View Details Raw Unified Return to Bug 195347

| Differences between



2019-03-05  Justin Fan  <justin_fan@apple.com>

        [Web GPU] GPUTexture and GPUTextureView updates, and related GPUBindGroup updates
        https://bugs.webkit.org/show_bug.cgi?id=195347

        Reviewed by NOBODY (OOPS!).

        Test: webgpu/texture-triangle-strip.html

        * Modules/webgpu/WebGPUBindGroupDescriptor.cpp:
        (WebCore::WebGPUBindGroupDescriptor::asGPUBindGroupDescriptor const): Update to validate GPUTextureView resources.
        * Modules/webgpu/WebGPUCommandBuffer.cpp: Move instead of copy the converted view objects.
        (WebCore::WebGPUCommandBuffer::copyBufferToTexture):
        (WebCore::WebGPUCommandBuffer::copyTextureToBuffer):
        (WebCore::WebGPUCommandBuffer::copyTextureToTexture):
        * Modules/webgpu/WebGPUCommandBuffer.h:
        (WebCore::WebGPUCommandBuffer::commandBuffer const): No longer returns const so used resources can be registered on it.
        * Modules/webgpu/WebGPUDevice.cpp:
        (WebCore::WebGPUDevice::createBindGroupLayout const): Rename WebGPUBindGroupLayoutDescriptor and replace unnecessary rvalue reference.
        * Modules/webgpu/WebGPUDevice.h: Ditto.
        * Modules/webgpu/WebGPUDevice.idl: Ditto.
        * Modules/webgpu/WebGPUProgrammablePassEncoder.cpp:
        (WebCore::WebGPUProgrammablePassEncoder::setBindGroup const):
        * Modules/webgpu/WebGPUProgrammablePassEncoder.h:
        * Modules/webgpu/WebGPUQueue.cpp:
        (WebCore::WebGPUQueue::submit):
        * Modules/webgpu/WebGPURenderPassDescriptor.cpp:
        (WebCore::WebGPURenderPassDescriptor::asGPURenderPassDescriptor const):
        * Modules/webgpu/WebGPUTexture.cpp:
        (WebCore::WebGPUTexture::~WebGPUTexture): Clean up any resources created for and from this WebGPUTexture.
        (WebCore::WebGPUTexture::createDefaultTextureView): Now returns an empty object other than null on failure.
        (WebCore::WebGPUTexture::destroy):
        (WebCore::WebGPUTexture::destroyImpl):
        * Modules/webgpu/WebGPUTexture.h: Keep a list of any views created from this texture.
        * Modules/webgpu/WebGPUTexture.idl: Enable destroy.
        * Modules/webgpu/WebGPUTextureView.cpp:
        (WebCore::WebGPUTextureView::create):
        (WebCore::WebGPUTextureView::WebGPUTextureView):
        (WebCore::WebGPUTextureView::destroy):
        * Modules/webgpu/WebGPUTextureView.h:
        (WebCore::WebGPUTextureView::~WebGPUTextureView): Clean up any resources backing this WebGPUTextureView.
        (WebCore::WebGPUTextureView::texture const):
        (WebCore::WebGPUTextureView::texture): Deleted.
        * platform/graphics/gpu/GPUBindGroupLayout.h:
        * platform/graphics/gpu/GPUCommandBuffer.h:
        (WebCore::GPUCommandBuffer::usedTextures const): Keep a list of all texture resources that will be used by this command buffer on submit.
        (WebCore::GPUCommandBuffer::isEncodingPass const): Added to prevent multiple pass encoders from being active on one command buffer.
        (WebCore::GPUCommandBuffer::setIsEncodingPass):
        (WebCore::GPUCommandBuffer::useTexture):
        * platform/graphics/gpu/GPUDevice.cpp:
        (WebCore::GPUDevice::tryCreateBindGroupLayout const):
        * platform/graphics/gpu/GPUDevice.h:
        * platform/graphics/gpu/GPUPipelineLayout.cpp:
        (WebCore::GPUPipelineLayout::GPUPipelineLayout):
        * platform/graphics/gpu/GPUProgrammablePassEncoder.cpp:
        (WebCore::GPUProgrammablePassEncoder::GPUProgrammablePassEncoder):
        * platform/graphics/gpu/GPUProgrammablePassEncoder.h:
        (WebCore::GPUProgrammablePassEncoder::setVertexBuffer):
        (WebCore::GPUProgrammablePassEncoder::setFragmentBuffer):
        (): Deleted.
        * platform/graphics/gpu/GPUQueue.h:
        * platform/graphics/gpu/GPURenderPassEncoder.h:
        * platform/graphics/gpu/GPUTexture.h:
        (WebCore::GPUTexture::isReadOnly const):
        (WebCore::GPUTexture::destroy):
        * platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm:
        (WebCore::MTLDataTypeForBindingType):
        (WebCore::GPUBindGroupLayout::tryCreate):
        * platform/graphics/gpu/cocoa/GPUCommandBufferMetal.mm:
        (WebCore::GPUCommandBuffer::create):
        (WebCore::GPUCommandBuffer::~GPUCommandBuffer): Ensure blitEncoder is ended before releasing it.
        (WebCore::GPUCommandBuffer::endBlitEncoding):
        (WebCore::GPUCommandBuffer::copyBufferToTexture): Ensure textures are marked for usage before submission occurs.
        (WebCore::GPUCommandBuffer::copyTextureToBuffer):
        (WebCore::GPUCommandBuffer::copyTextureToTexture):
        * platform/graphics/gpu/cocoa/GPUDeviceMetal.mm:
        (WebCore::GPUDevice::create):
        (WebCore::GPUDevice::GPUDevice):
        * platform/graphics/gpu/cocoa/GPUProgrammablePassEncoderMetal.mm:
        (WebCore::GPUProgrammablePassEncoder::endPass):
        (WebCore::GPUProgrammablePassEncoder::setBindGroup): Now supports texture resources.
        (WebCore::GPUProgrammablePassEncoder::setResourceAsBufferOnEncoder): Just moved.
        (WebCore::GPUProgrammablePassEncoder::setResourceAsTextureOnEncoder):
        * platform/graphics/gpu/cocoa/GPUQueueMetal.mm:
        (WebCore::GPUQueue::submit): Ensures destroyed GPUTextures are not submitted.
        * platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm:
        (WebCore::GPURenderPassEncoder::tryCreate): Ensure any other encoders are ended before attempting to activate a new one.
        (WebCore::GPURenderPassEncoder::platformPassEncoder const):
        (WebCore::GPURenderPassEncoder::endPass): Invalidates the MTLCommandEncoder upon success.
        (WebCore::GPURenderPassEncoder::setPipeline):
        (WebCore::GPURenderPassEncoder::setVertexBuffers):
        (WebCore::GPURenderPassEncoder::draw):
        (WebCore::GPURenderPassEncoder::useResource):
        (WebCore::GPURenderPassEncoder::setVertexBuffer):
        (WebCore::GPURenderPassEncoder::setFragmentBuffer):
        * platform/graphics/gpu/cocoa/GPUSwapChainMetal.mm:
        (WebCore::GPUSwapChain::getNextTexture):
        * platform/graphics/gpu/cocoa/GPUTextureMetal.mm:
        (WebCore::storageModeForPixelFormatAndSampleCount): 
                Always create MTLStorageModePrivate textures on macOS, as Web GPU doesn't provide CPU access to textures anyway.
        (WebCore::tryCreateMtlTextureDescriptor):
        (WebCore::GPUTexture::create):
        (WebCore::GPUTexture::GPUTexture):
        (WebCore::GPUTexture::tryCreateDefaultTextureView): Renamed from createDefaultTextureView.

        Update files and symbols in project:
        * CMakeLists.txt:
        * DerivedSources-input.xcfilelist:
        * DerivedSources-output.xcfilelist:
        * DerivedSources.make:
        * Modules/streams/WebGPUBindGroupLayoutDescriptor.h: Removed.
        * Modules/webgpu/GPUBindGroupLayoutBinding.h: Renamed from Source/WebCore/platform/graphics/gpu/GPUBindGroupLayoutBinding.h.
        * Modules/webgpu/GPUBindGroupLayoutBinding.idl: Renamed from Source/WebCore/Modules/webgpu/WebGPUBindGroupLayoutBinding.idl.
        * Modules/webgpu/GPUBindGroupLayoutDescriptor.h: Renamed from Source/WebCore/platform/graphics/gpu/GPUBindGroupLayoutDescriptor.h.
        * Modules/webgpu/GPUBindGroupLayoutDescriptor.idl: Renamed from Source/WebCore/Modules/webgpu/WebGPUBindGroupLayoutDescriptor.idl.
        * Modules/webgpu/GPUShaderStageBit.h: Renamed from Source/WebCore/Modules/webgpu/WebGPUShaderStageBit.h.
        * Modules/webgpu/GPUShaderStageBit.idl: Renamed from Source/WebCore/Modules/webgpu/WebGPUShaderStageBit.idl.
        * Sources.txt:
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/WebCoreBuiltinNames.h:

2019-03-04  Justin Fan  <justin_fan@apple.com>

        [Web GPU] Blitting function prototypes



/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#if ENABLE(WEBGPU)

#include "GPUBindGroupLayoutDescriptor.h"

namespace WebCore {

using WebGPUBindGroupLayoutDescriptor = GPUBindGroupLayoutDescriptor;

} // namespace WebCore

#endif // ENABLE(WEBGPU)



/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#if ENABLE(WEBGPU)

#include "GPUShaderStageBit.h"
#include <wtf/OptionSet.h>

namespace WebCore {

struct GPUBindGroupLayoutBinding {
    enum class BindingType {
        UniformBuffer,
        DynamicUniformBuffer,
        Sampler,
        SampledTexture,
        StorageBuffer,
        DynamicStorageBuffer
    };

    unsigned long binding;
    GPUShaderStageFlags visibility;
    BindingType type;
};

} // namespace WebCore

#endif // ENABLE(WEBGPU)



/*
 * Copyright (C) 2019 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */
// https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl

typedef unsigned long u32;
typedef u32 GPUShaderStageFlags;

[
    Conditional=WEBGPU,
    EnabledAtRuntime=WebGPU
] enum GPUBindingType {
    "uniform-buffer",
    "dynamic-uniform-buffer",
    "sampler",
    "sampled-texture",
    "storage-buffer",
    "dynamic-storage-buffer"
    // TODO other binding types
};

[
    Conditional=WEBGPU,
    EnabledAtRuntime=WebGPU
] dictionary GPUBindGroupLayoutBinding {
    u32 binding;
    GPUShaderStageFlags visibility;
    GPUBindingType type;
};



/*
 * Copyright (C) 2019 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#if ENABLE(WEBGPU)

#include "GPUBindGroupLayoutBinding.h"
#include <wtf/Vector.h>

namespace WebCore {

struct GPUBindGroupLayoutDescriptor {
    Vector<GPUBindGroupLayoutBinding> bindings;
};

} // namespace WebCore

#endif // ENABLE(WEBGPU)



/*
 * Copyright (C) 2019 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */
// https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl

[
    Conditional=WEBGPU,
    EnabledAtRuntime=WebGPU
] dictionary GPUBindGroupLayoutDescriptor {
    sequence<GPUBindGroupLayoutBinding> bindings;
};



/*
 * Copyright (C) 2019 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#if ENABLE(WEBGPU)

#include <wtf/RefCounted.h>

namespace WebCore {

using GPUShaderStageFlags = unsigned;

class GPUShaderStageBit : public RefCounted<GPUShaderStageBit> {
public:
    enum Flags : GPUShaderStageFlags {
        None = 0,
        Vertex = 1 << 0,
        Fragment = 1 << 1,
        Compute = 1 << 2,
    };
};


} // namespace WebCore

#endif // ENABLE(WEBGPU)



/*
 * Copyright (C) 2019 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */
// https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl

typedef unsigned long u32;

[
    Conditional=WEBGPU,
    DoNotCheckConstants,
    EnabledAtRuntime=WebGPU,
    ImplementationLacksVTable
] interface GPUShaderStageBit {
    const u32 NONE = 0;
    const u32 VERTEX = 1;
    const u32 FRAGMENT = 2;
    const u32 COMPUTE = 4;
};




        const auto layoutBinding = iterator->value;

        auto bindingResourceVisitor = WTF::makeVisitor([](const RefPtr<WebGPUTextureView>& view) -> Optional<GPUBindingResource> {
            // FIXME: Validate binding type with the texture's usage flags.
            if (!view)
                return WTF::nullopt;
            auto texture = view->texture();
            if (!texture)
                return WTF::nullopt;

            return static_cast<GPUBindingResource>(texture.releaseNonNull());
        }, [&layoutBinding, functionName] (WebGPUBufferBinding bufferBinding) -> Optional<GPUBindingResource> {
            if (!bufferBinding.buffer)
                return WTF::nullopt;
            auto buffer = bufferBinding.buffer->buffer();
            if (!buffer)
                return WTF::nullopt;

            if (!validateBufferBindingType(buffer.get(), layoutBinding, functionName))
                return WTF::nullopt;

            return static_cast<GPUBindingResource>(GPUBufferBinding { buffer.releaseNonNull(), bufferBinding.offset, bufferBinding.size });
        });

        auto bindingResource = WTF::visit(bindingResourceVisitor, binding.resource);
        if (!bindingResource) {
            LOG(WebGPU, "%s: Invalid resource for binding %lu!", functionName, layoutBinding.binding);
            return WTF::nullopt;
        }

        bindGroupBindings.uncheckedAppend(GPUBindGroupBinding { binding.binding, WTFMove(bindingResource.value()) });
    }



/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#if ENABLE(WEBGPU)

#include "GPUBindGroupLayoutBinding.h"
#include "WebGPUShaderStageBit.h"

namespace WebCore {

using WebGPUBindGroupLayoutBinding = GPUBindGroupLayoutBinding;
using WebGPUBindingType = GPUBindGroupLayoutBinding::BindingType;
using WebGPUShaderStageFlags = GPUShaderStageFlags;

} // namespace WebCore

#endif // ENABLE(WEBGPU)



/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */
// https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl

typedef unsigned long u32;
typedef u32 WebGPUShaderStageFlags;

[
    Conditional=WEBGPU,
    EnabledAtRuntime=WebGPU
] enum WebGPUBindingType {
    "uniformBuffer",
    "sampler",
    "sampledTexture",
    "storageBuffer"
    // TODO other binding types
};

[
    Conditional=WEBGPU,
    EnabledAtRuntime=WebGPU
] dictionary WebGPUBindGroupLayoutBinding {
    u32 binding;
    WebGPUShaderStageFlags visibility;
    WebGPUBindingType type;
};




/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */
// https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl

[
    Conditional=WEBGPU,
    EnabledAtRuntime=WebGPU
] dictionary WebGPUBindGroupLayoutDescriptor {
    sequence<WebGPUBindGroupLayoutBinding> bindings;
};




    // FIXME: Add Web GPU validation.

    m_commandBuffer->copyBufferToTexture(WTFMove(*gpuBufferView), WTFMove(*gpuTextureView), size);
}

void WebGPUCommandBuffer::copyTextureToBuffer(const WebGPUTextureCopyView& srcTexture, const WebGPUBufferCopyView& dstBuffer, const GPUExtent3D& size)


    // FIXME: Add Web GPU validation.

    m_commandBuffer->copyTextureToBuffer(WTFMove(*gpuTextureView), WTFMove(*gpuBufferView), size);
}

void WebGPUCommandBuffer::copyTextureToTexture(const WebGPUTextureCopyView& src, const WebGPUTextureCopyView& dst, const GPUExtent3D& size)


    // FIXME: Add Web GPU validation.

    m_commandBuffer->copyTextureToTexture(WTFMove(*gpuSrcView), WTFMove(*gpuDstView), size);
}

} // namespace WebCore

Lines 59-65 class WebGPUCommandBuffer : public RefCounted<WebGPUCommandBuffer> { a/Source/WebCore/Modules/webgpu/WebGPUCommandBuffer.h_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUCommandBuffer.h -1 / +1 lines
59	public:	59	public:
60	static Ref<WebGPUCommandBuffer> create(Ref<GPUCommandBuffer>&&);	60	static Ref<WebGPUCommandBuffer> create(Ref<GPUCommandBuffer>&&);
61		61
62	const GPUCommandBuffer& commandBuffer() const { return m_commandBuffer.get(); }	62	GPUCommandBuffer& commandBuffer() const { return m_commandBuffer.get(); }
63		63
64	RefPtr<WebGPURenderPassEncoder> beginRenderPass(WebGPURenderPassDescriptor&&);	64	RefPtr<WebGPURenderPassEncoder> beginRenderPass(WebGPURenderPassDescriptor&&);
65	void copyBufferToBuffer(const WebGPUBuffer&, unsigned long srcOffset, const WebGPUBuffer&, unsigned long dstOffset, unsigned long size);	65	void copyBufferToBuffer(const WebGPUBuffer&, unsigned long srcOffset, const WebGPUBuffer&, unsigned long dstOffset, unsigned long size);



#include "GPUBindGroup.h"
#include "GPUBindGroupBinding.h"
#include "GPUBindGroupDescriptor.h"
#include "GPUBindGroupLayoutDescriptor.h"
#include "GPUBufferBinding.h"
#include "GPUBufferDescriptor.h"
#include "GPUCommandBuffer.h"

#include "Logging.h"
#include "WebGPUBindGroup.h"
#include "WebGPUBindGroupBinding.h"
#include "WebGPUBindGroupDescriptor.h"
#include "WebGPUBindGroupLayout.h"
#include "WebGPUBuffer.h"
#include "WebGPUBufferBinding.h"

    return WebGPUTexture::create(WTFMove(texture));
}

Ref<WebGPUBindGroupLayout> WebGPUDevice::createBindGroupLayout(const GPUBindGroupLayoutDescriptor& descriptor) const
{
    auto layout = m_device->tryCreateBindGroupLayout(descriptor);
    return WebGPUBindGroupLayout::create(WTFMove(layout));
}





#include "GPUDevice.h"
#include "WebGPUAdapter.h"
#include "WebGPUBindGroupLayoutDescriptor.h"
#include "WebGPUQueue.h"

#include <wtf/Ref.h>

class WebGPUShaderModule;
class WebGPUTexture;

struct GPUBindGroupLayoutDescriptor;
struct GPUBufferDescriptor;
struct GPUTextureDescriptor;
struct WebGPUBindGroupDescriptor;

    Ref<WebGPUBuffer> createBuffer(GPUBufferDescriptor&&) const;
    Ref<WebGPUTexture> createTexture(GPUTextureDescriptor&&) const;

    Ref<WebGPUBindGroupLayout> createBindGroupLayout(const GPUBindGroupLayoutDescriptor&) const;
    Ref<WebGPUPipelineLayout> createPipelineLayout(WebGPUPipelineLayoutDescriptor&&) const;
    Ref<WebGPUBindGroup> createBindGroup(WebGPUBindGroupDescriptor&&) const;




    WebGPUBuffer createBuffer(GPUBufferDescriptor descriptor);
    WebGPUTexture createTexture(GPUTextureDescriptor descriptor);

    WebGPUBindGroupLayout createBindGroupLayout(GPUBindGroupLayoutDescriptor descriptor);
    WebGPUPipelineLayout createPipelineLayout(WebGPUPipelineLayoutDescriptor descriptor);
    WebGPUBindGroup createBindGroup(WebGPUBindGroupDescriptor descriptor);


    // readonly attribute WebGPUExtensions extensions;
    // readonly attribute WebGPULimits limits;

    // WebGPUTexture createTexture(WebGPUTextureDescriptor descriptor);
    // WebGPUSampler createSampler(WebGPUSamplerDescriptor descriptor);

    // WebGPUComputePipeline createComputePipeline(WebGPUComputePipelineDescriptor descriptor);

Lines 45-51 Ref<WebGPUCommandBuffer> WebGPUProgrammablePassEncoder::endPass() a/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.cpp_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.cpp -1 / +1 lines
45	return m_commandBuffer.copyRef();	45	return m_commandBuffer.copyRef();
46	}	46	}
47		47
48	void WebGPUProgrammablePassEncoder::setBindGroup(unsigned long index, WebGPUBindGroup& bindGroup) const	48	void WebGPUProgrammablePassEncoder::setBindGroup(unsigned index, WebGPUBindGroup& bindGroup) const
49	{	49	{
50	// Maximum number of bind groups supported in Web GPU.	50	// Maximum number of bind groups supported in Web GPU.
51	if (index >= 4) {	51	if (index >= 4) {

Lines 41-47 public: a/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.h_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.h -1 / +1 lines
41	virtual ~WebGPUProgrammablePassEncoder() = default;	41	virtual ~WebGPUProgrammablePassEncoder() = default;
42		42
43	Ref<WebGPUCommandBuffer> endPass();	43	Ref<WebGPUCommandBuffer> endPass();
44	void setBindGroup(unsigned long, WebGPUBindGroup&) const;	44	void setBindGroup(unsigned, WebGPUBindGroup&) const;
45	void setPipeline(Ref<WebGPURenderPipeline>&&);	45	void setPipeline(Ref<WebGPURenderPipeline>&&);
46		46
47	protected:	47	protected:

Lines 46-52 WebGPUQueue::WebGPUQueue(Ref<GPUQueue>&& queue) a/Source/WebCore/Modules/webgpu/WebGPUQueue.cpp_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUQueue.cpp -1 / +1 lines
46		46
47	void WebGPUQueue::submit(Vector<RefPtr<WebGPUCommandBuffer>>&& buffers)	47	void WebGPUQueue::submit(Vector<RefPtr<WebGPUCommandBuffer>>&& buffers)
48	{	48	{
49	auto gpuBuffers = buffers.map([] (const auto& buffer) -> Ref<const GPUCommandBuffer> {	49	auto gpuBuffers = buffers.map([] (auto& buffer) -> Ref<GPUCommandBuffer> {
50	return buffer->commandBuffer();	50	return buffer->commandBuffer();
51	});	51	});
52	m_queue->submit(WTFMove(gpuBuffers));	52	m_queue->submit(WTFMove(gpuBuffers));

Lines 56-76 Optional<GPURenderPassDescriptor> WebGPURenderPassDescriptor::asGPURenderPassDes a/Source/WebCore/Modules/webgpu/WebGPURenderPassDescriptor.cpp_sec1
- a/Source/WebCore/Modules/webgpu/WebGPURenderPassDescriptor.cpp -4 / +8 lines
56	Vector<GPURenderPassColorAttachmentDescriptor> gpuColorAttachments;	56	Vector<GPURenderPassColorAttachmentDescriptor> gpuColorAttachments;
57		57
58	for (const auto& colorAttachment : colorAttachments) {	58	for (const auto& colorAttachment : colorAttachments) {
59	if (!colorAttachment.attachment \|\| !colorAttachment.attachment->texture()->isOutputAttachment()) {	59	if (!colorAttachment.attachment
		60	\|\| !colorAttachment.attachment->texture()
		61	\|\| !colorAttachment.attachment->texture()->isOutputAttachment()) {
60	LOG(WebGPU, "GPURenderPassDescriptor: Invalid attachment in GPURenderPassColorAttachmentDescriptor!");	62	LOG(WebGPU, "GPURenderPassDescriptor: Invalid attachment in GPURenderPassColorAttachmentDescriptor!");
61	return WTF::nullopt;	63	return WTF::nullopt;
62	}	64	}
63	gpuColorAttachments.append(GPURenderPassColorAttachmentDescriptor { colorAttachment.attachment->texture(), colorAttachment });	65	gpuColorAttachments.append(GPURenderPassColorAttachmentDescriptor { colorAttachment.attachment->texture().releaseNonNull(), colorAttachment });
64	}	66	}
65		67
66	Optional<GPURenderPassDepthStencilAttachmentDescriptor> gpuDepthAttachment;	68	Optional<GPURenderPassDepthStencilAttachmentDescriptor> gpuDepthAttachment;
67		69
68	if (depthStencilAttachment) {	70	if (depthStencilAttachment) {
69	if (!depthStencilAttachment->attachment \|\| !depthStencilAttachment->attachment->texture()->isOutputAttachment()) {	71	if (!depthStencilAttachment->attachment
		72	\|\| !depthStencilAttachment->attachment->texture()
		73	\|\| !depthStencilAttachment->attachment->texture()->isOutputAttachment()) {
70	LOG(WebGPU, "GPURenderPassDescriptor: Invalid attachment in GPURenderPassDepthStencilAttachmentDescriptor!");	74	LOG(WebGPU, "GPURenderPassDescriptor: Invalid attachment in GPURenderPassDepthStencilAttachmentDescriptor!");
71	return WTF::nullopt;	75	return WTF::nullopt;
72	}	76	}
73	gpuDepthAttachment = GPURenderPassDepthStencilAttachmentDescriptor { depthStencilAttachment->attachment->texture(), *depthStencilAttachment };	77	gpuDepthAttachment = GPURenderPassDepthStencilAttachmentDescriptor { depthStencilAttachment->attachment->texture().releaseNonNull(), *depthStencilAttachment };
74	}	78	}
75		79
76	return GPURenderPassDescriptor { WTFMove(gpuColorAttachments), WTFMove(gpuDepthAttachment) };	80	return GPURenderPassDescriptor { WTFMove(gpuColorAttachments), WTFMove(gpuDepthAttachment) };



/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#if ENABLE(WEBGPU)

#include "GPUBindGroupLayoutBinding.h"

namespace WebCore {

using WebGPUShaderStageBit = GPUShaderStageBit;

} // namespace WebCore

#endif // ENABLE(WEBGPU)



/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */
// https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl

typedef unsigned long u32;

[
    Conditional=WEBGPU,
    EnabledAtRuntime=WebGPU,
    ImplementationLacksVTable
] interface WebGPUShaderStageBit {
    const u32 NONE = 0;
    const u32 VERTEX = 1;
    const u32 FRAGMENT = 2;
    const u32 COMPUTE = 4;
};



{
}

WebGPUTexture::~WebGPUTexture()
{
    if (m_texture)
        destroyImpl();
}

Ref<WebGPUTextureView> WebGPUTexture::createDefaultTextureView()
{
    if (!m_texture) {
        LOG(WebGPU, "GPUTexture::createDefaultTextureView(): Invalid operation!");
        return WebGPUTextureView::create(nullptr);
    }

    auto view = WebGPUTextureView::create(m_texture->tryCreateDefaultTextureView());
    m_textureViews.append(view.copyRef());
    return view;
}

void WebGPUTexture::destroy()
{
    if (!m_texture)
        LOG(WebGPU, "GPUTexture::destroy(): Invalid operation!");
    else
        destroyImpl();
}

void WebGPUTexture::destroyImpl()
{
    for (auto& view : m_textureViews)
        view->destroy();
    m_textureViews.clear();

    m_texture->destroy();
    m_texture = nullptr;
}

} // namespace WebCore




#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>

namespace WebCore {


class WebGPUTexture : public RefCounted<WebGPUTexture> {
public:
    static Ref<WebGPUTexture> create(RefPtr<GPUTexture>&&);
    ~WebGPUTexture();

    RefPtr<GPUTexture> texture() const { return m_texture; }

    Ref<WebGPUTextureView> createDefaultTextureView();
    void destroy();

private:
    explicit WebGPUTexture(RefPtr<GPUTexture>&&);

    void destroyImpl();

    RefPtr<GPUTexture> m_texture;
    Vector<Ref<WebGPUTextureView>> m_textureViews;
};

} // namespace WebCore

Lines 30-38 a/Source/WebCore/Modules/webgpu/WebGPUTexture.idl_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUTexture.idl -4 / +3 lines
30	ImplementationLacksVTable	30	ImplementationLacksVTable
31	] interface WebGPUTexture {	31	] interface WebGPUTexture {
32	WebGPUTextureView createDefaultTextureView();	32	WebGPUTextureView createDefaultTextureView();
33	/* Not Yet Implemented:
34	WebGPUTextureView createTextureView(WebGPUTextureViewDescriptor desc);
35
36	void destroy();	33	void destroy();
37	*/	34
		35	// Not Yet Implemented:
		36	// WebGPUTextureView createTextureView(WebGPUTextureViewDescriptor desc);
38	};	37	};




#if ENABLE(WEBGPU)

#include "GPUTexture.h"

namespace WebCore {

Ref<WebGPUTextureView> WebGPUTextureView::create(RefPtr<GPUTexture>&& view)
{
    return adoptRef(*new WebGPUTextureView(WTFMove(view)));
}

WebGPUTextureView::WebGPUTextureView(RefPtr<GPUTexture>&& view)
    : m_texture(WTFMove(view))
{
}

void WebGPUTextureView::destroy()
{
    if (!m_texture)
        return;

    m_texture->destroy();
    m_texture = nullptr;
}

} // namespace WebCore

#endif // ENABLE(WEBGPU)




#if ENABLE(WEBGPU)

#include "GPUTexture.h"
#include <wtf/Ref.h>
#include <wtf/RefCounted.h>

namespace WebCore {

class GPUTexture;

class WebGPUTextureView : public RefCounted<WebGPUTextureView> {
public:
    static Ref<WebGPUTextureView> create(RefPtr<GPUTexture>&&);
    ~WebGPUTextureView() { destroy(); }

    RefPtr<GPUTexture> texture() const { return m_texture; }

    void destroy();
private:
    explicit WebGPUTextureView(RefPtr<GPUTexture>&&);
    
    RefPtr<GPUTexture> m_texture;
};

} // namespace WebCore

Lines 2769-2774 JSFocusEvent.cpp a/Source/WebCore/Sources.txt_sec1
- a/Source/WebCore/Sources.txt -3 / +3 lines
2769	JSFontFace.cpp	2769	JSFontFace.cpp
2770	JSFontFaceSet.cpp	2770	JSFontFaceSet.cpp
2771	JSGPUColor.cpp	2771	JSGPUColor.cpp
		2772	JSGPUBindGroupLayoutBinding.cpp
		2773	JSGPUBindGroupLayoutDescriptor.cpp
2772	JSGPUBufferDescriptor.cpp	2774	JSGPUBufferDescriptor.cpp
2773	JSGPUBufferUsage.cpp	2775	JSGPUBufferUsage.cpp
2774	JSGPUCompareFunction.cpp	2776	JSGPUCompareFunction.cpp
Lines 2777-2782 JSGPUExtent3D.cpp a/Source/WebCore/Sources.txt_sec2
2777	JSGPULoadOp.cpp	2779	JSGPULoadOp.cpp
2778	JSGPUOrigin3D.cpp	2780	JSGPUOrigin3D.cpp
2779	JSGPURequestAdapterOptions.cpp	2781	JSGPURequestAdapterOptions.cpp
		2782	JSGPUShaderStageBit.cpp
2780	JSGPUStoreOp.cpp	2783	JSGPUStoreOp.cpp
2781	JSGPUTextureDescriptor.cpp	2784	JSGPUTextureDescriptor.cpp
2782	JSGPUTextureDimension.cpp	2785	JSGPUTextureDimension.cpp
Lines 3316-3323 JSWebGPUBindGroup.cpp a/Source/WebCore/Sources.txt_sec3
3316	JSWebGPUBindGroupBinding.cpp	3319	JSWebGPUBindGroupBinding.cpp
3317	JSWebGPUBindGroupDescriptor.cpp	3320	JSWebGPUBindGroupDescriptor.cpp
3318	JSWebGPUBindGroupLayout.cpp	3321	JSWebGPUBindGroupLayout.cpp
3319	JSWebGPUBindGroupLayoutBinding.cpp
3320	JSWebGPUBindGroupLayoutDescriptor.cpp
3321	JSWebGPUBuffer.cpp	3322	JSWebGPUBuffer.cpp
3322	JSWebGPUBufferBinding.cpp	3323	JSWebGPUBufferBinding.cpp
3323	JSWebGPUCommandBuffer.cpp	3324	JSWebGPUCommandBuffer.cpp
Lines 3338-3344 JSWebGPURenderPipeline.cpp a/Source/WebCore/Sources.txt_sec4
3338	JSWebGPURenderPipelineDescriptor.cpp	3339	JSWebGPURenderPipelineDescriptor.cpp
3339	JSWebGPUShaderModule.cpp	3340	JSWebGPUShaderModule.cpp
3340	JSWebGPUShaderModuleDescriptor.cpp	3341	JSWebGPUShaderModuleDescriptor.cpp
3341	JSWebGPUShaderStageBit.cpp
3342	JSWebGPUSwapChain.cpp	3342	JSWebGPUSwapChain.cpp
3343	JSWebGPUTexture.cpp	3343	JSWebGPUTexture.cpp
3344	JSWebGPUTextureView.cpp	3344	JSWebGPUTextureView.cpp



		D026F489220A539800AC5F49 /* GPUTextureDimension.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUTextureDimension.idl; sourceTree = "<group>"; };
		D026F48B220A5B0B00AC5F49 /* GPUTextureDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUTextureDescriptor.idl; sourceTree = "<group>"; };
		D026F48C220A5BAD00AC5F49 /* GPUTextureDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUTextureDescriptor.h; sourceTree = "<group>"; };
		D02B83ED21C8397A00F85473 /* WebGPUBindGroupLayoutDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUBindGroupLayoutDescriptor.idl; sourceTree = "<group>"; };
		D02C26922181416D00D818E4 /* GPURequestAdapterOptions.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPURequestAdapterOptions.idl; sourceTree = "<group>"; };
		D02F854E21682A4A0088EE74 /* WebMetalCommandQueue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalCommandQueue.idl; sourceTree = "<group>"; };
		D02F855021682A560088EE74 /* WebMetalComputeCommandEncoder.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebMetalComputeCommandEncoder.idl; sourceTree = "<group>"; };

		D06EF553220BA26A0018724E /* GPUUtilsMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUUtilsMetal.mm; sourceTree = "<group>"; };
		D07DEAB70A36554A00CA30F8 /* InsertListCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = InsertListCommand.cpp; sourceTree = "<group>"; };
		D07DEAB80A36554A00CA30F8 /* InsertListCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = InsertListCommand.h; sourceTree = "<group>"; };
		D083D98421C48050008E8EFF /* GPUBindGroupLayoutDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBindGroupLayoutDescriptor.h; sourceTree = "<group>"; };
		D083D98621C4813E008E8EFF /* WebGPUBindGroupLayoutDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebGPUBindGroupLayoutDescriptor.h; path = Modules/streams/WebGPUBindGroupLayoutDescriptor.h; sourceTree = SOURCE_ROOT; };
		D084033A221CBF5400007205 /* GPUBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPUBuffer.cpp; sourceTree = "<group>"; };
		D084033D221E186400007205 /* WebGPUBindGroupDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUBindGroupDescriptor.cpp; sourceTree = "<group>"; };
		D0843A4A20FEBE3D00FE860E /* GraphicsContext3DManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GraphicsContext3DManager.h; sourceTree = "<group>"; };

		D0B0556609C6700100307E43 /* CreateLinkCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateLinkCommand.h; sourceTree = "<group>"; };
		D0B0556709C6700100307E43 /* CreateLinkCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CreateLinkCommand.cpp; sourceTree = "<group>"; };
		D0B8BB0121C46E78000C7681 /* GPUBindGroupLayoutBinding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBindGroupLayoutBinding.h; sourceTree = "<group>"; };
		D0B8BB0321C4711D000C7681 /* WebGPUShaderStageBit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUShaderStageBit.h; sourceTree = "<group>"; };
		D0B8BB0421C4711D000C7681 /* WebGPUShaderStageBit.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUShaderStageBit.idl; sourceTree = "<group>"; };
		D0B8BB0521C47256000C7681 /* WebGPUBindGroupLayoutBinding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUBindGroupLayoutBinding.h; sourceTree = "<group>"; };
		D0B8BB0621C47256000C7681 /* WebGPUBindGroupLayoutBinding.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUBindGroupLayoutBinding.idl; sourceTree = "<group>"; };
		D0BC54481443AC4A00E105DA /* CachedStyleSheetClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedStyleSheetClient.h; sourceTree = "<group>"; };
		D0BD4F5A1408850F006839B6 /* DictationCommandIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationCommandIOS.cpp; sourceTree = "<group>"; };
		D0BD4F5B1408850F006839B6 /* DictationCommandIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictationCommandIOS.h; sourceTree = "<group>"; };

		D0CAAE9E216824A8001C91C7 /* WebMetalCommandBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalCommandBuffer.cpp; sourceTree = "<group>"; };
		D0CCA94922299F97006979B6 /* GPUOrigin3D.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUOrigin3D.h; sourceTree = "<group>"; };
		D0CCA94A22299F97006979B6 /* GPUOrigin3D.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUOrigin3D.idl; sourceTree = "<group>"; };
		D0D69C9C222E00C20032927E /* GPUBindGroupLayoutDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBindGroupLayoutDescriptor.h; sourceTree = "<group>"; };
		D0D69C9D222E00C20032927E /* GPUBindGroupLayoutDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUBindGroupLayoutDescriptor.idl; sourceTree = "<group>"; };
		D0D69C9F222E015E0032927E /* GPUBindGroupLayoutBinding.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUBindGroupLayoutBinding.idl; sourceTree = "<group>"; };
		D0D8648721B64CAA003C983C /* GPUBufferDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBufferDescriptor.h; sourceTree = "<group>"; };
		D0D8648C21B70676003C983C /* WebGPUBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUBuffer.h; sourceTree = "<group>"; };
		D0D8648D21B70676003C983C /* WebGPUBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUBuffer.cpp; sourceTree = "<group>"; };

		D0DA0BE4217930E2007FE2AC /* WebGPUSwapChain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUSwapChain.h; sourceTree = "<group>"; };
		D0DA0BE5217930E2007FE2AC /* WebGPUSwapChain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUSwapChain.cpp; sourceTree = "<group>"; };
		D0DA0BE6217930E2007FE2AC /* WebGPUSwapChain.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUSwapChain.idl; sourceTree = "<group>"; };
		D0DE8FB8222E09E200882550 /* GPUShaderStageBit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUShaderStageBit.h; sourceTree = "<group>"; };
		D0DE8FB9222E09E200882550 /* GPUShaderStageBit.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUShaderStageBit.idl; sourceTree = "<group>"; };
		D0EACF7621937228000FA75C /* WebGPUCommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUCommandBuffer.h; sourceTree = "<group>"; };
		D0EACF7721937228000FA75C /* WebGPUCommandBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUCommandBuffer.cpp; sourceTree = "<group>"; };
		D0EACF7821937228000FA75C /* WebGPUCommandBuffer.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUCommandBuffer.idl; sourceTree = "<group>"; };

				D0BE104E21E695E200E42A89 /* GPUBindGroupBinding.h */,
				D0BE105121E6A70E00E42A89 /* GPUBindGroupDescriptor.h */,
				D02454D021C4A41C00B73628 /* GPUBindGroupLayout.h */,
				D0B8BB0121C46E78000C7681 /* GPUBindGroupLayoutBinding.h */,
				D083D98421C48050008E8EFF /* GPUBindGroupLayoutDescriptor.h */,
				D084033A221CBF5400007205 /* GPUBuffer.cpp */,
				D0D8649221B760F2003C983C /* GPUBuffer.h */,
				D0BE104A21E6872F00E42A89 /* GPUBufferBinding.h */,

				D00F5941216ECC7A000D71DB /* DOMWindowWebGPU.cpp */,
				D00F5940216ECC7A000D71DB /* DOMWindowWebGPU.h */,
				D00F5942216ECC7A000D71DB /* DOMWindowWebGPU.idl */,
				D0B8BB0121C46E78000C7681 /* GPUBindGroupLayoutBinding.h */,
				D0D69C9F222E015E0032927E /* GPUBindGroupLayoutBinding.idl */,
				D0D69C9C222E00C20032927E /* GPUBindGroupLayoutDescriptor.h */,
				D0D69C9D222E00C20032927E /* GPUBindGroupLayoutDescriptor.idl */,
				D01B811922135EB900627B6C /* GPUBufferDescriptor.idl */,
				D01B811C2213627300627B6C /* GPUBufferUsage.idl */,
				D01B811222125AFC00627B6C /* GPUColor.idl */,

				D0CCA94922299F97006979B6 /* GPUOrigin3D.h */,
				D0CCA94A22299F97006979B6 /* GPUOrigin3D.idl */,
				D02C26922181416D00D818E4 /* GPURequestAdapterOptions.idl */,
				D0DE8FB8222E09E200882550 /* GPUShaderStageBit.h */,
				D0DE8FB9222E09E200882550 /* GPUShaderStageBit.idl */,
				D08AA031220D0CE60058C502 /* GPUStoreOp.idl */,
				D026F48B220A5B0B00AC5F49 /* GPUTextureDescriptor.idl */,
				D026F489220A539800AC5F49 /* GPUTextureDimension.idl */,

				D003287A21C8645B00622AA6 /* WebGPUBindGroupLayout.cpp */,
				D003287921C8645B00622AA6 /* WebGPUBindGroupLayout.h */,
				D003287B21C8645B00622AA6 /* WebGPUBindGroupLayout.idl */,
				D0B8BB0521C47256000C7681 /* WebGPUBindGroupLayoutBinding.h */,
				D0B8BB0621C47256000C7681 /* WebGPUBindGroupLayoutBinding.idl */,
				D083D98621C4813E008E8EFF /* WebGPUBindGroupLayoutDescriptor.h */,
				D02B83ED21C8397A00F85473 /* WebGPUBindGroupLayoutDescriptor.idl */,
				D0D8648D21B70676003C983C /* WebGPUBuffer.cpp */,
				D0D8648C21B70676003C983C /* WebGPUBuffer.h */,
				D0D8648E21B70676003C983C /* WebGPUBuffer.idl */,

				D0615FCE217FE5C6008A48A8 /* WebGPUShaderModule.idl */,
				D060D8872182697000339318 /* WebGPUShaderModuleDescriptor.h */,
				D060D88421825D5F00339318 /* WebGPUShaderModuleDescriptor.idl */,
				D0B8BB0321C4711D000C7681 /* WebGPUShaderStageBit.h */,
				D0B8BB0421C4711D000C7681 /* WebGPUShaderStageBit.idl */,
				D0DA0BE5217930E2007FE2AC /* WebGPUSwapChain.cpp */,
				D0DA0BE4217930E2007FE2AC /* WebGPUSwapChain.h */,
				D0DA0BE6217930E2007FE2AC /* WebGPUSwapChain.idl */,



    macro(GamepadButton) \
    macro(GamepadEvent) \
    macro(GPUBufferUsage) \
    macro(GPUShaderStageBit) \
    macro(GPUTextureUsage) \
    macro(HTMLAttachmentElement) \
    macro(HTMLAudioElement) \

    macro(WebGPURenderPassEncoder) \
    macro(WebGPURenderPipeline) \
    macro(WebGPUShaderModule) \
    macro(WebGPUShaderStageBit) \
    macro(WebGPUSwapChain) \
    macro(WebGPUTexture) \
    macro(WebGPUTextureView) \

Lines 45-51 class GPUDevice; a/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h_sec1
- a/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h -1 / +1 lines
45		45
46	class GPUBindGroupLayout : public RefCounted<GPUBindGroupLayout> {	46	class GPUBindGroupLayout : public RefCounted<GPUBindGroupLayout> {
47	public:	47	public:
48	static RefPtr<GPUBindGroupLayout> tryCreate(const GPUDevice&, GPUBindGroupLayoutDescriptor&&);	48	static RefPtr<GPUBindGroupLayout> tryCreate(const GPUDevice&, const GPUBindGroupLayoutDescriptor&);
49		49
50	using BindingsMapType = HashMap<unsigned long long, GPUBindGroupLayoutBinding, WTF::IntHash<unsigned long long>, WTF::UnsignedWithZeroKeyHashTraits<unsigned long long>>;	50	using BindingsMapType = HashMap<unsigned long long, GPUBindGroupLayoutBinding, WTF::IntHash<unsigned long long>, WTF::UnsignedWithZeroKeyHashTraits<unsigned long long>>;
51	const BindingsMapType& bindingsMap() const { return m_bindingsMap; }	51	const BindingsMapType& bindingsMap() const { return m_bindingsMap; }



/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#if ENABLE(WEBGPU)

#include <wtf/RefCounted.h>

namespace WebCore {

using GPUShaderStageFlags = unsigned long;

class GPUShaderStageBit : public RefCounted<GPUShaderStageBit> {
public:
    static const GPUShaderStageFlags NONE = 0;
    static const GPUShaderStageFlags VERTEX = 1;
    static const GPUShaderStageFlags FRAGMENT = 2;
    static const GPUShaderStageFlags COMPUTE = 4;
};

struct GPUBindGroupLayoutBinding {
    enum class BindingType {
        UniformBuffer,
        Sampler,
        SampledTexture,
        StorageBuffer
    };

    unsigned long binding;
    GPUShaderStageFlags visibility;
    BindingType type;
};

} // namespace WebCore

#endif // ENABLE(WEBGPU)



/*
 * Copyright (C) 2018 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#if ENABLE(WEBGPU)

#include "GPUBindGroupLayoutBinding.h"

#include <wtf/Vector.h>

namespace WebCore {

struct GPUBindGroupLayoutDescriptor {
    Vector<GPUBindGroupLayoutBinding> bindings;
};

} // namespace WebCore

#endif // ENABLE(WEBGPU)


Lines 85-107 public: a/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.h_sec1
- a/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.h -4 / +13 lines
85		85
86	PlatformCommandBuffer* platformCommandBuffer() const { return m_platformCommandBuffer.get(); }	86	PlatformCommandBuffer* platformCommandBuffer() const { return m_platformCommandBuffer.get(); }
87	const Vector<Ref<GPUBuffer>>& usedBuffers() const { return m_usedBuffers; }	87	const Vector<Ref<GPUBuffer>>& usedBuffers() const { return m_usedBuffers; }
		88	const Vector<Ref<GPUTexture>>& usedTextures() const { return m_usedTextures; }
		89	bool isEncodingPass() const { return m_isEncodingPass; }
		90
		91	void setIsEncodingPass(bool isEncoding) { m_isEncodingPass = isEncoding; }
88	#if USE(METAL)	92	#if USE(METAL)
89	MTLBlitCommandEncoder *blitEncoder() const;	93	~GPUCommandBuffer();
		94	void endBlitEncoding();
90	#endif	95	#endif
91		96
92	void copyBufferToBuffer(Ref<GPUBuffer>&&, unsigned long srcOffset, Ref<GPUBuffer>&&, unsigned long dstOffset, unsigned long size);	97	void copyBufferToBuffer(Ref<GPUBuffer>&&, unsigned long srcOffset, Ref<GPUBuffer>&&, unsigned long dstOffset, unsigned long size);
93	void copyBufferToTexture(const GPUBufferCopyView&, const GPUTextureCopyView&, const GPUExtent3D&);	98	void copyBufferToTexture(GPUBufferCopyView&&, GPUTextureCopyView&&, const GPUExtent3D&);
94	void copyTextureToBuffer(const GPUTextureCopyView&, const GPUBufferCopyView&, const GPUExtent3D&);	99	void copyTextureToBuffer(GPUTextureCopyView&&, GPUBufferCopyView&&, const GPUExtent3D&);
95	void copyTextureToTexture(const GPUTextureCopyView&, const GPUTextureCopyView&, const GPUExtent3D&);	100	void copyTextureToTexture(GPUTextureCopyView&&, GPUTextureCopyView&&, const GPUExtent3D&);
96		101
97	void useBuffer(Ref<GPUBuffer>&& buffer) { m_usedBuffers.append(WTFMove(buffer)); }	102	void useBuffer(Ref<GPUBuffer>&& buffer) { m_usedBuffers.append(WTFMove(buffer)); }
		103	void useTexture(Ref<GPUTexture>&& texture) { m_usedTextures.append(WTFMove(texture)); }
98		104
99	private:	105	private:
100	GPUCommandBuffer(PlatformCommandBufferSmartPtr&&);	106	GPUCommandBuffer(PlatformCommandBufferSmartPtr&&);
101		107
102	PlatformCommandBufferSmartPtr m_platformCommandBuffer;	108	PlatformCommandBufferSmartPtr m_platformCommandBuffer;
103	Vector<Ref<GPUBuffer>> m_usedBuffers;	109	Vector<Ref<GPUBuffer>> m_usedBuffers;
		110	Vector<Ref<GPUTexture>> m_usedTextures;
		111	bool m_isEncodingPass = false;
104	#if USE(METAL)	112	#if USE(METAL)
		113	MTLBlitCommandEncoder *blitEncoder() const;
105	mutable RetainPtr<MTLBlitCommandEncoder> m_blitEncoder;	114	mutable RetainPtr<MTLBlitCommandEncoder> m_blitEncoder;
106	#endif	115	#endif
107	};	116	};



    return GPUTexture::tryCreate(*this, WTFMove(descriptor));
}

RefPtr<GPUBindGroupLayout> GPUDevice::tryCreateBindGroupLayout(const GPUBindGroupLayoutDescriptor& descriptor) const
{
    return GPUBindGroupLayout::tryCreate(*this, descriptor);
}

Ref<GPUPipelineLayout> GPUDevice::createPipelineLayout(GPUPipelineLayoutDescriptor&& descriptor) const

Lines 63-69 public: a/Source/WebCore/platform/graphics/gpu/GPUDevice.h_sec1
- a/Source/WebCore/platform/graphics/gpu/GPUDevice.h -1 / +1 lines
63	RefPtr<GPUBuffer> tryCreateBuffer(GPUBufferDescriptor&&);	63	RefPtr<GPUBuffer> tryCreateBuffer(GPUBufferDescriptor&&);
64	RefPtr<GPUTexture> tryCreateTexture(GPUTextureDescriptor&&) const;	64	RefPtr<GPUTexture> tryCreateTexture(GPUTextureDescriptor&&) const;
65		65
66	RefPtr<GPUBindGroupLayout> tryCreateBindGroupLayout(GPUBindGroupLayoutDescriptor&&) const;	66	RefPtr<GPUBindGroupLayout> tryCreateBindGroupLayout(const GPUBindGroupLayoutDescriptor&) const;
67	Ref<GPUPipelineLayout> createPipelineLayout(GPUPipelineLayoutDescriptor&&) const;	67	Ref<GPUPipelineLayout> createPipelineLayout(GPUPipelineLayoutDescriptor&&) const;
68		68
69	RefPtr<GPUShaderModule> createShaderModule(GPUShaderModuleDescriptor&&) const;	69	RefPtr<GPUShaderModule> createShaderModule(GPUShaderModuleDescriptor&&) const;

Lines 36-42 Ref<GPUPipelineLayout> GPUPipelineLayout::create(GPUPipelineLayoutDescriptor&& d a/Source/WebCore/platform/graphics/gpu/GPUPipelineLayout.cpp_sec1
- a/Source/WebCore/platform/graphics/gpu/GPUPipelineLayout.cpp -1 / +1 lines
36	}	36	}
37		37
38	GPUPipelineLayout::GPUPipelineLayout(GPUPipelineLayoutDescriptor&& descriptor)	38	GPUPipelineLayout::GPUPipelineLayout(GPUPipelineLayoutDescriptor&& descriptor)
39	: m_bindGroupLayouts(descriptor.bindGroupLayouts)	39	: m_bindGroupLayouts(WTFMove(descriptor.bindGroupLayouts))
40	{	40	{
41	}	41	}
42		42

Lines 35-40 namespace WebCore { a/Source/WebCore/platform/graphics/gpu/GPUProgrammablePassEncoder.cpp_sec1
- a/Source/WebCore/platform/graphics/gpu/GPUProgrammablePassEncoder.cpp +1 lines
35	GPUProgrammablePassEncoder::GPUProgrammablePassEncoder(Ref<GPUCommandBuffer>&& commandBuffer)	35	GPUProgrammablePassEncoder::GPUProgrammablePassEncoder(Ref<GPUCommandBuffer>&& commandBuffer)
36	: m_commandBuffer(WTFMove(commandBuffer))	36	: m_commandBuffer(WTFMove(commandBuffer))
37	{	37	{
		38	m_commandBuffer->setIsEncodingPass(true);
38	}	39	}
39		40
40	} // namespace WebCore	41	} // namespace WebCore



public:
    virtual ~GPUProgrammablePassEncoder() = default;

    virtual void endPass();
    void setBindGroup(unsigned, GPUBindGroup&);
    virtual void setPipeline(Ref<GPURenderPipeline>&&) = 0;

protected:
    GPUProgrammablePassEncoder(Ref<GPUCommandBuffer>&&);
    virtual PlatformProgrammablePassEncoder* platformPassEncoder() const = 0;

    GPUCommandBuffer& commandBuffer() const { return m_commandBuffer.get(); }
    virtual PlatformProgrammablePassEncoder* platformPassEncoder() const = 0;

private:
#if USE(METAL)
    void setResourceAsBufferOnEncoder(MTLArgumentEncoder *, const GPUBindingResource&, unsigned, const char* const);
    void setResourceAsTextureOnEncoder(MTLArgumentEncoder *, const GPUBindingResource&, unsigned, const char* const);
    virtual void useResource(MTLResource *, unsigned) = 0;

    // Render command encoder methods.
    virtual void setVertexBuffer(MTLBuffer *, unsigned, unsigned) { }
    virtual void setFragmentBuffer(MTLBuffer *, unsigned, unsigned) { }
#endif // USE(METAL)

    Ref<GPUCommandBuffer> m_commandBuffer;
    bool m_isEncoding { true };
};

} // namespace WebCore

Lines 48-54 public: a/Source/WebCore/platform/graphics/gpu/GPUQueue.h_sec1
- a/Source/WebCore/platform/graphics/gpu/GPUQueue.h -1 / +1 lines
48		48
49	PlatformQueue* platformQueue() const { return m_platformQueue.get(); }	49	PlatformQueue* platformQueue() const { return m_platformQueue.get(); }
50		50
51	void submit(Vector<Ref<const GPUCommandBuffer>>&&);	51	void submit(Vector<Ref<GPUCommandBuffer>>&&);
52		52
53	String label() const;	53	String label() const;
54	void setLabel(const String&) const;	54	void setLabel(const String&) const;



public:
    static RefPtr<GPURenderPassEncoder> tryCreate(Ref<GPUCommandBuffer>&&, GPURenderPassDescriptor&&);

    void endPass() final;
    void setPipeline(Ref<GPURenderPipeline>&&) final;

    void setVertexBuffers(unsigned long, Vector<Ref<GPUBuffer>>&&, Vector<unsigned long long>&&);


#if USE(METAL)
    // GPUProgrammablePassEncoder
    void useResource(MTLResource *, unsigned usage) final;
    void setVertexBuffer(MTLBuffer *, unsigned offset, unsigned index) final;
    void setFragmentBuffer(MTLBuffer *, unsigned offset, unsigned index) final;
#endif // USE(METAL)

    PlatformRenderPassEncoderSmartPtr m_platformRenderPassEncoder;



    bool isTransferSource() const { return m_usage.contains(GPUTextureUsage::Flags::TransferSource); }
    bool isTransferDestination() const { return m_usage.contains(GPUTextureUsage::Flags::TransferDestination); }
    bool isOutputAttachment() const { return m_usage.contains(GPUTextureUsage::Flags::OutputAttachment); }
    bool isReadOnly() const { return m_usage.containsAny({ GPUTextureUsage::Flags::TransferSource, GPUTextureUsage::Flags::Sampled }); }

    RefPtr<GPUTexture> tryCreateDefaultTextureView();
    void destroy() { m_platformTexture = nullptr; }

private:
    explicit GPUTexture(PlatformTextureSmartPtr&&, OptionSet<GPUTextureUsage::Flags>);



    case GPUBindGroupLayoutBinding::BindingType::SampledTexture:
        return MTLDataTypeTexture;
    case GPUBindGroupLayoutBinding::BindingType::UniformBuffer:
    case GPUBindGroupLayoutBinding::BindingType::DynamicUniformBuffer:
    case GPUBindGroupLayoutBinding::BindingType::StorageBuffer:
    case GPUBindGroupLayoutBinding::BindingType::DynamicStorageBuffer:
        return MTLDataTypePointer;
    }
}

    return args;
};

RefPtr<GPUBindGroupLayout> GPUBindGroupLayout::tryCreate(const GPUDevice& device, const GPUBindGroupLayoutDescriptor& descriptor)
{
    if (!device.platformDevice()) {
        LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Invalid MTLDevice!");


    for (const auto& binding : descriptor.bindings) {
        if (!bindingsMap.add(binding.binding, binding)) {
            LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Duplicate binding %lu found in GPUBindGroupLayoutDescriptor!", binding.binding);
            return nullptr;
        }


        mtlArgument.get().dataType = MTLDataTypeForBindingType(binding.type);
        mtlArgument.get().index = binding.binding;

        if (binding.visibility & GPUShaderStageBit::Flags::Vertex)
            appendArgumentToArray(vertexArgsArray, mtlArgument);
        if (binding.visibility & GPUShaderStageBit::Flags::Fragment)
            appendArgumentToArray(fragmentArgsArray, mtlArgument);
        if (binding.visibility & GPUShaderStageBit::Flags::Compute)
            appendArgumentToArray(computeArgsArray, mtlArgument);
    }





    BEGIN_BLOCK_OBJC_EXCEPTIONS;

    buffer = [mtlQueue commandBuffer];

    END_BLOCK_OBJC_EXCEPTIONS;


{
}

GPUCommandBuffer::~GPUCommandBuffer()
{
    endBlitEncoding();
}

MTLBlitCommandEncoder *GPUCommandBuffer::blitEncoder() const
{
    return m_blitEncoder ? m_blitEncoder.get() : (m_blitEncoder = [m_platformCommandBuffer blitCommandEncoder]).get();
}

void GPUCommandBuffer::endBlitEncoding()
{
    if (!m_blitEncoder)
        return;
    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    [m_blitEncoder endEncoding];
    END_BLOCK_OBJC_EXCEPTIONS;
    m_blitEncoder = nullptr;
}

void GPUCommandBuffer::copyBufferToBuffer(Ref<GPUBuffer>&& src, unsigned long srcOffset, Ref<GPUBuffer>&& dst, unsigned long dstOffset, unsigned long size)
{
    if (!src->isTransferSource() || !dst->isTransferDestination()) {

    useBuffer(WTFMove(dst));
}

void GPUCommandBuffer::copyBufferToTexture(GPUBufferCopyView&& srcBuffer, GPUTextureCopyView&& dstTexture, const GPUExtent3D& size)
{
    if (!srcBuffer.buffer->isTransferSource() || !dstTexture.texture->isTransferDestination()) {
        LOG(WebGPU, "GPUComandBuffer::copyBufferToTexture(): Invalid operation!");


    END_BLOCK_OBJC_EXCEPTIONS;

    useBuffer(WTFMove(srcBuffer.buffer));
    useTexture(WTFMove(dstTexture.texture));
}

void GPUCommandBuffer::copyTextureToBuffer(GPUTextureCopyView&& srcTexture, GPUBufferCopyView&& dstBuffer, const GPUExtent3D& size)
{
    if (!srcTexture.texture->isTransferSource() || !dstBuffer.buffer->isTransferDestination()) {
        LOG(WebGPU, "GPUCommandBuffer::copyTextureToBuffer(): Invalid operation!");


    END_BLOCK_OBJC_EXCEPTIONS;

    useTexture(WTFMove(srcTexture.texture));
    useBuffer(WTFMove(dstBuffer.buffer));
}

void GPUCommandBuffer::copyTextureToTexture(GPUTextureCopyView&& src, GPUTextureCopyView&& dst, const GPUExtent3D& size)
{
    if (!src.texture->isTransferSource() || !dst.texture->isTransferDestination()) {
        LOG(WebGPU, "GPUCommandBuffer::copyTextureToTexture(): Invalid operation!");

        destinationOrigin:MTLOriginMake(dst.origin.x, dst.origin.y, dst.origin.z)];

    END_BLOCK_OBJC_EXCEPTIONS;

    useTexture(WTFMove(src.texture));
    useTexture(WTFMove(dst.texture));
}

} // namespace WebCore




RefPtr<GPUDevice> GPUDevice::create(Optional<GPURequestAdapterOptions>&& options)
{
    RetainPtr<MTLDevice> devicePtr;

    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    

        
        for (id <MTLDevice> device : devices.get()) {
            if (device.lowPower) {
                devicePtr = device;
                break;
            }
        }

    return adoptRef(new GPUDevice(WTFMove(devicePtr)));
}

GPUDevice::GPUDevice(RetainPtr<MTLDevice>&& device)
    : m_platformDevice(WTFMove(device))
{
}




void GPUProgrammablePassEncoder::endPass()
{
    ASSERT(platformPassEncoder());
        return;

    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    [platformPassEncoder() endEncoding];
    END_BLOCK_OBJC_EXCEPTIONS;

    m_commandBuffer->setIsEncodingPass(false);
}

void GPUProgrammablePassEncoder::setBindGroup(unsigned index, GPUBindGroup& bindGroup)
{
    const char* const functionName = "GPUProgrammablePassEncoder::setBindGroup()";

    if (!platformPassEncoder()) {
        LOG(WebGPU, "%s: Invalid operation: Encoding is ended!");
        return;
    }

    const auto& vertexArgs = bindGroup.layout().vertexArguments();
    const auto& fragmentArgs = bindGroup.layout().fragmentArguments();
    // FIXME: Finish support for compute.

    BEGIN_BLOCK_OBJC_EXCEPTIONS;

    if (vertexArgs.buffer)
        setVertexBuffer(vertexArgs.buffer.get(), 0, index);
    if (fragmentArgs.buffer)
        setFragmentBuffer(fragmentArgs.buffer.get(), 0, index);

    END_BLOCK_OBJC_EXCEPTIONS;

    // Set each resource on each MTLArgumentEncoder it should be visible on.
    const auto& bindingsMap = bindGroup.layout().bindingsMap();
    for (const auto& binding : bindGroup.bindings()) {
        auto iterator = bindingsMap.find(binding.binding);
        if (iterator == bindingsMap.end()) {
            LOG(WebGPU, "%s: GPUBindGroupBinding %lu not found in GPUBindGroupLayout!", functionName, binding.binding);
            return;
        }
        auto bindGroupLayoutBinding = iterator->value;

        switch (bindGroupLayoutBinding.type) {
        // FIXME: Support more resource types.
        case GPUBindGroupLayoutBinding::BindingType::UniformBuffer:
        case GPUBindGroupLayoutBinding::BindingType::StorageBuffer: {
            if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::Flags::Vertex)
                setResourceAsBufferOnEncoder(vertexArgs.encoder.get(), binding.resource, binding.binding, functionName);
            if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::Flags::Fragment)
                setResourceAsBufferOnEncoder(fragmentArgs.encoder.get(), binding.resource, binding.binding, functionName);
            break;
        }
        case GPUBindGroupLayoutBinding::BindingType::SampledTexture: {
            if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::Flags::Vertex)
                setResourceAsTextureOnEncoder(vertexArgs.encoder.get(), binding.resource, binding.binding, functionName);
            if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::Flags::Fragment)
                setResourceAsTextureOnEncoder(fragmentArgs.encoder.get(), binding.resource, binding.binding, functionName);
            break;
        }
        default:
            LOG(WebGPU, "%s: Resource type not yet implemented.", functionName);
            return;
        }
    }
}

void GPUProgrammablePassEncoder::setResourceAsBufferOnEncoder(MTLArgumentEncoder *argumentEncoder, const GPUBindingResource& resource, unsigned index, const char* const functionName)
{
#if LOG_DISABLED
    UNUSED_PARAM(functionName);

    m_commandBuffer->useBuffer(bufferRef.copyRef());
}

void GPUProgrammablePassEncoder::setResourceAsTextureOnEncoder(MTLArgumentEncoder *argumentEncoder, const GPUBindingResource& resource, unsigned index, const char* const functionName)
{
    const char* const functionName = "GPUProgrammablePassEncoder::setBindGroup()";
#if LOG_DISABLED
    UNUSED_PARAM(functionName);
#endif
    if (!argumentEncoder) {
        LOG(WebGPU, "%s: No argument encoder for requested stage found!", functionName);
        return;
    }

    if (!WTF::holds_alternative<Ref<GPUTexture>>(resource)) {
        LOG(WebGPU, "%s: Resource is not a texture type!", functionName);
        return;
    }

    auto& textureRef = WTF::get<Ref<GPUTexture>>(resource);
    auto mtlTexture = textureRef->platformTexture();

    if (!mtlTexture) {
        LOG(WebGPU, "%s: Invalid MTLTexture in GPUTextureView binding!", functionName);
        return;
    }

    BEGIN_BLOCK_OBJC_EXCEPTIONS;

    [argumentEncoder setTexture:mtlTexture atIndex:index];
    useResource(mtlTexture, textureRef->isReadOnly() ? MTLResourceUsageRead : MTLResourceUsageRead | MTLResourceUsageWrite);
    if (fragmentArgs.buffer)
        setFragmentBuffer(fragmentArgs.buffer.get(), 0, index);

    END_BLOCK_OBJC_EXCEPTIONS;

    m_commandBuffer->useTexture(textureRef.copyRef());
    const auto& bindingsMap = bindGroup.layout().bindingsMap();
    for (const auto& binding : bindGroup.bindings()) {
        auto iterator = bindingsMap.find(binding.binding);
        if (iterator == bindingsMap.end()) {
            LOG(WebGPU, "%s: GPUBindGroupBinding %lu not found in GPUBindGroupLayout!", functionName, binding.binding);
            return;
        }
        auto bindGroupLayoutBinding = iterator->value;

        switch (bindGroupLayoutBinding.type) {
        // FIXME: Support more resource types.
        case GPUBindGroupLayoutBinding::BindingType::UniformBuffer:
        case GPUBindGroupLayoutBinding::BindingType::StorageBuffer: {
            if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::VERTEX)
                setResourceAsBufferOnEncoder(vertexArgs.encoder.get(), binding.resource, binding.binding, functionName);
            if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::FRAGMENT)
                setResourceAsBufferOnEncoder(fragmentArgs.encoder.get(), binding.resource, binding.binding, functionName);
            break;
        }
        default:
            LOG(WebGPU, "%s: Resource type not yet implemented.", functionName);
            return;
        }
    }
}

} // namespace WebCore



{
}

void GPUQueue::submit(Vector<Ref<GPUCommandBuffer>>&& commandBuffers)
{
    BEGIN_BLOCK_OBJC_EXCEPTIONS;

    for (auto& commandBuffer : commandBuffers) {
        commandBuffer->endBlitEncoding();
            [commandBuffer->blitEncoder() endEncoding];
        // Prevent any buffer mapping callbacks from executing until command buffer is complete.
        for (auto& buffer : commandBuffer->usedBuffers()) {
            if (buffer->state() != GPUBuffer::State::Unmapped) {

            }
            buffer->commandBufferCommitted(commandBuffer->platformCommandBuffer());
        }
        // Also ensure textures are still valid.
        for (auto& texture : commandBuffer->usedTextures()) {
            if (!texture->platformTexture()) {
                LOG(WebGPU, "GPUQueue::submit(): Invalid GPUTexture set on a GPUCommandBuffer!");
                return;
            }
        }

        [commandBuffer->platformCommandBuffer() commit];
    }

Lines 117-122 RefPtr<GPURenderPassEncoder> GPURenderPassEncoder::tryCreate(Ref<GPUCommandBuffe a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm_sec1
- a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm -6 / +57 lines
117	{	117	{
118	const char* const functionName = "GPURenderPassEncoder::tryCreate()";	118	const char* const functionName = "GPURenderPassEncoder::tryCreate()";
119		119
		120	// Only one command encoder may be active at a time.
		121	if (buffer->isEncodingPass()) {
		122	LOG(WebGPU, "%s: Existing pass encoder must be ended first!");
		123	return nullptr;
		124	}
		125
120	RetainPtr<MTLRenderPassDescriptor> mtlDescriptor;	126	RetainPtr<MTLRenderPassDescriptor> mtlDescriptor;
121		127
122	BEGIN_BLOCK_OBJC_EXCEPTIONS;	128	BEGIN_BLOCK_OBJC_EXCEPTIONS;
Lines 137-147 RefPtr<GPURenderPassEncoder> GPURenderPassEncoder::tryCreate(Ref<GPUCommandBuffe a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm_sec2
137	&& !populateMtlDepthStencilAttachment(mtlDescriptor.get().depthAttachment, *descriptor.depthStencilAttachment, functionName))	143	&& !populateMtlDepthStencilAttachment(mtlDescriptor.get().depthAttachment, *descriptor.depthStencilAttachment, functionName))
138	return nullptr;	144	return nullptr;
139		145
		146	buffer->endBlitEncoding();
		147
140	RetainPtr<MTLRenderCommandEncoder> mtlEncoder;	148	RetainPtr<MTLRenderCommandEncoder> mtlEncoder;
141		149
142	BEGIN_BLOCK_OBJC_EXCEPTIONS;	150	BEGIN_BLOCK_OBJC_EXCEPTIONS;
143		151
144	mtlEncoder = retainPtr([buffer->platformCommandBuffer() renderCommandEncoderWithDescriptor:mtlDescriptor.get()]);	152	mtlEncoder = [buffer->platformCommandBuffer() renderCommandEncoderWithDescriptor:mtlDescriptor.get()];
145		153
146	END_BLOCK_OBJC_EXCEPTIONS;	154	END_BLOCK_OBJC_EXCEPTIONS;
147		155
Lines 149-155 RefPtr<GPURenderPassEncoder> GPURenderPassEncoder::tryCreate(Ref<GPUCommandBuffe a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm_sec3
149	LOG(WebGPU, "%s: Unable to create MTLRenderCommandEncoder!", functionName);	157	LOG(WebGPU, "%s: Unable to create MTLRenderCommandEncoder!", functionName);
150	return nullptr;	158	return nullptr;
151	}	159	}
152		160
153	return adoptRef(new GPURenderPassEncoder(WTFMove(buffer), WTFMove(mtlEncoder)));	161	return adoptRef(new GPURenderPassEncoder(WTFMove(buffer), WTFMove(mtlEncoder)));
154	}	162	}
155		163
Lines 159-171 GPURenderPassEncoder::GPURenderPassEncoder(Ref<GPUCommandBuffer>&& commandBuffer a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm_sec4
159	{	167	{
160	}	168	}
161		169
162	PlatformProgrammablePassEncoder *GPURenderPassEncoder::platformPassEncoder() const	170	MTLCommandEncoder *GPURenderPassEncoder::platformPassEncoder() const
163	{	171	{
164	return m_platformRenderPassEncoder.get();	172	return m_platformRenderPassEncoder.get();
165	}	173	}
166		174
		175	void GPURenderPassEncoder::endPass()
		176	{
		177	if (!m_platformRenderPassEncoder)
		178	return;
		179	GPUProgrammablePassEncoder::endPass();
		180	m_platformRenderPassEncoder = nullptr;
		181	}
		182
167	void GPURenderPassEncoder::setPipeline(Ref<GPURenderPipeline>&& pipeline)	183	void GPURenderPassEncoder::setPipeline(Ref<GPURenderPipeline>&& pipeline)
168	{	184	{
		185	if (!m_platformRenderPassEncoder) {
		186	LOG(WebGPU, "GPURenderPassEncoder::setPipeline(): Invalid operation: Encoding is ended!");
		187	return;
		188	}
		189
169	BEGIN_BLOCK_OBJC_EXCEPTIONS;	190	BEGIN_BLOCK_OBJC_EXCEPTIONS;
170		191
171	if (pipeline->depthStencilState())	192	if (pipeline->depthStencilState())
Lines 180-185 void GPURenderPassEncoder::setPipeline(Ref<GPURenderPipeline>&& pipeline) a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm_sec5
180		201
181	void GPURenderPassEncoder::setVertexBuffers(unsigned long index, Vector<Ref<GPUBuffer>>&& buffers, Vector<unsigned long long>&& offsets)	202	void GPURenderPassEncoder::setVertexBuffers(unsigned long index, Vector<Ref<GPUBuffer>>&& buffers, Vector<unsigned long long>&& offsets)
182	{	203	{
		204	if (!m_platformRenderPassEncoder) {
		205	LOG(WebGPU, "GPURenderPassEncoder::setVertexBuffers(): Invalid operation: Encoding is ended!");
		206	return;
		207	}
		208
183	ASSERT(buffers.size() && offsets.size() == buffers.size());	209	ASSERT(buffers.size() && offsets.size() == buffers.size());
184		210
185	BEGIN_BLOCK_OBJC_EXCEPTIONS;	211	BEGIN_BLOCK_OBJC_EXCEPTIONS;
Lines 214-219 static MTLPrimitiveType primitiveTypeForGPUPrimitiveTopology(PrimitiveTopology t a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm_sec6
214		240
215	void GPURenderPassEncoder::draw(unsigned long vertexCount, unsigned long instanceCount, unsigned long firstVertex, unsigned long firstInstance)	241	void GPURenderPassEncoder::draw(unsigned long vertexCount, unsigned long instanceCount, unsigned long firstVertex, unsigned long firstInstance)
216	{	242	{
		243	if (!m_platformRenderPassEncoder) {
		244	LOG(WebGPU, "GPURenderPassEncoder::draw(): Invalid operation: Encoding is ended!");
		245	return;
		246	}
		247
		248	if (!m_pipeline) {
		249	LOG(WebGPU, "GPURenderPassEncoder::draw(): No valid GPURenderPipeline found!");
		250	return;
		251	}
		252
217	[m_platformRenderPassEncoder	253	[m_platformRenderPassEncoder
218	drawPrimitives:primitiveTypeForGPUPrimitiveTopology(m_pipeline->primitiveTopology())	254	drawPrimitives:primitiveTypeForGPUPrimitiveTopology(m_pipeline->primitiveTopology())
219	vertexStart:firstVertex	255	vertexStart:firstVertex
Lines 224-241 void GPURenderPassEncoder::draw(unsigned long vertexCount, unsigned long instanc a/Source/WebCore/platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm_sec7
224		260
225	#if USE(METAL)	261	#if USE(METAL)
226		262
227	void GPURenderPassEncoder::useResource(MTLResource *resource, unsigned long usage)	263	void GPURenderPassEncoder::useResource(MTLResource *resource, unsigned usage)
228	{	264	{
		265	if (!m_platformRenderPassEncoder) {
		266	LOG(WebGPU, "GPURenderPassEncoder: Invalid operation: Encoding is ended!");
		267	return;
		268	}
		269
229	[m_platformRenderPassEncoder useResource:resource usage:usage];	270	[m_platformRenderPassEncoder useResource:resource usage:usage];
230	}	271	}
231		272
232	void GPURenderPassEncoder::setVertexBuffer(MTLBuffer *buffer, unsigned long offset, unsigned long index)	273	void GPURenderPassEncoder::setVertexBuffer(MTLBuffer *buffer, unsigned offset, unsigned index)
233	{	274	{
		275	if (!m_platformRenderPassEncoder) {
		276	LOG(WebGPU, "GPURenderPassEncoder: Invalid operation: Encoding is ended!");
		277	return;
		278	}
		279
234	[m_platformRenderPassEncoder setVertexBuffer:buffer offset:offset atIndex:index];	280	[m_platformRenderPassEncoder setVertexBuffer:buffer offset:offset atIndex:index];
235	}	281	}
236		282
237	void GPURenderPassEncoder::setFragmentBuffer(MTLBuffer *buffer, unsigned long offset, unsigned long index)	283	void GPURenderPassEncoder::setFragmentBuffer(MTLBuffer *buffer, unsigned offset, unsigned index)
238	{	284	{
		285	if (!m_platformRenderPassEncoder) {
		286	LOG(WebGPU, "GPURenderPassEncoder: Invalid operation: Encoding is ended!");
		287	return;
		288	}
		289
239	[m_platformRenderPassEncoder setFragmentBuffer:buffer offset:offset atIndex:index];	290	[m_platformRenderPassEncoder setFragmentBuffer:buffer offset:offset atIndex:index];
240	}	291	}
241		292

Lines 108-114 RefPtr<GPUTexture> GPUSwapChain::getNextTexture() a/Source/WebCore/platform/graphics/gpu/cocoa/GPUSwapChainMetal.mm_sec1
- a/Source/WebCore/platform/graphics/gpu/cocoa/GPUSwapChainMetal.mm -1 / +1 lines
108	BEGIN_BLOCK_OBJC_EXCEPTIONS;	108	BEGIN_BLOCK_OBJC_EXCEPTIONS;
109		109
110	m_currentDrawable = retainPtr([m_platformSwapLayer nextDrawable]);	110	m_currentDrawable = retainPtr([m_platformSwapLayer nextDrawable]);
111	mtlTexture = retainPtr([m_currentDrawable texture]);	111	mtlTexture = [m_currentDrawable texture];
112		112
113	END_BLOCK_OBJC_EXCEPTIONS;	113	END_BLOCK_OBJC_EXCEPTIONS;
114		114



    return MTLTextureUsageUnknown;
}

#if !PLATFORM(MAC)
static MTLStorageMode storageModeForPixelFormatAndSampleCount(MTLPixelFormat format, unsigned long samples)
{
    // Depth, Stencil, DepthStencil, and Multisample textures must be allocated with the MTLStorageModePrivate resource option.
    if (format == MTLPixelFormatDepth32Float_Stencil8 || samples > 1)
        return MTLStorageModePrivate;

#if PLATFORM(MAC)
    return MTLStorageModeManaged;
#else
    return MTLStorageModeShared;
#endif
}
#endif

static RetainPtr<MTLTextureDescriptor> tryCreateMtlTextureDescriptor(const char* const functionName, const GPUTextureDescriptor& descriptor, OptionSet<GPUTextureUsage::Flags> usage)
{

    if (!mtlUsage)
        return nullptr;

#if PLATFORM(MAC)
    auto storageMode = MTLStorageModePrivate;
#else
    auto storageMode = storageModeForPixelFormatAndSampleCount(pixelFormat, descriptor.sampleCount);
#endif

    BEGIN_BLOCK_OBJC_EXCEPTIONS;


    return adoptRef(new GPUTexture(WTFMove(mtlTexture), usage));
}

Ref<GPUTexture> GPUTexture::create(RetainPtr<MTLTexture>&& texture, OptionSet<GPUTextureUsage::Flags> usage)
{
    return adoptRef(*new GPUTexture(WTFMove(texture), usage));
}

GPUTexture::GPUTexture(RetainPtr<MTLTexture>&& texture, OptionSet<GPUTextureUsage::Flags> usage)
    : m_platformTexture(WTFMove(texture))
    , m_usage(usage)
{
}

RefPtr<GPUTexture> GPUTexture::tryCreateDefaultTextureView()
{
    RetainPtr<MTLTexture> texture;




2019-03-05  Justin Fan  <justin_fan@apple.com>

        [Web GPU] GPUTexture and GPUTextureView updates, and related GPUBindGroup updates
        https://bugs.webkit.org/show_bug.cgi?id=195347

        Reviewed by NOBODY (OOPS!).

        * webgpu/blit-commands.html:
        * webgpu/resources/blue-checkered.png: Added.
        * webgpu/texture-triangle-strip-expected.html: Added. Draw a reference for blue-checkered.png with Canvas2D.
        * webgpu/texture-triangle-strip.html: Added. Draw blue-checkered.png as a texture on a Web GPU quad.

        Renaming updates, no change in behavior:
        * webgpu/bind-groups.html:
        * webgpu/buffer-resource-triangles.html:
        * webgpu/pipeline-layouts.html:
        * webgpu/render-pipelines.html:

2019-03-04  Justin Fan  <justin_fan@apple.com>

        [Web GPU] Blitting function prototypes



    // FIXME: Also test sampled texture bindings. 
    const bufferLayoutBinding = {
        binding: 1,
        visibility: GPUShaderStageBit.VERTEX,
        type: "storage-buffer"
    };

    const bindGroupLayout = device.createBindGroupLayout({ bindings: [bufferLayoutBinding] });

Lines 91-96 async function test(image) { a/LayoutTests/webgpu/blit-commands.html_sec1
- a/LayoutTests/webgpu/blit-commands.html -1 / +5 lines
91	commandBuffer.copyTextureToTexture(textureViewA, textureViewB, textureSize);	91	commandBuffer.copyTextureToTexture(textureViewA, textureViewB, textureSize);
92	commandBuffer.copyTextureToBuffer(textureViewB, readBufferView, textureSize);	92	commandBuffer.copyTextureToBuffer(textureViewB, readBufferView, textureSize);
93	device.getQueue().submit([commandBuffer]);	93	device.getQueue().submit([commandBuffer]);
		94	bufferA.destroy();
		95	bufferB.destroy();
		96	textureA.destroy();
		97	textureB.destroy();
94		98
95	const resultContext = document.querySelector('canvas').getContext('2d');	99	const resultContext = document.querySelector('canvas').getContext('2d');
96		100
Lines 100-106 async function test(image) { a/LayoutTests/webgpu/blit-commands.html_sec2
100		104
101	resultContext.putImageData(resultImageData, 0, 0);	105	resultContext.putImageData(resultImageData, 0, 0);
102		106
103	readBuffer.unmap();	107	readBuffer.destroy();
104	});	108	});
105		109
106	if (window.testRunner)	110	if (window.testRunner)



    G: 5
};

function createUniformBufferBindGroupLayout(bindNum, stage = GPUShaderStageBit.VERTEX) {
    return {
        binding: bindNum,
        visibility: stage,
        type: "uniform-buffer"
    };
}


    const layoutUR = createUniformBufferBindGroupLayout(bindingNums.UR);
    const layoutLL = createUniformBufferBindGroupLayout(bindingNums.LL);
    const layoutLR = createUniformBufferBindGroupLayout(bindingNums.LR);
    const layoutG = createUniformBufferBindGroupLayout(bindingNums.G, GPUShaderStageBit.FRAGMENT);

    // WebGPUBindGroupLayouts
    const leftTriangleBGLayout = device.createBindGroupLayout({ bindings: [layoutUL, layoutUM, layoutLL, layoutG] });



function createBindGroupLayoutBinding() {
    return {
        binding: 0,
        visibility: GPUShaderStageBit.FRAGMENT | GPUShaderStageBit.VERTEX,
        type: "storage-buffer"
    };
}

test(() => {
    const bindGroupLayoutDescriptor = { bindings: [createBindGroupLayoutBinding()] };
    assert_not_equals(bindGroupLayoutDescriptor.bindings[0].visibility & GPUShaderStageBit.FRAGMENT, 0);
    assert_not_equals(bindGroupLayoutDescriptor.bindings[0].visibility & GPUShaderStageBit.VERTEX, 0);
    assert_equals(bindGroupLayoutDescriptor.bindings[0].type, "storage-buffer");
}, "Create a basic WebGPUBindGroupLayoutDescriptor."); 

promise_test(async () => {

Lines 43-49 promise_test(async () => { a/LayoutTests/webgpu/render-pipelines.html_sec1
- a/LayoutTests/webgpu/render-pipelines.html -1 / +1 lines
43	const device = await getBasicDevice();	43	const device = await getBasicDevice();
44	const shaderModule = device.createShaderModule({ code: shaderCode });	44	const shaderModule = device.createShaderModule({ code: shaderCode });
45		45
46	const layoutBinding = { binding: 0, visibility: WebGPUShaderStageBit.VERTEX, type: "storageBuffer" };	46	const layoutBinding = { binding: 0, visibility: GPUShaderStageBit.VERTEX, type: "storage-buffer" };
47	const bindGroupLayout = device.createBindGroupLayout({ bindings: [layoutBinding] });	47	const bindGroupLayout = device.createBindGroupLayout({ bindings: [layoutBinding] });
48	const pipelineLayout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] });	48	const pipelineLayout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] });
49		49



<!DOCTYPE html>
<meta charset="utf-8">
<title>HTML Reference File</title>
<p>Pass if square canvas below is a 4 by 4 blue/green checkerboard.</p>
<canvas width="400" height="400"></canvas>
<script>
const canvas = document.querySelector("canvas");
const context = canvas.getContext('2d');

context.fillStyle = 'rgb(0, 255, 0)';
context.fillRect(0, 0, canvas.width, canvas.height);

const numColumns = 4;
const numRows = 4;
context.beginPath();
context.fillStyle = 'rgb(0, 0, 255)';
for (let x = 0; x < numColumns; ++x) {
    for (let y = 0; y < numRows; ++y) {
        if (x % 2 == 0 && y % 2 == 0 || x % 2 == 1 && y % 2 == 1)
            context.rect(
                x * canvas.width / numColumns, 
                y * canvas.height / numRows, 
                canvas.width / numColumns, 
                canvas.height / numRows
                );
    }
}
context.fill();
</script>



<!DOCTYPE html>
<meta charset="utf-8">
<title>WebGPU Hello Triangles</title>
<meta name="assert" content="WebGPU correctly renders a green canvas.">
<link rel="match" href="vertex-buffer-triangle-strip-expected.html">
<p>Pass if square canvas below is a 4 by 4 blue/green checkerboard.</p>
<canvas width="400" height="400"></canvas>
<script src="js/webgpu-functions.js"></script>
<script>
if (window.testRunner)
    testRunner.waitUntilDone();

const shaderCode = `
#include <metal_stdlib>
    
using namespace metal;

struct VertexIn
{
    float4 position [[attribute(0)]];
    float2 texCoords [[attribute(1)]];
};

struct VertexOut
{
    float4 position [[position]];
    float2 texCoords;
};

vertex VertexOut vertex_main(VertexIn vertexIn [[stage_in]])
{
    VertexOut vOut;
    vOut.position = vertexIn.position;
    vOut.texCoords = vertexIn.texCoords;
    return vOut;
}

struct Texture
{
    texture2d<float> image [[id(0)]];
};

fragment float4 fragment_main(VertexOut v [[stage_in]], const device Texture& t [[buffer(0)]])
{
    constexpr sampler s(coord::normalized, address::clamp_to_zero, filter::nearest);
    return t.image.sample(s, v.texCoords);
}
`

function createInputStateDescriptor() {
    return {
        indexFormat: WebGPUIndexFormat.UINT32,
        attributes: [{
            shaderLocation: 0,
            inputSlot: 0,
            offset: 0,
            format: WebGPUVertexFormat.FLOAT_R32_G32_B32_A32
        }, {
            shaderLocation: 1,
            inputSlot: 1,
            offset: 0,
            format: WebGPUVertexFormat.FLOAT_R32_G32
        }],
        inputs: [{
            inputSlot: 0,
            stride: 4 * 4,
            stepMode: WebGPUInputStepMode.VERTEX
        }, {
            inputSlot: 1,
            stride: 4 * 2,
            stepMode: WebGPUInputStepMode.VERTEX
        }]
    }
}

async function test() {
    const device = await getBasicDevice();
    const canvas = document.querySelector("canvas");
    const context = createBasicContext(canvas, device);
    // FIXME: Replace with non-MSL shaders.
    const shaderModule = device.createShaderModule({ code: shaderCode });

    const vertexArray = new Float32Array([
        // float4 xyzw
        -1, 1, 0, 1,
        -1, -1, 0, 1,
        1, 1, 0, 1, 
        1, -1, 0, 1
    ]);
    const vertexBuffer = device.createBuffer({ size: vertexArray.byteLength, usage: GPUBufferUsage.VERTEX | GPUBufferUsage.TRANSFER_DST });
    vertexBuffer.setSubData(0, vertexArray.buffer);

    const textureCoordArray = new Float32Array([
        // float2 texCoords
        0, 0,
        0, 1,
        1, 0,
        1, 1
    ]);
    const textureCoordBuffer = device.createBuffer({ size: textureCoordArray.byteLength, usage: GPUBufferUsage.VERTEX | GPUBufferUsage.TRANSFER_DST });
    textureCoordBuffer.setSubData(0, textureCoordArray.buffer);

    const inputStateDescriptor = createInputStateDescriptor();

    // Load texture image
    const image = new Image();
    const imageLoadPromise = new Promise(resolve => { 
        image.onload = () => resolve(); 
        image.src = "resources/blue-checkered.png";
    });
    await Promise.resolve(imageLoadPromise);

    // Convert image to data and fill GPUBuffer
    const canvas2d = document.createElement("canvas");
    canvas2d.width = image.width;
    canvas2d.height = image.height;
    const context2d = canvas2d.getContext("2d");
    context2d.drawImage(image, 0, 0);
    const imageData = context2d.getImageData(0, 0, image.width, image.height);

    const textureBufferDescriptor = {
        size: imageData.data.length,
        usage: GPUBufferUsage.TRANSFER_SRC | GPUBufferUsage.TRANSFER_DST
    };
    const textureBuffer = device.createBuffer(textureBufferDescriptor);
    textureBuffer.setSubData(0, imageData.data.buffer);

    // Create GPUTexture
    const textureSize = {
        width: image.width,
        height: image.height,
        depth: 1
    };

    const textureDescriptor = {
        size: { width: image.width, height: image.height, depth: 1 },
        arrayLayerCount: 1,
        mipLevelCount: 1,
        sampleCount: 1,
        dimension: "2d",
        format: "r8g8b8a8-unorm",
        usage: GPUTextureUsage.TRANSFER_DST | GPUTextureUsage.SAMPLED
    };
    const texture = device.createTexture(textureDescriptor);

    // Bind texture to pipeline
    const textureBindingNum = 0;
    const bindGroupLayoutDescriptor = {
        bindings: [{ binding: textureBindingNum, visibility: GPUShaderStageBit.FRAGMENT, type: "sampled-texture" }]
    };
    bindGroupLayout = device.createBindGroupLayout(bindGroupLayoutDescriptor);
    const pipelineLayout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] });

    const bindGroupDescriptor = {
        layout: bindGroupLayout,
        bindings: [{ binding: textureBindingNum, resource: texture.createDefaultTextureView() }]
    };
    const bindGroup = device.createBindGroup(bindGroupDescriptor);

    // Pipeline and render
    const pipeline = createBasicPipeline(shaderModule, device, pipelineLayout, inputStateDescriptor);
    const commandBuffer = device.createCommandBuffer();

    const bufferCopyView = {
        buffer: textureBuffer,
        offset: 0,
        rowPitch: 0,
        imageHeight: 0
    };
    const textureCopyView = {
        texture: texture,
        mipLevel: 0,
        arrayLayer: 0,
        origin: { x: 0, y: 0, z: 0 }
    };
    commandBuffer.copyBufferToTexture(bufferCopyView, textureCopyView, textureSize);
    const passEncoder = beginBasicRenderPass(context, commandBuffer);
    passEncoder.setPipeline(pipeline);
    passEncoder.setBindGroup(0, bindGroup);
    passEncoder.setVertexBuffers(0, [vertexBuffer, textureCoordBuffer], [0, 0]);
    passEncoder.draw(4, 1, 0, 0);
    passEncoder.endPass();

    const queue = device.getQueue();
    queue.submit([commandBuffer]);
    vertexBuffer.destroy();
    textureCoordBuffer.destroy();
    texture.destroy();
    context.present();

    if (window.testRunner)
        testRunner.notifyDone();
}

test();
</script>

Return to Bug 195347

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +121 lines
		1	2019-03-05 Justin Fan <justin_fan@apple.com>
		2
		3	[Web GPU] GPUTexture and GPUTextureView updates, and related GPUBindGroup updates
		4	https://bugs.webkit.org/show_bug.cgi?id=195347
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Test: webgpu/texture-triangle-strip.html
		9
		10	* Modules/webgpu/WebGPUBindGroupDescriptor.cpp:
		11	(WebCore::WebGPUBindGroupDescriptor::asGPUBindGroupDescriptor const): Update to validate GPUTextureView resources.
		12	* Modules/webgpu/WebGPUCommandBuffer.cpp: Move instead of copy the converted view objects.
		13	(WebCore::WebGPUCommandBuffer::copyBufferToTexture):
		14	(WebCore::WebGPUCommandBuffer::copyTextureToBuffer):
		15	(WebCore::WebGPUCommandBuffer::copyTextureToTexture):
		16	* Modules/webgpu/WebGPUCommandBuffer.h:
		17	(WebCore::WebGPUCommandBuffer::commandBuffer const): No longer returns const so used resources can be registered on it.
		18	* Modules/webgpu/WebGPUDevice.cpp:
		19	(WebCore::WebGPUDevice::createBindGroupLayout const): Rename WebGPUBindGroupLayoutDescriptor and replace unnecessary rvalue reference.
		20	* Modules/webgpu/WebGPUDevice.h: Ditto.
		21	* Modules/webgpu/WebGPUDevice.idl: Ditto.
		22	* Modules/webgpu/WebGPUProgrammablePassEncoder.cpp:
		23	(WebCore::WebGPUProgrammablePassEncoder::setBindGroup const):
		24	* Modules/webgpu/WebGPUProgrammablePassEncoder.h:
		25	* Modules/webgpu/WebGPUQueue.cpp:
		26	(WebCore::WebGPUQueue::submit):
		27	* Modules/webgpu/WebGPURenderPassDescriptor.cpp:
		28	(WebCore::WebGPURenderPassDescriptor::asGPURenderPassDescriptor const):
		29	* Modules/webgpu/WebGPUTexture.cpp:
		30	(WebCore::WebGPUTexture::~WebGPUTexture): Clean up any resources created for and from this WebGPUTexture.
		31	(WebCore::WebGPUTexture::createDefaultTextureView): Now returns an empty object other than null on failure.
		32	(WebCore::WebGPUTexture::destroy):
		33	(WebCore::WebGPUTexture::destroyImpl):
		34	* Modules/webgpu/WebGPUTexture.h: Keep a list of any views created from this texture.
		35	* Modules/webgpu/WebGPUTexture.idl: Enable destroy.
		36	* Modules/webgpu/WebGPUTextureView.cpp:
		37	(WebCore::WebGPUTextureView::create):
		38	(WebCore::WebGPUTextureView::WebGPUTextureView):
		39	(WebCore::WebGPUTextureView::destroy):
		40	* Modules/webgpu/WebGPUTextureView.h:
		41	(WebCore::WebGPUTextureView::~WebGPUTextureView): Clean up any resources backing this WebGPUTextureView.
		42	(WebCore::WebGPUTextureView::texture const):
		43	(WebCore::WebGPUTextureView::texture): Deleted.
		44	* platform/graphics/gpu/GPUBindGroupLayout.h:
		45	* platform/graphics/gpu/GPUCommandBuffer.h:
		46	(WebCore::GPUCommandBuffer::usedTextures const): Keep a list of all texture resources that will be used by this command buffer on submit.
		47	(WebCore::GPUCommandBuffer::isEncodingPass const): Added to prevent multiple pass encoders from being active on one command buffer.
		48	(WebCore::GPUCommandBuffer::setIsEncodingPass):
		49	(WebCore::GPUCommandBuffer::useTexture):
		50	* platform/graphics/gpu/GPUDevice.cpp:
		51	(WebCore::GPUDevice::tryCreateBindGroupLayout const):
		52	* platform/graphics/gpu/GPUDevice.h:
		53	* platform/graphics/gpu/GPUPipelineLayout.cpp:
		54	(WebCore::GPUPipelineLayout::GPUPipelineLayout):
		55	* platform/graphics/gpu/GPUProgrammablePassEncoder.cpp:
		56	(WebCore::GPUProgrammablePassEncoder::GPUProgrammablePassEncoder):
		57	* platform/graphics/gpu/GPUProgrammablePassEncoder.h:
		58	(WebCore::GPUProgrammablePassEncoder::setVertexBuffer):
		59	(WebCore::GPUProgrammablePassEncoder::setFragmentBuffer):
		60	(): Deleted.
		61	* platform/graphics/gpu/GPUQueue.h:
		62	* platform/graphics/gpu/GPURenderPassEncoder.h:
		63	* platform/graphics/gpu/GPUTexture.h:
		64	(WebCore::GPUTexture::isReadOnly const):
65	(WebCore::GPUTexture::destroy):
66	* platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm:
67	(WebCore::MTLDataTypeForBindingType):
68	(WebCore::GPUBindGroupLayout::tryCreate):
69	* platform/graphics/gpu/cocoa/GPUCommandBufferMetal.mm:
70	(WebCore::GPUCommandBuffer::create):
71	(WebCore::GPUCommandBuffer::~GPUCommandBuffer): Ensure blitEncoder is ended before releasing it.
72	(WebCore::GPUCommandBuffer::endBlitEncoding):
73	(WebCore::GPUCommandBuffer::copyBufferToTexture): Ensure textures are marked for usage before submission occurs.
74	(WebCore::GPUCommandBuffer::copyTextureToBuffer):
75	(WebCore::GPUCommandBuffer::copyTextureToTexture):
76	* platform/graphics/gpu/cocoa/GPUDeviceMetal.mm:
77	(WebCore::GPUDevice::create):
78	(WebCore::GPUDevice::GPUDevice):
79	* platform/graphics/gpu/cocoa/GPUProgrammablePassEncoderMetal.mm:
80	(WebCore::GPUProgrammablePassEncoder::endPass):
81	(WebCore::GPUProgrammablePassEncoder::setBindGroup): Now supports texture resources.
82	(WebCore::GPUProgrammablePassEncoder::setResourceAsBufferOnEncoder): Just moved.
83	(WebCore::GPUProgrammablePassEncoder::setResourceAsTextureOnEncoder):
84	* platform/graphics/gpu/cocoa/GPUQueueMetal.mm:
85	(WebCore::GPUQueue::submit): Ensures destroyed GPUTextures are not submitted.
86	* platform/graphics/gpu/cocoa/GPURenderPassEncoderMetal.mm:
87	(WebCore::GPURenderPassEncoder::tryCreate): Ensure any other encoders are ended before attempting to activate a new one.
88	(WebCore::GPURenderPassEncoder::platformPassEncoder const):
89	(WebCore::GPURenderPassEncoder::endPass): Invalidates the MTLCommandEncoder upon success.
90	(WebCore::GPURenderPassEncoder::setPipeline):
91	(WebCore::GPURenderPassEncoder::setVertexBuffers):
92	(WebCore::GPURenderPassEncoder::draw):
93	(WebCore::GPURenderPassEncoder::useResource):
94	(WebCore::GPURenderPassEncoder::setVertexBuffer):
95	(WebCore::GPURenderPassEncoder::setFragmentBuffer):
96	* platform/graphics/gpu/cocoa/GPUSwapChainMetal.mm:
97	(WebCore::GPUSwapChain::getNextTexture):
98	* platform/graphics/gpu/cocoa/GPUTextureMetal.mm:
99	(WebCore::storageModeForPixelFormatAndSampleCount):
100	Always create MTLStorageModePrivate textures on macOS, as Web GPU doesn't provide CPU access to textures anyway.
101	(WebCore::tryCreateMtlTextureDescriptor):
102	(WebCore::GPUTexture::create):
103	(WebCore::GPUTexture::GPUTexture):
104	(WebCore::GPUTexture::tryCreateDefaultTextureView): Renamed from createDefaultTextureView.
105
106	Update files and symbols in project:
107	* CMakeLists.txt:
108	* DerivedSources-input.xcfilelist:
109	* DerivedSources-output.xcfilelist:
110	* DerivedSources.make:
111	* Modules/streams/WebGPUBindGroupLayoutDescriptor.h: Removed.
112	* Modules/webgpu/GPUBindGroupLayoutBinding.h: Renamed from Source/WebCore/platform/graphics/gpu/GPUBindGroupLayoutBinding.h.
113	* Modules/webgpu/GPUBindGroupLayoutBinding.idl: Renamed from Source/WebCore/Modules/webgpu/WebGPUBindGroupLayoutBinding.idl.
114	* Modules/webgpu/GPUBindGroupLayoutDescriptor.h: Renamed from Source/WebCore/platform/graphics/gpu/GPUBindGroupLayoutDescriptor.h.
115	* Modules/webgpu/GPUBindGroupLayoutDescriptor.idl: Renamed from Source/WebCore/Modules/webgpu/WebGPUBindGroupLayoutDescriptor.idl.
116	* Modules/webgpu/GPUShaderStageBit.h: Renamed from Source/WebCore/Modules/webgpu/WebGPUShaderStageBit.h.
117	* Modules/webgpu/GPUShaderStageBit.idl: Renamed from Source/WebCore/Modules/webgpu/WebGPUShaderStageBit.idl.
118	* Sources.txt:
119	* WebCore.xcodeproj/project.pbxproj:
120	* bindings/js/WebCoreBuiltinNames.h:
121
1	2019-03-04 Justin Fan <justin_fan@apple.com>	122	2019-03-04 Justin Fan <justin_fan@apple.com>
2		123
3	[Web GPU] Blitting function prototypes	124	[Web GPU] Blitting function prototypes

Lines 462-467 set(WebCore_NON_SVG_IDL_FILES a/Source/WebCore/CMakeLists.txt_sec1
- a/Source/WebCore/CMakeLists.txt -3 / +3 lines
462	Modules/webdriver/NavigatorWebDriver.idl	462	Modules/webdriver/NavigatorWebDriver.idl
463		463
464	Modules/webgpu/DOMWindowWebGPU.idl	464	Modules/webgpu/DOMWindowWebGPU.idl
		465	Modules/webgpu/GPUBindGroupLayoutBinding.idl
		466	Modules/webgpu/GPUBindGroupLayoutDescriptor.idl
465	Modules/webgpu/GPUBufferDescriptor.idl	467	Modules/webgpu/GPUBufferDescriptor.idl
466	Modules/webgpu/GPUBufferUsage.idl	468	Modules/webgpu/GPUBufferUsage.idl
467	Modules/webgpu/GPUColor.idl	469	Modules/webgpu/GPUColor.idl
Lines 471-476 set(WebCore_NON_SVG_IDL_FILES a/Source/WebCore/CMakeLists.txt_sec2
471	Modules/webgpu/GPULoadOp.idl	473	Modules/webgpu/GPULoadOp.idl
472	Modules/webgpu/GPUOrigin3D.idl	474	Modules/webgpu/GPUOrigin3D.idl
473	Modules/webgpu/GPURequestAdapterOptions.idl	475	Modules/webgpu/GPURequestAdapterOptions.idl
		476	Modules/webgpu/GPUShaderStageBit.idl
474	Modules/webgpu/GPUStoreOp.idl	477	Modules/webgpu/GPUStoreOp.idl
475	Modules/webgpu/GPUTextureDescriptor.idl	478	Modules/webgpu/GPUTextureDescriptor.idl
476	Modules/webgpu/GPUTextureDimension.idl	479	Modules/webgpu/GPUTextureDimension.idl
Lines 482-489 set(WebCore_NON_SVG_IDL_FILES a/Source/WebCore/CMakeLists.txt_sec3
482	Modules/webgpu/WebGPUBindGroupBinding.idl	485	Modules/webgpu/WebGPUBindGroupBinding.idl
483	Modules/webgpu/WebGPUBindGroupDescriptor.idl	486	Modules/webgpu/WebGPUBindGroupDescriptor.idl
484	Modules/webgpu/WebGPUBindGroupLayout.idl	487	Modules/webgpu/WebGPUBindGroupLayout.idl
485	Modules/webgpu/WebGPUBindGroupLayoutBinding.idl
486	Modules/webgpu/WebGPUBindGroupLayoutDescriptor.idl
487	Modules/webgpu/WebGPUBuffer.idl	488	Modules/webgpu/WebGPUBuffer.idl
488	Modules/webgpu/WebGPUBufferBinding.idl	489	Modules/webgpu/WebGPUBufferBinding.idl
489	Modules/webgpu/WebGPUCommandBuffer.idl	490	Modules/webgpu/WebGPUCommandBuffer.idl
Lines 504-510 set(WebCore_NON_SVG_IDL_FILES a/Source/WebCore/CMakeLists.txt_sec4
504	Modules/webgpu/WebGPURenderingContext.idl	505	Modules/webgpu/WebGPURenderingContext.idl
505	Modules/webgpu/WebGPUShaderModule.idl	506	Modules/webgpu/WebGPUShaderModule.idl
506	Modules/webgpu/WebGPUShaderModuleDescriptor.idl	507	Modules/webgpu/WebGPUShaderModuleDescriptor.idl
507	Modules/webgpu/WebGPUShaderStageBit.idl
508	Modules/webgpu/WebGPUSwapChain.idl	508	Modules/webgpu/WebGPUSwapChain.idl
509	Modules/webgpu/WebGPUTexture.idl	509	Modules/webgpu/WebGPUTexture.idl
510	Modules/webgpu/WebGPUTextureView.idl	510	Modules/webgpu/WebGPUTextureView.idl

Lines 321-326 $(PROJECT_DIR)/Modules/webdatabase/SQLTransactionCallback.idl a/Source/WebCore/DerivedSources-input.xcfilelist_sec1
- a/Source/WebCore/DerivedSources-input.xcfilelist +3 lines
321	$(PROJECT_DIR)/Modules/webdatabase/SQLTransactionErrorCallback.idl	321	$(PROJECT_DIR)/Modules/webdatabase/SQLTransactionErrorCallback.idl
322	$(PROJECT_DIR)/Modules/webdriver/NavigatorWebDriver.idl	322	$(PROJECT_DIR)/Modules/webdriver/NavigatorWebDriver.idl
323	$(PROJECT_DIR)/Modules/webgpu/DOMWindowWebGPU.idl	323	$(PROJECT_DIR)/Modules/webgpu/DOMWindowWebGPU.idl
		324	$(PROJECT_DIR)/Modules/webgpu/GPUBindGroupLayoutBinding.idl
		325	$(PROJECT_DIR)/Modules/webgpu/GPUBindGroupLayoutDescriptor.idl
324	$(PROJECT_DIR)/Modules/webgpu/GPUBufferDescriptor.idl	326	$(PROJECT_DIR)/Modules/webgpu/GPUBufferDescriptor.idl
325	$(PROJECT_DIR)/Modules/webgpu/GPUBufferUsage.idl	327	$(PROJECT_DIR)/Modules/webgpu/GPUBufferUsage.idl
326	$(PROJECT_DIR)/Modules/webgpu/GPUColor.idl	328	$(PROJECT_DIR)/Modules/webgpu/GPUColor.idl
Lines 330-335 $(PROJECT_DIR)/Modules/webgpu/GPUExtent3D.idl a/Source/WebCore/DerivedSources-input.xcfilelist_sec2
330	$(PROJECT_DIR)/Modules/webgpu/GPULoadOp.idl	332	$(PROJECT_DIR)/Modules/webgpu/GPULoadOp.idl
331	$(PROJECT_DIR)/Modules/webgpu/GPUOrigin3D.idl	333	$(PROJECT_DIR)/Modules/webgpu/GPUOrigin3D.idl
332	$(PROJECT_DIR)/Modules/webgpu/GPURequestAdapterOptions.idl	334	$(PROJECT_DIR)/Modules/webgpu/GPURequestAdapterOptions.idl
		335	$(PROJECT_DIR)/Modules/webgpu/GPUShaderStageBit.idl
333	$(PROJECT_DIR)/Modules/webgpu/GPUStoreOp.idl	336	$(PROJECT_DIR)/Modules/webgpu/GPUStoreOp.idl
334	$(PROJECT_DIR)/Modules/webgpu/GPUTextureDescriptor.idl	337	$(PROJECT_DIR)/Modules/webgpu/GPUTextureDescriptor.idl
335	$(PROJECT_DIR)/Modules/webgpu/GPUTextureDimension.idl	338	$(PROJECT_DIR)/Modules/webgpu/GPUTextureDimension.idl

Lines 577-582 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSFontFaceSet.cpp a/Source/WebCore/DerivedSources-output.xcfilelist_sec1
- a/Source/WebCore/DerivedSources-output.xcfilelist +6 lines
577	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSFontFaceSet.h	577	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSFontFaceSet.h
578	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGCObservation.cpp	578	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGCObservation.cpp
579	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGCObservation.h	579	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGCObservation.h
		580	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBindGroupLayoutBinding.cpp
		581	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBindGroupLayoutBinding.h
		582	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBindGroupLayoutDescriptor.cpp
		583	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBindGroupLayoutDescriptor.h
580	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBufferDescriptor.cpp	584	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBufferDescriptor.cpp
581	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBufferDescriptor.h	585	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBufferDescriptor.h
582	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBufferUsage.cpp	586	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUBufferUsage.cpp
Lines 595-600 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUOrigin3D.cpp a/Source/WebCore/DerivedSources-output.xcfilelist_sec2
595	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUOrigin3D.h	599	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUOrigin3D.h
596	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPURequestAdapterOptions.cpp	600	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPURequestAdapterOptions.cpp
597	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPURequestAdapterOptions.h	601	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPURequestAdapterOptions.h
		602	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUShaderStageBit.cpp
		603	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUShaderStageBit.h
598	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUStoreOp.cpp	604	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUStoreOp.cpp
599	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUStoreOp.h	605	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUStoreOp.h
600	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUTextureDescriptor.cpp	606	$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSGPUTextureDescriptor.cpp

Lines 373-378 JS_BINDING_IDLS = \ a/Source/WebCore/DerivedSources.make_sec1
- a/Source/WebCore/DerivedSources.make -3 / +3 lines
373	$(WebCore)/Modules/webdriver/NavigatorWebDriver.idl \	373	$(WebCore)/Modules/webdriver/NavigatorWebDriver.idl \
374	$(WebCore)/Modules/webgpu/DOMWindowWebGPU.idl \	374	$(WebCore)/Modules/webgpu/DOMWindowWebGPU.idl \
375	$(WebCore)/Modules/webgpu/GPUColor.idl \	375	$(WebCore)/Modules/webgpu/GPUColor.idl \
		376	$(WebCore)/Modules/webgpu/GPUBindGroupLayoutBinding.idl \
		377	$(WebCore)/Modules/webgpu/GPUBindGroupLayoutDescriptor.idl \
376	$(WebCore)/Modules/webgpu/GPUBufferDescriptor.idl \	378	$(WebCore)/Modules/webgpu/GPUBufferDescriptor.idl \
377	$(WebCore)/Modules/webgpu/GPUBufferUsage.idl \	379	$(WebCore)/Modules/webgpu/GPUBufferUsage.idl \
378	$(WebCore)/Modules/webgpu/GPUCompareFunction.idl \	380	$(WebCore)/Modules/webgpu/GPUCompareFunction.idl \
Lines 381-386 JS_BINDING_IDLS = \ a/Source/WebCore/DerivedSources.make_sec2
381	$(WebCore)/Modules/webgpu/GPULoadOp.idl \	383	$(WebCore)/Modules/webgpu/GPULoadOp.idl \
382	$(WebCore)/Modules/webgpu/GPUOrigin3D.idl \	384	$(WebCore)/Modules/webgpu/GPUOrigin3D.idl \
383	$(WebCore)/Modules/webgpu/GPURequestAdapterOptions.idl \	385	$(WebCore)/Modules/webgpu/GPURequestAdapterOptions.idl \
		386	$(WebCore)/Modules/webgpu/GPUShaderStageBit.idl \
384	$(WebCore)/Modules/webgpu/GPUStoreOp.idl \	387	$(WebCore)/Modules/webgpu/GPUStoreOp.idl \
385	$(WebCore)/Modules/webgpu/GPUTextureDescriptor.idl \	388	$(WebCore)/Modules/webgpu/GPUTextureDescriptor.idl \
386	$(WebCore)/Modules/webgpu/GPUTextureDimension.idl \	389	$(WebCore)/Modules/webgpu/GPUTextureDimension.idl \
Lines 392-399 JS_BINDING_IDLS = \ a/Source/WebCore/DerivedSources.make_sec3
392	$(WebCore)/Modules/webgpu/WebGPUBindGroupBinding.idl \	395	$(WebCore)/Modules/webgpu/WebGPUBindGroupBinding.idl \
393	$(WebCore)/Modules/webgpu/WebGPUBindGroupDescriptor.idl \	396	$(WebCore)/Modules/webgpu/WebGPUBindGroupDescriptor.idl \
394	$(WebCore)/Modules/webgpu/WebGPUBindGroupLayout.idl \	397	$(WebCore)/Modules/webgpu/WebGPUBindGroupLayout.idl \
395	$(WebCore)/Modules/webgpu/WebGPUBindGroupLayoutBinding.idl \
396	$(WebCore)/Modules/webgpu/WebGPUBindGroupLayoutDescriptor.idl \
397	$(WebCore)/Modules/webgpu/WebGPUBuffer.idl \	398	$(WebCore)/Modules/webgpu/WebGPUBuffer.idl \
398	$(WebCore)/Modules/webgpu/WebGPUBufferBinding.idl \	399	$(WebCore)/Modules/webgpu/WebGPUBufferBinding.idl \
399	$(WebCore)/Modules/webgpu/WebGPUCommandBuffer.idl \	400	$(WebCore)/Modules/webgpu/WebGPUCommandBuffer.idl \
Lines 414-420 JS_BINDING_IDLS = \ a/Source/WebCore/DerivedSources.make_sec4
414	$(WebCore)/Modules/webgpu/WebGPURenderingContext.idl \	415	$(WebCore)/Modules/webgpu/WebGPURenderingContext.idl \
415	$(WebCore)/Modules/webgpu/WebGPUShaderModule.idl \	416	$(WebCore)/Modules/webgpu/WebGPUShaderModule.idl \
416	$(WebCore)/Modules/webgpu/WebGPUShaderModuleDescriptor.idl \	417	$(WebCore)/Modules/webgpu/WebGPUShaderModuleDescriptor.idl \
417	$(WebCore)/Modules/webgpu/WebGPUShaderStageBit.idl \
418	$(WebCore)/Modules/webgpu/WebGPUSwapChain.idl \	418	$(WebCore)/Modules/webgpu/WebGPUSwapChain.idl \
419	$(WebCore)/Modules/webgpu/WebGPUTexture.idl \	419	$(WebCore)/Modules/webgpu/WebGPUTexture.idl \
420	$(WebCore)/Modules/webgpu/WebGPUTextureView.idl \	420	$(WebCore)/Modules/webgpu/WebGPUTextureView.idl \

Lines 1-38 a/Source/WebCore/Modules/streams/WebGPUBindGroupLayoutDescriptor.h_sec1
- a/Source/WebCore/Modules/streams/WebGPUBindGroupLayoutDescriptor.h -38 lines
1	/*
2	* Copyright (C) 2018 Apple Inc. All rights reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions
6	* are met:
7	* 1. Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.
9	* 2. Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.
12	*
13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23	* THE POSSIBILITY OF SUCH DAMAGE.
24	*/
25
26	#pragma once
27
28	#if ENABLE(WEBGPU)
29
30	#include "GPUBindGroupLayoutDescriptor.h"
31
32	namespace WebCore {
33
34	using WebGPUBindGroupLayoutDescriptor = GPUBindGroupLayoutDescriptor;
35
36	} // namespace WebCore
37
38	#endif // ENABLE(WEBGPU)

Line 0 a/Source/WebCore/Modules/webgpu/GPUBindGroupLayoutBinding.h_sec1
- a/Source/WebCore/Modules/webgpu/GPUBindGroupLayoutBinding.h +52 lines
	1	/*
	2	* Copyright (C) 2018 Apple Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	* 1. Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* 2. Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	*
	13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
	14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
	15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
	17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	23	* THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#pragma once
	27
	28	#if ENABLE(WEBGPU)
	29
	30	#include "GPUShaderStageBit.h"
	31	#include <wtf/OptionSet.h>
	32
	33	namespace WebCore {
	34
	35	struct GPUBindGroupLayoutBinding {
	36	enum class BindingType {
	37	UniformBuffer,
	38	DynamicUniformBuffer,
	39	Sampler,
	40	SampledTexture,
	41	StorageBuffer,
	42	DynamicStorageBuffer
	43	};
	44
	45	unsigned long binding;
	46	GPUShaderStageFlags visibility;
	47	BindingType type;
	48	};
	49
	50	} // namespace WebCore
	51
	52	#endif // ENABLE(WEBGPU)

Line 0 a/Source/WebCore/Modules/webgpu/GPUBindGroupLayoutBinding.idl_sec1
- a/Source/WebCore/Modules/webgpu/GPUBindGroupLayoutBinding.idl +50 lines
	1	/*
	2	* Copyright (C) 2019 Apple Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	* 1. Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* 2. Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	*
	13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
	14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
	15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
	17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	23	* THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25	// https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl
	26
	27	typedef unsigned long u32;
	28	typedef u32 GPUShaderStageFlags;
	29
	30	[
	31	Conditional=WEBGPU,
	32	EnabledAtRuntime=WebGPU
	33	] enum GPUBindingType {
	34	"uniform-buffer",
	35	"dynamic-uniform-buffer",
	36	"sampler",
	37	"sampled-texture",
	38	"storage-buffer",
	39	"dynamic-storage-buffer"
	40	// TODO other binding types
	41	};
	42
	43	[
	44	Conditional=WEBGPU,
	45	EnabledAtRuntime=WebGPU
	46	] dictionary GPUBindGroupLayoutBinding {
	47	u32 binding;
	48	GPUShaderStageFlags visibility;
	49	GPUBindingType type;
	50	};

Line 0 a/Source/WebCore/Modules/webgpu/GPUShaderStageBit.h_sec1
- a/Source/WebCore/Modules/webgpu/GPUShaderStageBit.h +49 lines
	1	/*
	2	* Copyright (C) 2019 Apple Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	* 1. Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* 2. Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	*
	13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
	14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
	15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
	17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	23	* THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#pragma once
	27
	28	#if ENABLE(WEBGPU)
	29
	30	#include <wtf/RefCounted.h>
	31
	32	namespace WebCore {
	33
	34	using GPUShaderStageFlags = unsigned;
	35
	36	class GPUShaderStageBit : public RefCounted<GPUShaderStageBit> {
	37	public:
	38	enum Flags : GPUShaderStageFlags {
	39	None = 0,
	40	Vertex = 1 << 0,
	41	Fragment = 1 << 1,
	42	Compute = 1 << 2,
	43	};
	44	};
	45
	46
	47	} // namespace WebCore
	48
	49	#endif // ENABLE(WEBGPU)

Lines 88-113 Optional<GPUBindGroupDescriptor> WebGPUBindGroupDescriptor::asGPUBindGroupDescri a/Source/WebCore/Modules/webgpu/WebGPUBindGroupDescriptor.cpp_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUBindGroupDescriptor.cpp -9 / +15 lines
88		88
89	const auto layoutBinding = iterator->value;	89	const auto layoutBinding = iterator->value;
90		90
91	auto bindingResourceVisitor = WTF::makeVisitor([] (RefPtr<WebGPUTextureView> view) -> Optional<GPUBindingResource> {	91	auto bindingResourceVisitor = WTF::makeVisitor([](const RefPtr<WebGPUTextureView>& view) -> Optional<GPUBindingResource> {
92	// FIXME: Validate binding type with the texture's usage flags.
93	if (!view)	92	if (!view)
94	return WTF::nullopt;	93	return WTF::nullopt;
		94	auto texture = view->texture();
		95	if (!texture)
		96	return WTF::nullopt;
95		97
96	return static_cast<GPUBindingResource>(view->texture());	98	return static_cast<GPUBindingResource>(texture.releaseNonNull());
97	}, [&layoutBinding, functionName] (WebGPUBufferBinding bufferBinding) -> Optional<GPUBindingResource> {	99	}, [&layoutBinding, functionName] (WebGPUBufferBinding bufferBinding) -> Optional<GPUBindingResource> {
98	if (!bufferBinding.buffer \|\| !bufferBinding.buffer->buffer()) {	100	if (!bufferBinding.buffer)
99	LOG(WebGPU, "%s: Invalid GPUBufferBinding for binding %lu in GPUBindGroupBindings!", functionName, layoutBinding.binding);	101	return WTF::nullopt;
		102	auto buffer = bufferBinding.buffer->buffer();
		103	if (!buffer)
100	return WTF::nullopt;	104	return WTF::nullopt;
101	}	105
102	if (!validateBufferBindingType(bufferBinding.buffer->buffer().get(), layoutBinding, functionName))	106	if (!validateBufferBindingType(buffer.get(), layoutBinding, functionName))
103	return WTF::nullopt;	107	return WTF::nullopt;
104		108
105	return static_cast<GPUBindingResource>(GPUBufferBinding { bufferBinding.buffer->buffer().releaseNonNull(), bufferBinding.offset, bufferBinding.size });	109	return static_cast<GPUBindingResource>(GPUBufferBinding { buffer.releaseNonNull(), bufferBinding.offset, bufferBinding.size });
106	});	110	});
107		111
108	auto bindingResource = WTF::visit(bindingResourceVisitor, binding.resource);	112	auto bindingResource = WTF::visit(bindingResourceVisitor, binding.resource);
109	if (!bindingResource)	113	if (!bindingResource) {
		114	LOG(WebGPU, "%s: Invalid resource for binding %lu!", functionName, layoutBinding.binding);
110	return WTF::nullopt;	115	return WTF::nullopt;
		116	}
111		117
112	bindGroupBindings.uncheckedAppend(GPUBindGroupBinding { binding.binding, WTFMove(bindingResource.value()) });	118	bindGroupBindings.uncheckedAppend(GPUBindGroupBinding { binding.binding, WTFMove(bindingResource.value()) });
113	}	119	}

Lines 104-110 void WebGPUCommandBuffer::copyBufferToTexture(const WebGPUBufferCopyView& srcBuf a/Source/WebCore/Modules/webgpu/WebGPUCommandBuffer.cpp_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUCommandBuffer.cpp -3 / +3 lines
104		104
105	// FIXME: Add Web GPU validation.	105	// FIXME: Add Web GPU validation.
106		106
107	m_commandBuffer->copyBufferToTexture(gpuBufferView, gpuTextureView, size);	107	m_commandBuffer->copyBufferToTexture(WTFMove(gpuBufferView), WTFMove(gpuTextureView), size);
108	}	108	}
109		109
110	void WebGPUCommandBuffer::copyTextureToBuffer(const WebGPUTextureCopyView& srcTexture, const WebGPUBufferCopyView& dstBuffer, const GPUExtent3D& size)	110	void WebGPUCommandBuffer::copyTextureToBuffer(const WebGPUTextureCopyView& srcTexture, const WebGPUBufferCopyView& dstBuffer, const GPUExtent3D& size)
Lines 117-123 void WebGPUCommandBuffer::copyTextureToBuffer(const WebGPUTextureCopyView& srcTe a/Source/WebCore/Modules/webgpu/WebGPUCommandBuffer.cpp_sec2
117		117
118	// FIXME: Add Web GPU validation.	118	// FIXME: Add Web GPU validation.
119		119
120	m_commandBuffer->copyTextureToBuffer(gpuTextureView, gpuBufferView, size);	120	m_commandBuffer->copyTextureToBuffer(WTFMove(gpuTextureView), WTFMove(gpuBufferView), size);
121	}	121	}
122		122
123	void WebGPUCommandBuffer::copyTextureToTexture(const WebGPUTextureCopyView& src, const WebGPUTextureCopyView& dst, const GPUExtent3D& size)	123	void WebGPUCommandBuffer::copyTextureToTexture(const WebGPUTextureCopyView& src, const WebGPUTextureCopyView& dst, const GPUExtent3D& size)
Lines 130-136 void WebGPUCommandBuffer::copyTextureToTexture(const WebGPUTextureCopyView& src, a/Source/WebCore/Modules/webgpu/WebGPUCommandBuffer.cpp_sec3
130		130
131	// FIXME: Add Web GPU validation.	131	// FIXME: Add Web GPU validation.
132		132
133	m_commandBuffer->copyTextureToTexture(gpuSrcView, gpuDstView, size);	133	m_commandBuffer->copyTextureToTexture(WTFMove(gpuSrcView), WTFMove(gpuDstView), size);
134	}	134	}
135		135
136	} // namespace WebCore	136	} // namespace WebCore

Lines 31-36 a/Source/WebCore/Modules/webgpu/WebGPUDevice.cpp_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUDevice.cpp -3 / +3 lines
31	#include "GPUBindGroup.h"	31	#include "GPUBindGroup.h"
32	#include "GPUBindGroupBinding.h"	32	#include "GPUBindGroupBinding.h"
33	#include "GPUBindGroupDescriptor.h"	33	#include "GPUBindGroupDescriptor.h"
		34	#include "GPUBindGroupLayoutDescriptor.h"
34	#include "GPUBufferBinding.h"	35	#include "GPUBufferBinding.h"
35	#include "GPUBufferDescriptor.h"	36	#include "GPUBufferDescriptor.h"
36	#include "GPUCommandBuffer.h"	37	#include "GPUCommandBuffer.h"
Lines 41-47 a/Source/WebCore/Modules/webgpu/WebGPUDevice.cpp_sec2
41	#include "Logging.h"	42	#include "Logging.h"
42	#include "WebGPUBindGroup.h"	43	#include "WebGPUBindGroup.h"
43	#include "WebGPUBindGroupBinding.h"	44	#include "WebGPUBindGroupBinding.h"
44	#include "WebGPUBindGroupDescriptor.h"
45	#include "WebGPUBindGroupLayout.h"	45	#include "WebGPUBindGroupLayout.h"
46	#include "WebGPUBuffer.h"	46	#include "WebGPUBuffer.h"
47	#include "WebGPUBufferBinding.h"	47	#include "WebGPUBufferBinding.h"
Lines 84-92 Ref<WebGPUTexture> WebGPUDevice::createTexture(GPUTextureDescriptor&& descriptor a/Source/WebCore/Modules/webgpu/WebGPUDevice.cpp_sec3
84	return WebGPUTexture::create(WTFMove(texture));	84	return WebGPUTexture::create(WTFMove(texture));
85	}	85	}
86		86
87	Ref<WebGPUBindGroupLayout> WebGPUDevice::createBindGroupLayout(WebGPUBindGroupLayoutDescriptor&& descriptor) const	87	Ref<WebGPUBindGroupLayout> WebGPUDevice::createBindGroupLayout(const GPUBindGroupLayoutDescriptor& descriptor) const
88	{	88	{
89	auto layout = m_device->tryCreateBindGroupLayout(GPUBindGroupLayoutDescriptor { descriptor.bindings });	89	auto layout = m_device->tryCreateBindGroupLayout(descriptor);
90	return WebGPUBindGroupLayout::create(WTFMove(layout));	90	return WebGPUBindGroupLayout::create(WTFMove(layout));
91	}	91	}
92		92

Lines 29-35 a/Source/WebCore/Modules/webgpu/WebGPUDevice.h_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUDevice.h -2 / +2 lines
29		29
30	#include "GPUDevice.h"	30	#include "GPUDevice.h"
31	#include "WebGPUAdapter.h"	31	#include "WebGPUAdapter.h"
32	#include "WebGPUBindGroupLayoutDescriptor.h"
33	#include "WebGPUQueue.h"	32	#include "WebGPUQueue.h"
34		33
35	#include <wtf/Ref.h>	34	#include <wtf/Ref.h>
Lines 48-53 class WebGPURenderPipeline; a/Source/WebCore/Modules/webgpu/WebGPUDevice.h_sec2
48	class WebGPUShaderModule;	47	class WebGPUShaderModule;
49	class WebGPUTexture;	48	class WebGPUTexture;
50		49
		50	struct GPUBindGroupLayoutDescriptor;
51	struct GPUBufferDescriptor;	51	struct GPUBufferDescriptor;
52	struct GPUTextureDescriptor;	52	struct GPUTextureDescriptor;
53	struct WebGPUBindGroupDescriptor;	53	struct WebGPUBindGroupDescriptor;
Lines 65-71 public: a/Source/WebCore/Modules/webgpu/WebGPUDevice.h_sec3
65	Ref<WebGPUBuffer> createBuffer(GPUBufferDescriptor&&) const;	65	Ref<WebGPUBuffer> createBuffer(GPUBufferDescriptor&&) const;
66	Ref<WebGPUTexture> createTexture(GPUTextureDescriptor&&) const;	66	Ref<WebGPUTexture> createTexture(GPUTextureDescriptor&&) const;
67		67
68	Ref<WebGPUBindGroupLayout> createBindGroupLayout(WebGPUBindGroupLayoutDescriptor&&) const;	68	Ref<WebGPUBindGroupLayout> createBindGroupLayout(const GPUBindGroupLayoutDescriptor&) const;
69	Ref<WebGPUPipelineLayout> createPipelineLayout(WebGPUPipelineLayoutDescriptor&&) const;	69	Ref<WebGPUPipelineLayout> createPipelineLayout(WebGPUPipelineLayoutDescriptor&&) const;
70	Ref<WebGPUBindGroup> createBindGroup(WebGPUBindGroupDescriptor&&) const;	70	Ref<WebGPUBindGroup> createBindGroup(WebGPUBindGroupDescriptor&&) const;
71		71

Lines 34-40 a/Source/WebCore/Modules/webgpu/WebGPUDevice.idl_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUDevice.idl -2 / +1 lines
34	WebGPUBuffer createBuffer(GPUBufferDescriptor descriptor);	34	WebGPUBuffer createBuffer(GPUBufferDescriptor descriptor);
35	WebGPUTexture createTexture(GPUTextureDescriptor descriptor);	35	WebGPUTexture createTexture(GPUTextureDescriptor descriptor);
36		36
37	WebGPUBindGroupLayout createBindGroupLayout(WebGPUBindGroupLayoutDescriptor descriptor);	37	WebGPUBindGroupLayout createBindGroupLayout(GPUBindGroupLayoutDescriptor descriptor);
38	WebGPUPipelineLayout createPipelineLayout(WebGPUPipelineLayoutDescriptor descriptor);	38	WebGPUPipelineLayout createPipelineLayout(WebGPUPipelineLayoutDescriptor descriptor);
39	WebGPUBindGroup createBindGroup(WebGPUBindGroupDescriptor descriptor);	39	WebGPUBindGroup createBindGroup(WebGPUBindGroupDescriptor descriptor);
40		40
Lines 50-56 a/Source/WebCore/Modules/webgpu/WebGPUDevice.idl_sec2
50	// readonly attribute WebGPUExtensions extensions;	50	// readonly attribute WebGPUExtensions extensions;
51	// readonly attribute WebGPULimits limits;	51	// readonly attribute WebGPULimits limits;
52		52
53	// WebGPUTexture createTexture(WebGPUTextureDescriptor descriptor);
54	// WebGPUSampler createSampler(WebGPUSamplerDescriptor descriptor);	53	// WebGPUSampler createSampler(WebGPUSamplerDescriptor descriptor);
55		54
56	// WebGPUComputePipeline createComputePipeline(WebGPUComputePipelineDescriptor descriptor);	55	// WebGPUComputePipeline createComputePipeline(WebGPUComputePipelineDescriptor descriptor);

Lines 42-52 WebGPUTexture::WebGPUTexture(RefPtr<GPUTexture>&& texture) a/Source/WebCore/Modules/webgpu/WebGPUTexture.cpp_sec1
- a/Source/WebCore/Modules/webgpu/WebGPUTexture.cpp -4 / +33 lines
42	{	42	{
43	}	43	}
44		44
45	RefPtr<WebGPUTextureView> WebGPUTexture::createDefaultTextureView()	45	WebGPUTexture::~WebGPUTexture()
46	{	46	{
47	if (auto gpuTexture = m_texture->createDefaultTextureView())	47	if (m_texture)
48	return WebGPUTextureView::create(gpuTexture.releaseNonNull());	48	destroyImpl();
49	return nullptr;	49	}
		50
		51	Ref<WebGPUTextureView> WebGPUTexture::createDefaultTextureView()
		52	{
		53	if (!m_texture) {
		54	LOG(WebGPU, "GPUTexture::createDefaultTextureView(): Invalid operation!");
		55	return WebGPUTextureView::create(nullptr);
		56	}
		57
		58	auto view = WebGPUTextureView::create(m_texture->tryCreateDefaultTextureView());
		59	m_textureViews.append(view.copyRef());
		60	return view;
		61	}
		62
		63	void WebGPUTexture::destroy()
		64	{
		65	if (!m_texture)
		66	LOG(WebGPU, "GPUTexture::destroy(): Invalid operation!");
		67	else
		68	destroyImpl();
		69	}
		70
		71	void WebGPUTexture::destroyImpl()
		72	{
		73	for (auto& view : m_textureViews)
		74	view->destroy();
		75	m_textureViews.clear();
		76
		77	m_texture->destroy();
		78	m_texture = nullptr;
50	}	79	}
51		80
52	} // namespace WebCore	81	} // namespace WebCore

Lines 13968-13974 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj -15 / +11 lines
13968	D026F489220A539800AC5F49 /* GPUTextureDimension.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUTextureDimension.idl; sourceTree = "<group>"; };	13968	D026F489220A539800AC5F49 /* GPUTextureDimension.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUTextureDimension.idl; sourceTree = "<group>"; };
13969	D026F48B220A5B0B00AC5F49 /* GPUTextureDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUTextureDescriptor.idl; sourceTree = "<group>"; };	13969	D026F48B220A5B0B00AC5F49 /* GPUTextureDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUTextureDescriptor.idl; sourceTree = "<group>"; };
13970	D026F48C220A5BAD00AC5F49 /* GPUTextureDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUTextureDescriptor.h; sourceTree = "<group>"; };	13970	D026F48C220A5BAD00AC5F49 /* GPUTextureDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUTextureDescriptor.h; sourceTree = "<group>"; };
13971	D02B83ED21C8397A00F85473 /* WebGPUBindGroupLayoutDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUBindGroupLayoutDescriptor.idl; sourceTree = "<group>"; };
13972	D02C26922181416D00D818E4 /* GPURequestAdapterOptions.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPURequestAdapterOptions.idl; sourceTree = "<group>"; };	13971	D02C26922181416D00D818E4 /* GPURequestAdapterOptions.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPURequestAdapterOptions.idl; sourceTree = "<group>"; };
13973	D02F854E21682A4A0088EE74 /* WebMetalCommandQueue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalCommandQueue.idl; sourceTree = "<group>"; };	13972	D02F854E21682A4A0088EE74 /* WebMetalCommandQueue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalCommandQueue.idl; sourceTree = "<group>"; };
13974	D02F855021682A560088EE74 /* WebMetalComputeCommandEncoder.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebMetalComputeCommandEncoder.idl; sourceTree = "<group>"; };	13973	D02F855021682A560088EE74 /* WebMetalComputeCommandEncoder.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebMetalComputeCommandEncoder.idl; sourceTree = "<group>"; };
Lines 14068-14075 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
14068	D06EF553220BA26A0018724E /* GPUUtilsMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUUtilsMetal.mm; sourceTree = "<group>"; };	14067	D06EF553220BA26A0018724E /* GPUUtilsMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUUtilsMetal.mm; sourceTree = "<group>"; };
14069	D07DEAB70A36554A00CA30F8 /* InsertListCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = InsertListCommand.cpp; sourceTree = "<group>"; };	14068	D07DEAB70A36554A00CA30F8 /* InsertListCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = InsertListCommand.cpp; sourceTree = "<group>"; };
14070	D07DEAB80A36554A00CA30F8 /* InsertListCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = InsertListCommand.h; sourceTree = "<group>"; };	14069	D07DEAB80A36554A00CA30F8 /* InsertListCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = InsertListCommand.h; sourceTree = "<group>"; };
14071	D083D98421C48050008E8EFF /* GPUBindGroupLayoutDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBindGroupLayoutDescriptor.h; sourceTree = "<group>"; };
14072	D083D98621C4813E008E8EFF /* WebGPUBindGroupLayoutDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebGPUBindGroupLayoutDescriptor.h; path = Modules/streams/WebGPUBindGroupLayoutDescriptor.h; sourceTree = SOURCE_ROOT; };
14073	D084033A221CBF5400007205 /* GPUBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPUBuffer.cpp; sourceTree = "<group>"; };	14070	D084033A221CBF5400007205 /* GPUBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPUBuffer.cpp; sourceTree = "<group>"; };
14074	D084033D221E186400007205 /* WebGPUBindGroupDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUBindGroupDescriptor.cpp; sourceTree = "<group>"; };	14071	D084033D221E186400007205 /* WebGPUBindGroupDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUBindGroupDescriptor.cpp; sourceTree = "<group>"; };
14075	D0843A4A20FEBE3D00FE860E /* GraphicsContext3DManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GraphicsContext3DManager.h; sourceTree = "<group>"; };	14072	D0843A4A20FEBE3D00FE860E /* GraphicsContext3DManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GraphicsContext3DManager.h; sourceTree = "<group>"; };
Lines 14100-14109 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec3
14100	D0B0556609C6700100307E43 /* CreateLinkCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateLinkCommand.h; sourceTree = "<group>"; };	14097	D0B0556609C6700100307E43 /* CreateLinkCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateLinkCommand.h; sourceTree = "<group>"; };
14101	D0B0556709C6700100307E43 /* CreateLinkCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CreateLinkCommand.cpp; sourceTree = "<group>"; };	14098	D0B0556709C6700100307E43 /* CreateLinkCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CreateLinkCommand.cpp; sourceTree = "<group>"; };
14102	D0B8BB0121C46E78000C7681 /* GPUBindGroupLayoutBinding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBindGroupLayoutBinding.h; sourceTree = "<group>"; };	14099	D0B8BB0121C46E78000C7681 /* GPUBindGroupLayoutBinding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBindGroupLayoutBinding.h; sourceTree = "<group>"; };
14103	D0B8BB0321C4711D000C7681 /* WebGPUShaderStageBit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUShaderStageBit.h; sourceTree = "<group>"; };
14104	D0B8BB0421C4711D000C7681 /* WebGPUShaderStageBit.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUShaderStageBit.idl; sourceTree = "<group>"; };
14105	D0B8BB0521C47256000C7681 /* WebGPUBindGroupLayoutBinding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUBindGroupLayoutBinding.h; sourceTree = "<group>"; };
14106	D0B8BB0621C47256000C7681 /* WebGPUBindGroupLayoutBinding.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUBindGroupLayoutBinding.idl; sourceTree = "<group>"; };
14107	D0BC54481443AC4A00E105DA /* CachedStyleSheetClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedStyleSheetClient.h; sourceTree = "<group>"; };	14100	D0BC54481443AC4A00E105DA /* CachedStyleSheetClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedStyleSheetClient.h; sourceTree = "<group>"; };
14108	D0BD4F5A1408850F006839B6 /* DictationCommandIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationCommandIOS.cpp; sourceTree = "<group>"; };	14101	D0BD4F5A1408850F006839B6 /* DictationCommandIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationCommandIOS.cpp; sourceTree = "<group>"; };
14109	D0BD4F5B1408850F006839B6 /* DictationCommandIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictationCommandIOS.h; sourceTree = "<group>"; };	14102	D0BD4F5B1408850F006839B6 /* DictationCommandIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictationCommandIOS.h; sourceTree = "<group>"; };
Lines 14138-14143 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec4
14138	D0CAAE9E216824A8001C91C7 /* WebMetalCommandBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalCommandBuffer.cpp; sourceTree = "<group>"; };	14131	D0CAAE9E216824A8001C91C7 /* WebMetalCommandBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalCommandBuffer.cpp; sourceTree = "<group>"; };
14139	D0CCA94922299F97006979B6 /* GPUOrigin3D.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUOrigin3D.h; sourceTree = "<group>"; };	14132	D0CCA94922299F97006979B6 /* GPUOrigin3D.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUOrigin3D.h; sourceTree = "<group>"; };
14140	D0CCA94A22299F97006979B6 /* GPUOrigin3D.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUOrigin3D.idl; sourceTree = "<group>"; };	14133	D0CCA94A22299F97006979B6 /* GPUOrigin3D.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUOrigin3D.idl; sourceTree = "<group>"; };
		14134	D0D69C9C222E00C20032927E /* GPUBindGroupLayoutDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBindGroupLayoutDescriptor.h; sourceTree = "<group>"; };
		14135	D0D69C9D222E00C20032927E /* GPUBindGroupLayoutDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUBindGroupLayoutDescriptor.idl; sourceTree = "<group>"; };
		14136	D0D69C9F222E015E0032927E /* GPUBindGroupLayoutBinding.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUBindGroupLayoutBinding.idl; sourceTree = "<group>"; };
14141	D0D8648721B64CAA003C983C /* GPUBufferDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBufferDescriptor.h; sourceTree = "<group>"; };	14137	D0D8648721B64CAA003C983C /* GPUBufferDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBufferDescriptor.h; sourceTree = "<group>"; };
14142	D0D8648C21B70676003C983C /* WebGPUBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUBuffer.h; sourceTree = "<group>"; };	14138	D0D8648C21B70676003C983C /* WebGPUBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUBuffer.h; sourceTree = "<group>"; };
14143	D0D8648D21B70676003C983C /* WebGPUBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUBuffer.cpp; sourceTree = "<group>"; };	14139	D0D8648D21B70676003C983C /* WebGPUBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUBuffer.cpp; sourceTree = "<group>"; };
Lines 14156-14161 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec5
14156	D0DA0BE4217930E2007FE2AC /* WebGPUSwapChain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUSwapChain.h; sourceTree = "<group>"; };	14152	D0DA0BE4217930E2007FE2AC /* WebGPUSwapChain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUSwapChain.h; sourceTree = "<group>"; };
14157	D0DA0BE5217930E2007FE2AC /* WebGPUSwapChain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUSwapChain.cpp; sourceTree = "<group>"; };	14153	D0DA0BE5217930E2007FE2AC /* WebGPUSwapChain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUSwapChain.cpp; sourceTree = "<group>"; };
14158	D0DA0BE6217930E2007FE2AC /* WebGPUSwapChain.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUSwapChain.idl; sourceTree = "<group>"; };	14154	D0DA0BE6217930E2007FE2AC /* WebGPUSwapChain.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUSwapChain.idl; sourceTree = "<group>"; };
		14155	D0DE8FB8222E09E200882550 /* GPUShaderStageBit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUShaderStageBit.h; sourceTree = "<group>"; };
		14156	D0DE8FB9222E09E200882550 /* GPUShaderStageBit.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUShaderStageBit.idl; sourceTree = "<group>"; };
14159	D0EACF7621937228000FA75C /* WebGPUCommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUCommandBuffer.h; sourceTree = "<group>"; };	14157	D0EACF7621937228000FA75C /* WebGPUCommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUCommandBuffer.h; sourceTree = "<group>"; };
14160	D0EACF7721937228000FA75C /* WebGPUCommandBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUCommandBuffer.cpp; sourceTree = "<group>"; };	14158	D0EACF7721937228000FA75C /* WebGPUCommandBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUCommandBuffer.cpp; sourceTree = "<group>"; };
14161	D0EACF7821937228000FA75C /* WebGPUCommandBuffer.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUCommandBuffer.idl; sourceTree = "<group>"; };	14159	D0EACF7821937228000FA75C /* WebGPUCommandBuffer.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUCommandBuffer.idl; sourceTree = "<group>"; };
Lines 18462-18469 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec6
18462	D0BE104E21E695E200E42A89 /* GPUBindGroupBinding.h */,	18460	D0BE104E21E695E200E42A89 /* GPUBindGroupBinding.h */,
18463	D0BE105121E6A70E00E42A89 /* GPUBindGroupDescriptor.h */,	18461	D0BE105121E6A70E00E42A89 /* GPUBindGroupDescriptor.h */,
18464	D02454D021C4A41C00B73628 /* GPUBindGroupLayout.h */,	18462	D02454D021C4A41C00B73628 /* GPUBindGroupLayout.h */,
18465	D0B8BB0121C46E78000C7681 /* GPUBindGroupLayoutBinding.h */,
18466	D083D98421C48050008E8EFF /* GPUBindGroupLayoutDescriptor.h */,
18467	D084033A221CBF5400007205 /* GPUBuffer.cpp */,	18463	D084033A221CBF5400007205 /* GPUBuffer.cpp */,
18468	D0D8649221B760F2003C983C /* GPUBuffer.h */,	18464	D0D8649221B760F2003C983C /* GPUBuffer.h */,
18469	D0BE104A21E6872F00E42A89 /* GPUBufferBinding.h */,	18465	D0BE104A21E6872F00E42A89 /* GPUBufferBinding.h */,
Lines 26068-26073 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec7
26068	D00F5941216ECC7A000D71DB /* DOMWindowWebGPU.cpp */,	26064	D00F5941216ECC7A000D71DB /* DOMWindowWebGPU.cpp */,
26069	D00F5940216ECC7A000D71DB /* DOMWindowWebGPU.h */,	26065	D00F5940216ECC7A000D71DB /* DOMWindowWebGPU.h */,
26070	D00F5942216ECC7A000D71DB /* DOMWindowWebGPU.idl */,	26066	D00F5942216ECC7A000D71DB /* DOMWindowWebGPU.idl */,
		26067	D0B8BB0121C46E78000C7681 /* GPUBindGroupLayoutBinding.h */,
		26068	D0D69C9F222E015E0032927E /* GPUBindGroupLayoutBinding.idl */,
		26069	D0D69C9C222E00C20032927E /* GPUBindGroupLayoutDescriptor.h */,
		26070	D0D69C9D222E00C20032927E /* GPUBindGroupLayoutDescriptor.idl */,
26071	D01B811922135EB900627B6C /* GPUBufferDescriptor.idl */,	26071	D01B811922135EB900627B6C /* GPUBufferDescriptor.idl */,
26072	D01B811C2213627300627B6C /* GPUBufferUsage.idl */,	26072	D01B811C2213627300627B6C /* GPUBufferUsage.idl */,
26073	D01B811222125AFC00627B6C /* GPUColor.idl */,	26073	D01B811222125AFC00627B6C /* GPUColor.idl */,
Lines 26078-26083 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec8
26078	D0CCA94922299F97006979B6 /* GPUOrigin3D.h */,	26078	D0CCA94922299F97006979B6 /* GPUOrigin3D.h */,
26079	D0CCA94A22299F97006979B6 /* GPUOrigin3D.idl */,	26079	D0CCA94A22299F97006979B6 /* GPUOrigin3D.idl */,
26080	D02C26922181416D00D818E4 /* GPURequestAdapterOptions.idl */,	26080	D02C26922181416D00D818E4 /* GPURequestAdapterOptions.idl */,
		26081	D0DE8FB8222E09E200882550 /* GPUShaderStageBit.h */,
		26082	D0DE8FB9222E09E200882550 /* GPUShaderStageBit.idl */,
26081	D08AA031220D0CE60058C502 /* GPUStoreOp.idl */,	26083	D08AA031220D0CE60058C502 /* GPUStoreOp.idl */,
26082	D026F48B220A5B0B00AC5F49 /* GPUTextureDescriptor.idl */,	26084	D026F48B220A5B0B00AC5F49 /* GPUTextureDescriptor.idl */,
26083	D026F489220A539800AC5F49 /* GPUTextureDimension.idl */,	26085	D026F489220A539800AC5F49 /* GPUTextureDimension.idl */,
Lines 26100-26109 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec9
26100	D003287A21C8645B00622AA6 /* WebGPUBindGroupLayout.cpp */,	26102	D003287A21C8645B00622AA6 /* WebGPUBindGroupLayout.cpp */,
26101	D003287921C8645B00622AA6 /* WebGPUBindGroupLayout.h */,	26103	D003287921C8645B00622AA6 /* WebGPUBindGroupLayout.h */,
26102	D003287B21C8645B00622AA6 /* WebGPUBindGroupLayout.idl */,	26104	D003287B21C8645B00622AA6 /* WebGPUBindGroupLayout.idl */,
26103	D0B8BB0521C47256000C7681 /* WebGPUBindGroupLayoutBinding.h */,
26104	D0B8BB0621C47256000C7681 /* WebGPUBindGroupLayoutBinding.idl */,
26105	D083D98621C4813E008E8EFF /* WebGPUBindGroupLayoutDescriptor.h */,
26106	D02B83ED21C8397A00F85473 /* WebGPUBindGroupLayoutDescriptor.idl */,
26107	D0D8648D21B70676003C983C /* WebGPUBuffer.cpp */,	26105	D0D8648D21B70676003C983C /* WebGPUBuffer.cpp */,
26108	D0D8648C21B70676003C983C /* WebGPUBuffer.h */,	26106	D0D8648C21B70676003C983C /* WebGPUBuffer.h */,
26109	D0D8648E21B70676003C983C /* WebGPUBuffer.idl */,	26107	D0D8648E21B70676003C983C /* WebGPUBuffer.idl */,
Lines 26155-26162 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec10
26155	D0615FCE217FE5C6008A48A8 /* WebGPUShaderModule.idl */,	26153	D0615FCE217FE5C6008A48A8 /* WebGPUShaderModule.idl */,
26156	D060D8872182697000339318 /* WebGPUShaderModuleDescriptor.h */,	26154	D060D8872182697000339318 /* WebGPUShaderModuleDescriptor.h */,
26157	D060D88421825D5F00339318 /* WebGPUShaderModuleDescriptor.idl */,	26155	D060D88421825D5F00339318 /* WebGPUShaderModuleDescriptor.idl */,
26158	D0B8BB0321C4711D000C7681 /* WebGPUShaderStageBit.h */,
26159	D0B8BB0421C4711D000C7681 /* WebGPUShaderStageBit.idl */,
26160	D0DA0BE5217930E2007FE2AC /* WebGPUSwapChain.cpp */,	26156	D0DA0BE5217930E2007FE2AC /* WebGPUSwapChain.cpp */,
26161	D0DA0BE4217930E2007FE2AC /* WebGPUSwapChain.h */,	26157	D0DA0BE4217930E2007FE2AC /* WebGPUSwapChain.h */,
26162	D0DA0BE6217930E2007FE2AC /* WebGPUSwapChain.idl */,	26158	D0DA0BE6217930E2007FE2AC /* WebGPUSwapChain.idl */,

Lines 82-87 namespace WebCore { a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h_sec1
- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -1 / +1 lines
82	macro(GamepadButton) \	82	macro(GamepadButton) \
83	macro(GamepadEvent) \	83	macro(GamepadEvent) \
84	macro(GPUBufferUsage) \	84	macro(GPUBufferUsage) \
		85	macro(GPUShaderStageBit) \
85	macro(GPUTextureUsage) \	86	macro(GPUTextureUsage) \
86	macro(HTMLAttachmentElement) \	87	macro(HTMLAttachmentElement) \
87	macro(HTMLAudioElement) \	88	macro(HTMLAudioElement) \
Lines 208-214 namespace WebCore { a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h_sec2
208	macro(WebGPURenderPassEncoder) \	209	macro(WebGPURenderPassEncoder) \
209	macro(WebGPURenderPipeline) \	210	macro(WebGPURenderPipeline) \
210	macro(WebGPUShaderModule) \	211	macro(WebGPUShaderModule) \
211	macro(WebGPUShaderStageBit) \
212	macro(WebGPUSwapChain) \	212	macro(WebGPUSwapChain) \
213	macro(WebGPUTexture) \	213	macro(WebGPUTexture) \
214	macro(WebGPUTextureView) \	214	macro(WebGPUTextureView) \

Lines 54-62 RefPtr<GPUTexture> GPUDevice::tryCreateTexture(GPUTextureDescriptor&& descriptor a/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp_sec1
- a/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp -2 / +2 lines
54	return GPUTexture::tryCreate(*this, WTFMove(descriptor));	54	return GPUTexture::tryCreate(*this, WTFMove(descriptor));
55	}	55	}
56		56
57	RefPtr<GPUBindGroupLayout> GPUDevice::tryCreateBindGroupLayout(GPUBindGroupLayoutDescriptor&& descriptor) const	57	RefPtr<GPUBindGroupLayout> GPUDevice::tryCreateBindGroupLayout(const GPUBindGroupLayoutDescriptor& descriptor) const
58	{	58	{
59	return GPUBindGroupLayout::tryCreate(*this, WTFMove(descriptor));	59	return GPUBindGroupLayout::tryCreate(*this, descriptor);
60	}	60	}
61		61
62	Ref<GPUPipelineLayout> GPUDevice::createPipelineLayout(GPUPipelineLayoutDescriptor&& descriptor) const	62	Ref<GPUPipelineLayout> GPUDevice::createPipelineLayout(GPUPipelineLayoutDescriptor&& descriptor) const

Lines 53-60 public: a/Source/WebCore/platform/graphics/gpu/GPUTexture.h_sec1
- a/Source/WebCore/platform/graphics/gpu/GPUTexture.h -1 / +3 lines
53	bool isTransferSource() const { return m_usage.contains(GPUTextureUsage::Flags::TransferSource); }	53	bool isTransferSource() const { return m_usage.contains(GPUTextureUsage::Flags::TransferSource); }
54	bool isTransferDestination() const { return m_usage.contains(GPUTextureUsage::Flags::TransferDestination); }	54	bool isTransferDestination() const { return m_usage.contains(GPUTextureUsage::Flags::TransferDestination); }
55	bool isOutputAttachment() const { return m_usage.contains(GPUTextureUsage::Flags::OutputAttachment); }	55	bool isOutputAttachment() const { return m_usage.contains(GPUTextureUsage::Flags::OutputAttachment); }
		56	bool isReadOnly() const { return m_usage.containsAny({ GPUTextureUsage::Flags::TransferSource, GPUTextureUsage::Flags::Sampled }); }
56		57
57	RefPtr<GPUTexture> createDefaultTextureView();	58	RefPtr<GPUTexture> tryCreateDefaultTextureView();
		59	void destroy() { m_platformTexture = nullptr; }
58		60
59	private:	61	private:
60	explicit GPUTexture(PlatformTextureSmartPtr&&, OptionSet<GPUTextureUsage::Flags>);	62	explicit GPUTexture(PlatformTextureSmartPtr&&, OptionSet<GPUTextureUsage::Flags>);

Lines 45-51 static MTLDataType MTLDataTypeForBindingType(GPUBindGroupLayoutBinding::BindingT a/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm_sec1
- a/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm -5 / +7 lines
45	case GPUBindGroupLayoutBinding::BindingType::SampledTexture:	45	case GPUBindGroupLayoutBinding::BindingType::SampledTexture:
46	return MTLDataTypeTexture;	46	return MTLDataTypeTexture;
47	case GPUBindGroupLayoutBinding::BindingType::UniformBuffer:	47	case GPUBindGroupLayoutBinding::BindingType::UniformBuffer:
		48	case GPUBindGroupLayoutBinding::BindingType::DynamicUniformBuffer:
48	case GPUBindGroupLayoutBinding::BindingType::StorageBuffer:	49	case GPUBindGroupLayoutBinding::BindingType::StorageBuffer:
		50	case GPUBindGroupLayoutBinding::BindingType::DynamicStorageBuffer:
49	return MTLDataTypePointer;	51	return MTLDataTypePointer;
50	}	52	}
51	}	53	}
Lines 85-91 static GPUBindGroupLayout::ArgumentEncoderBuffer tryCreateArgumentEncoderAndBuff a/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm_sec2
85	return args;	87	return args;
86	};	88	};
87		89
88	RefPtr<GPUBindGroupLayout> GPUBindGroupLayout::tryCreate(const GPUDevice& device, GPUBindGroupLayoutDescriptor&& descriptor)	90	RefPtr<GPUBindGroupLayout> GPUBindGroupLayout::tryCreate(const GPUDevice& device, const GPUBindGroupLayoutDescriptor& descriptor)
89	{	91	{
90	if (!device.platformDevice()) {	92	if (!device.platformDevice()) {
91	LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Invalid MTLDevice!");	93	LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Invalid MTLDevice!");
Lines 97-103 RefPtr<GPUBindGroupLayout> GPUBindGroupLayout::tryCreate(const GPUDevice& device a/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm_sec3
97		99
98	for (const auto& binding : descriptor.bindings) {	100	for (const auto& binding : descriptor.bindings) {
99	if (!bindingsMap.add(binding.binding, binding)) {	101	if (!bindingsMap.add(binding.binding, binding)) {
100	LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Duplicate binding %lu found in WebGPUBindGroupLayoutDescriptor!", binding.binding);	102	LOG(WebGPU, "GPUBindGroupLayout::tryCreate(): Duplicate binding %lu found in GPUBindGroupLayoutDescriptor!", binding.binding);
101	return nullptr;	103	return nullptr;
102	}	104	}
103		105
Lines 115-125 RefPtr<GPUBindGroupLayout> GPUBindGroupLayout::tryCreate(const GPUDevice& device a/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm_sec4
115	mtlArgument.get().dataType = MTLDataTypeForBindingType(binding.type);	117	mtlArgument.get().dataType = MTLDataTypeForBindingType(binding.type);
116	mtlArgument.get().index = binding.binding;	118	mtlArgument.get().index = binding.binding;
117		119
118	if (binding.visibility & GPUShaderStageBit::VERTEX)	120	if (binding.visibility & GPUShaderStageBit::Flags::Vertex)
119	appendArgumentToArray(vertexArgsArray, mtlArgument);	121	appendArgumentToArray(vertexArgsArray, mtlArgument);
120	if (binding.visibility & GPUShaderStageBit::FRAGMENT)	122	if (binding.visibility & GPUShaderStageBit::Flags::Fragment)
121	appendArgumentToArray(fragmentArgsArray, mtlArgument);	123	appendArgumentToArray(fragmentArgsArray, mtlArgument);
122	if (binding.visibility & GPUShaderStageBit::COMPUTE)	124	if (binding.visibility & GPUShaderStageBit::Flags::Compute)
123	appendArgumentToArray(computeArgsArray, mtlArgument);	125	appendArgumentToArray(computeArgsArray, mtlArgument);
124	}	126	}
125		127

Lines 38-44 namespace WebCore { a/Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm_sec1
- a/Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm -3 / +3 lines
38		38
39	RefPtr<GPUDevice> GPUDevice::create(Optional<GPURequestAdapterOptions>&& options)	39	RefPtr<GPUDevice> GPUDevice::create(Optional<GPURequestAdapterOptions>&& options)
40	{	40	{
41	PlatformDeviceSmartPtr devicePtr;	41	RetainPtr<MTLDevice> devicePtr;
42		42
43	BEGIN_BLOCK_OBJC_EXCEPTIONS;	43	BEGIN_BLOCK_OBJC_EXCEPTIONS;
44		44
Lines 48-54 RefPtr<GPUDevice> GPUDevice::create(Optional<GPURequestAdapterOptions>&& options a/Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm_sec2
48		48
49	for (id <MTLDevice> device : devices.get()) {	49	for (id <MTLDevice> device : devices.get()) {
50	if (device.lowPower) {	50	if (device.lowPower) {
51	devicePtr = retainPtr(device);	51	devicePtr = device;
52	break;	52	break;
53	}	53	}
54	}	54	}
Lines 70-76 RefPtr<GPUDevice> GPUDevice::create(Optional<GPURequestAdapterOptions>&& options a/Source/WebCore/platform/graphics/gpu/cocoa/GPUDeviceMetal.mm_sec3
70	return adoptRef(new GPUDevice(WTFMove(devicePtr)));	70	return adoptRef(new GPUDevice(WTFMove(devicePtr)));
71	}	71	}
72		72
73	GPUDevice::GPUDevice(PlatformDeviceSmartPtr&& device)	73	GPUDevice::GPUDevice(RetainPtr<MTLDevice>&& device)
74	: m_platformDevice(WTFMove(device))	74	: m_platformDevice(WTFMove(device))
75	{	75	{
76	}	76	}

Lines 38-51 namespace WebCore { a/Source/WebCore/platform/graphics/gpu/cocoa/GPUProgrammablePassEncoderMetal.mm_sec1
- a/Source/WebCore/platform/graphics/gpu/cocoa/GPUProgrammablePassEncoderMetal.mm -38 / +82 lines
38		38
39	void GPUProgrammablePassEncoder::endPass()	39	void GPUProgrammablePassEncoder::endPass()
40	{	40	{
41	if (!m_isEncoding)	41	ASSERT(platformPassEncoder());
42	return;
43		42
		43	BEGIN_BLOCK_OBJC_EXCEPTIONS;
44	[platformPassEncoder() endEncoding];	44	[platformPassEncoder() endEncoding];
45	m_isEncoding = false;	45	END_BLOCK_OBJC_EXCEPTIONS;
		46
		47	m_commandBuffer->setIsEncodingPass(false);
46	}	48	}
47		49
48	void GPUProgrammablePassEncoder::setResourceAsBufferOnEncoder(MTLArgumentEncoder argumentEncoder, const GPUBindingResource& resource, unsigned long index, const char const functionName)	50	void GPUProgrammablePassEncoder::setBindGroup(unsigned index, GPUBindGroup& bindGroup)
		51	{
		52	const char* const functionName = "GPUProgrammablePassEncoder::setBindGroup()";
		53
		54	if (!platformPassEncoder()) {
		55	LOG(WebGPU, "%s: Invalid operation: Encoding is ended!");
		56	return;
		57	}
		58
		59	const auto& vertexArgs = bindGroup.layout().vertexArguments();
		60	const auto& fragmentArgs = bindGroup.layout().fragmentArguments();
		61	// FIXME: Finish support for compute.
		62
		63	BEGIN_BLOCK_OBJC_EXCEPTIONS;
		64
		65	if (vertexArgs.buffer)
		66	setVertexBuffer(vertexArgs.buffer.get(), 0, index);
		67	if (fragmentArgs.buffer)
		68	setFragmentBuffer(fragmentArgs.buffer.get(), 0, index);
		69
		70	END_BLOCK_OBJC_EXCEPTIONS;
		71
		72	// Set each resource on each MTLArgumentEncoder it should be visible on.
		73	const auto& bindingsMap = bindGroup.layout().bindingsMap();
		74	for (const auto& binding : bindGroup.bindings()) {
		75	auto iterator = bindingsMap.find(binding.binding);
		76	if (iterator == bindingsMap.end()) {
		77	LOG(WebGPU, "%s: GPUBindGroupBinding %lu not found in GPUBindGroupLayout!", functionName, binding.binding);
		78	return;
		79	}
		80	auto bindGroupLayoutBinding = iterator->value;
		81
		82	switch (bindGroupLayoutBinding.type) {
		83	// FIXME: Support more resource types.
		84	case GPUBindGroupLayoutBinding::BindingType::UniformBuffer:
		85	case GPUBindGroupLayoutBinding::BindingType::StorageBuffer: {
		86	if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::Flags::Vertex)
		87	setResourceAsBufferOnEncoder(vertexArgs.encoder.get(), binding.resource, binding.binding, functionName);
		88	if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::Flags::Fragment)
		89	setResourceAsBufferOnEncoder(fragmentArgs.encoder.get(), binding.resource, binding.binding, functionName);
		90	break;
		91	}
		92	case GPUBindGroupLayoutBinding::BindingType::SampledTexture: {
		93	if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::Flags::Vertex)
		94	setResourceAsTextureOnEncoder(vertexArgs.encoder.get(), binding.resource, binding.binding, functionName);
		95	if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::Flags::Fragment)
		96	setResourceAsTextureOnEncoder(fragmentArgs.encoder.get(), binding.resource, binding.binding, functionName);
		97	break;
		98	}
		99	default:
		100	LOG(WebGPU, "%s: Resource type not yet implemented.", functionName);
		101	return;
		102	}
		103	}
		104	}
		105
		106	void GPUProgrammablePassEncoder::setResourceAsBufferOnEncoder(MTLArgumentEncoder argumentEncoder, const GPUBindingResource& resource, unsigned index, const char const functionName)
49	{	107	{
50	#if LOG_DISABLED	108	#if LOG_DISABLED
51	UNUSED_PARAM(functionName);	109	UNUSED_PARAM(functionName);
Lines 79-129 void GPUProgrammablePassEncoder::setResourceAsBufferOnEncoder(MTLArgumentEncoder a/Source/WebCore/platform/graphics/gpu/cocoa/GPUProgrammablePassEncoderMetal.mm_sec2
79	m_commandBuffer->useBuffer(bufferRef.copyRef());	137	m_commandBuffer->useBuffer(bufferRef.copyRef());
80	}	138	}
81		139
82	void GPUProgrammablePassEncoder::setBindGroup(unsigned long index, GPUBindGroup& bindGroup)	140	void GPUProgrammablePassEncoder::setResourceAsTextureOnEncoder(MTLArgumentEncoder argumentEncoder, const GPUBindingResource& resource, unsigned index, const char const functionName)
83	{	141	{
84	const char* const functionName = "GPUProgrammablePassEncoder::setBindGroup()";
85	#if LOG_DISABLED	142	#if LOG_DISABLED
86	UNUSED_PARAM(functionName);	143	UNUSED_PARAM(functionName);
87	#endif	144	#endif
		145	if (!argumentEncoder) {
		146	LOG(WebGPU, "%s: No argument encoder for requested stage found!", functionName);
		147	return;
		148	}
88		149
89	const auto& vertexArgs = bindGroup.layout().vertexArguments();	150	if (!WTF::holds_alternative<Ref<GPUTexture>>(resource)) {
90	const auto& fragmentArgs = bindGroup.layout().fragmentArguments();	151	LOG(WebGPU, "%s: Resource is not a texture type!", functionName);
91	// FIXME: Finish support for compute.	152	return;
		153	}
		154
		155	auto& textureRef = WTF::get<Ref<GPUTexture>>(resource);
		156	auto mtlTexture = textureRef->platformTexture();
		157
		158	if (!mtlTexture) {
		159	LOG(WebGPU, "%s: Invalid MTLTexture in GPUTextureView binding!", functionName);
		160	return;
		161	}
92		162
93	BEGIN_BLOCK_OBJC_EXCEPTIONS;	163	BEGIN_BLOCK_OBJC_EXCEPTIONS;
94		164
95	if (vertexArgs.buffer)	165	[argumentEncoder setTexture:mtlTexture atIndex:index];
96	setVertexBuffer(vertexArgs.buffer.get(), 0, index);	166	useResource(mtlTexture, textureRef->isReadOnly() ? MTLResourceUsageRead : MTLResourceUsageRead \| MTLResourceUsageWrite);
97	if (fragmentArgs.buffer)
98	setFragmentBuffer(fragmentArgs.buffer.get(), 0, index);
99		167
100	END_BLOCK_OBJC_EXCEPTIONS;	168	END_BLOCK_OBJC_EXCEPTIONS;
101		169
102	// Set each resource on each MTLArgumentEncoder it should be visible on.	170	m_commandBuffer->useTexture(textureRef.copyRef());
103	const auto& bindingsMap = bindGroup.layout().bindingsMap();
104	for (const auto& binding : bindGroup.bindings()) {
105	auto iterator = bindingsMap.find(binding.binding);
106	if (iterator == bindingsMap.end()) {
107	LOG(WebGPU, "%s: GPUBindGroupBinding %lu not found in GPUBindGroupLayout!", functionName, binding.binding);
108	return;
109	}
110	auto bindGroupLayoutBinding = iterator->value;
111
112	switch (bindGroupLayoutBinding.type) {
113	// FIXME: Support more resource types.
114	case GPUBindGroupLayoutBinding::BindingType::UniformBuffer:
115	case GPUBindGroupLayoutBinding::BindingType::StorageBuffer: {
116	if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::VERTEX)
117	setResourceAsBufferOnEncoder(vertexArgs.encoder.get(), binding.resource, binding.binding, functionName);
118	if (bindGroupLayoutBinding.visibility & GPUShaderStageBit::FRAGMENT)
119	setResourceAsBufferOnEncoder(fragmentArgs.encoder.get(), binding.resource, binding.binding, functionName);
120	break;
121	}
122	default:
123	LOG(WebGPU, "%s: Resource type not yet implemented.", functionName);
124	return;
125	}
126	}
127	}	171	}
128		172
129	} // namespace WebCore	173	} // namespace WebCore

Lines 70-82 GPUQueue::GPUQueue(PlatformQueueSmartPtr&& queue) a/Source/WebCore/platform/graphics/gpu/cocoa/GPUQueueMetal.mm_sec1
- a/Source/WebCore/platform/graphics/gpu/cocoa/GPUQueueMetal.mm -3 / +9 lines
70	{	70	{
71	}	71	}
72		72
73	void GPUQueue::submit(Vector<Ref<const GPUCommandBuffer>>&& commandBuffers)	73	void GPUQueue::submit(Vector<Ref<GPUCommandBuffer>>&& commandBuffers)
74	{	74	{
75	BEGIN_BLOCK_OBJC_EXCEPTIONS;	75	BEGIN_BLOCK_OBJC_EXCEPTIONS;
76		76
77	for (auto& commandBuffer : commandBuffers) {	77	for (auto& commandBuffer : commandBuffers) {
78	if (commandBuffer->blitEncoder())	78	commandBuffer->endBlitEncoding();
79	[commandBuffer->blitEncoder() endEncoding];
80	// Prevent any buffer mapping callbacks from executing until command buffer is complete.	79	// Prevent any buffer mapping callbacks from executing until command buffer is complete.
81	for (auto& buffer : commandBuffer->usedBuffers()) {	80	for (auto& buffer : commandBuffer->usedBuffers()) {
82	if (buffer->state() != GPUBuffer::State::Unmapped) {	81	if (buffer->state() != GPUBuffer::State::Unmapped) {
Lines 85-90 void GPUQueue::submit(Vector<Ref<const GPUCommandBuffer>>&& commandBuffers) a/Source/WebCore/platform/graphics/gpu/cocoa/GPUQueueMetal.mm_sec2
85	}	84	}
86	buffer->commandBufferCommitted(commandBuffer->platformCommandBuffer());	85	buffer->commandBufferCommitted(commandBuffer->platformCommandBuffer());
87	}	86	}
		87	// Also ensure textures are still valid.
		88	for (auto& texture : commandBuffer->usedTextures()) {
		89	if (!texture->platformTexture()) {
		90	LOG(WebGPU, "GPUQueue::submit(): Invalid GPUTexture set on a GPUCommandBuffer!");
		91	return;
		92	}
		93	}
88		94
89	[commandBuffer->platformCommandBuffer() commit];	95	[commandBuffer->platformCommandBuffer() commit];
90	}	96	}

Lines 82-99 static Optional<MTLTextureUsage> mtlTextureUsageForGPUTextureUsageFlags(OptionSe a/Source/WebCore/platform/graphics/gpu/cocoa/GPUTextureMetal.mm_sec1
- a/Source/WebCore/platform/graphics/gpu/cocoa/GPUTextureMetal.mm -7 / +9 lines
82	return MTLTextureUsageUnknown;	82	return MTLTextureUsageUnknown;
83	}	83	}
84		84
		85	#if !PLATFORM(MAC)
85	static MTLStorageMode storageModeForPixelFormatAndSampleCount(MTLPixelFormat format, unsigned long samples)	86	static MTLStorageMode storageModeForPixelFormatAndSampleCount(MTLPixelFormat format, unsigned long samples)
86	{	87	{
87	// Depth, Stencil, DepthStencil, and Multisample textures must be allocated with the MTLStorageModePrivate resource option.	88	// Depth, Stencil, DepthStencil, and Multisample textures must be allocated with the MTLStorageModePrivate resource option.
88	if (format == MTLPixelFormatDepth32Float_Stencil8 \|\| samples > 1)	89	if (format == MTLPixelFormatDepth32Float_Stencil8 \|\| samples > 1)
89	return MTLStorageModePrivate;	90	return MTLStorageModePrivate;
90		91
91	#if PLATFORM(MAC)
92	return MTLStorageModeManaged;
93	#else
94	return MTLStorageModeShared;	92	return MTLStorageModeShared;
95	#endif
96	}	93	}
		94	#endif
97		95
98	static RetainPtr<MTLTextureDescriptor> tryCreateMtlTextureDescriptor(const char* const functionName, const GPUTextureDescriptor& descriptor, OptionSet<GPUTextureUsage::Flags> usage)	96	static RetainPtr<MTLTextureDescriptor> tryCreateMtlTextureDescriptor(const char* const functionName, const GPUTextureDescriptor& descriptor, OptionSet<GPUTextureUsage::Flags> usage)
99	{	97	{
Lines 117-123 static RetainPtr<MTLTextureDescriptor> tryCreateMtlTextureDescriptor(const char* a/Source/WebCore/platform/graphics/gpu/cocoa/GPUTextureMetal.mm_sec2
117	if (!mtlUsage)	115	if (!mtlUsage)
118	return nullptr;	116	return nullptr;
119		117
		118	#if PLATFORM(MAC)
		119	auto storageMode = MTLStorageModePrivate;
		120	#else
120	auto storageMode = storageModeForPixelFormatAndSampleCount(pixelFormat, descriptor.sampleCount);	121	auto storageMode = storageModeForPixelFormatAndSampleCount(pixelFormat, descriptor.sampleCount);
		122	#endif
121		123
122	BEGIN_BLOCK_OBJC_EXCEPTIONS;	124	BEGIN_BLOCK_OBJC_EXCEPTIONS;
123		125
Lines 168-185 RefPtr<GPUTexture> GPUTexture::tryCreate(const GPUDevice& device, const GPUTextu a/Source/WebCore/platform/graphics/gpu/cocoa/GPUTextureMetal.mm_sec3
168	return adoptRef(new GPUTexture(WTFMove(mtlTexture), usage));	170	return adoptRef(new GPUTexture(WTFMove(mtlTexture), usage));
169	}	171	}
170		172
171	Ref<GPUTexture> GPUTexture::create(PlatformTextureSmartPtr&& texture, OptionSet<GPUTextureUsage::Flags> usage)	173	Ref<GPUTexture> GPUTexture::create(RetainPtr<MTLTexture>&& texture, OptionSet<GPUTextureUsage::Flags> usage)
172	{	174	{
173	return adoptRef(*new GPUTexture(WTFMove(texture), usage));	175	return adoptRef(*new GPUTexture(WTFMove(texture), usage));
174	}	176	}
175		177
176	GPUTexture::GPUTexture(PlatformTextureSmartPtr&& texture, OptionSet<GPUTextureUsage::Flags> usage)	178	GPUTexture::GPUTexture(RetainPtr<MTLTexture>&& texture, OptionSet<GPUTextureUsage::Flags> usage)
177	: m_platformTexture(WTFMove(texture))	179	: m_platformTexture(WTFMove(texture))
178	, m_usage(usage)	180	, m_usage(usage)
179	{	181	{
180	}	182	}
181		183
182	RefPtr<GPUTexture> GPUTexture::createDefaultTextureView()	184	RefPtr<GPUTexture> GPUTexture::tryCreateDefaultTextureView()
183	{	185	{
184	RetainPtr<MTLTexture> texture;	186	RetainPtr<MTLTexture> texture;
185		187

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +18 lines
		1	2019-03-05 Justin Fan <justin_fan@apple.com>
		2
		3	[Web GPU] GPUTexture and GPUTextureView updates, and related GPUBindGroup updates
		4	https://bugs.webkit.org/show_bug.cgi?id=195347
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* webgpu/blit-commands.html:
		9	* webgpu/resources/blue-checkered.png: Added.
		10	* webgpu/texture-triangle-strip-expected.html: Added. Draw a reference for blue-checkered.png with Canvas2D.
		11	* webgpu/texture-triangle-strip.html: Added. Draw blue-checkered.png as a texture on a Web GPU quad.
		12
		13	Renaming updates, no change in behavior:
		14	* webgpu/bind-groups.html:
		15	* webgpu/buffer-resource-triangles.html:
		16	* webgpu/pipeline-layouts.html:
		17	* webgpu/render-pipelines.html:
		18
1	2019-03-04 Justin Fan <justin_fan@apple.com>	19	2019-03-04 Justin Fan <justin_fan@apple.com>
2		20
3	[Web GPU] Blitting function prototypes	21	[Web GPU] Blitting function prototypes

Lines 13-20 promise_test(async () => { a/LayoutTests/webgpu/bind-groups.html_sec1
- a/LayoutTests/webgpu/bind-groups.html -2 / +2 lines
13	// FIXME: Also test sampled texture bindings.	13	// FIXME: Also test sampled texture bindings.
14	const bufferLayoutBinding = {	14	const bufferLayoutBinding = {
15	binding: 1,	15	binding: 1,
16	visibility: WebGPUShaderStageBit.VERTEX,	16	visibility: GPUShaderStageBit.VERTEX,
17	type: "storageBuffer"	17	type: "storage-buffer"
18	};	18	};
19		19
20	const bindGroupLayout = device.createBindGroupLayout({ bindings: [bufferLayoutBinding] });	20	const bindGroupLayout = device.createBindGroupLayout({ bindings: [bufferLayoutBinding] });

Lines 72-82 const bindingNums = { a/LayoutTests/webgpu/buffer-resource-triangles.html_sec1
- a/LayoutTests/webgpu/buffer-resource-triangles.html -3 / +3 lines
72	G: 5	72	G: 5
73	};	73	};
74		74
75	function createUniformBufferBindGroupLayout(bindNum, stage = WebGPUShaderStageBit.VERTEX) {	75	function createUniformBufferBindGroupLayout(bindNum, stage = GPUShaderStageBit.VERTEX) {
76	return {	76	return {
77	binding: bindNum,	77	binding: bindNum,
78	visibility: stage,	78	visibility: stage,
79	type: "uniformBuffer"	79	type: "uniform-buffer"
80	};	80	};
81	}	81	}
82		82
Lines 157-163 async function test() { a/LayoutTests/webgpu/buffer-resource-triangles.html_sec2
157	const layoutUR = createUniformBufferBindGroupLayout(bindingNums.UR);	157	const layoutUR = createUniformBufferBindGroupLayout(bindingNums.UR);
158	const layoutLL = createUniformBufferBindGroupLayout(bindingNums.LL);	158	const layoutLL = createUniformBufferBindGroupLayout(bindingNums.LL);
159	const layoutLR = createUniformBufferBindGroupLayout(bindingNums.LR);	159	const layoutLR = createUniformBufferBindGroupLayout(bindingNums.LR);
160	const layoutG = createUniformBufferBindGroupLayout(bindingNums.G, WebGPUShaderStageBit.FRAGMENT);	160	const layoutG = createUniformBufferBindGroupLayout(bindingNums.G, GPUShaderStageBit.FRAGMENT);
161		161
162	// WebGPUBindGroupLayouts	162	// WebGPUBindGroupLayouts
163	const leftTriangleBGLayout = device.createBindGroupLayout({ bindings: [layoutUL, layoutUM, layoutLL, layoutG] });	163	const leftTriangleBGLayout = device.createBindGroupLayout({ bindings: [layoutUL, layoutUM, layoutLL, layoutG] });

Lines 9-24 a/LayoutTests/webgpu/pipeline-layouts.html_sec1
- a/LayoutTests/webgpu/pipeline-layouts.html -5 / +5 lines
9	function createBindGroupLayoutBinding() {	9	function createBindGroupLayoutBinding() {
10	return {	10	return {
11	binding: 0,	11	binding: 0,
12	visibility: WebGPUShaderStageBit.FRAGMENT \| WebGPUShaderStageBit.VERTEX,	12	visibility: GPUShaderStageBit.FRAGMENT \| GPUShaderStageBit.VERTEX,
13	type: "storageBuffer"	13	type: "storage-buffer"
14	};	14	};
15	}	15	}
16		16
17	test(() => {	17	test(() => {
18	const bindGroupLayoutDescriptor = { bindings: [createBindGroupLayoutBinding()] };	18	const bindGroupLayoutDescriptor = { bindings: [createBindGroupLayoutBinding()] };
19	assert_not_equals(bindGroupLayoutDescriptor.bindings[0].visibility & WebGPUShaderStageBit.FRAGMENT, 0);	19	assert_not_equals(bindGroupLayoutDescriptor.bindings[0].visibility & GPUShaderStageBit.FRAGMENT, 0);
20	assert_not_equals(bindGroupLayoutDescriptor.bindings[0].visibility & WebGPUShaderStageBit.VERTEX, 0);	20	assert_not_equals(bindGroupLayoutDescriptor.bindings[0].visibility & GPUShaderStageBit.VERTEX, 0);
21	assert_equals(bindGroupLayoutDescriptor.bindings[0].type, "storageBuffer");	21	assert_equals(bindGroupLayoutDescriptor.bindings[0].type, "storage-buffer");
22	}, "Create a basic WebGPUBindGroupLayoutDescriptor.");	22	}, "Create a basic WebGPUBindGroupLayoutDescriptor.");
23		23
24	promise_test(async () => {	24	promise_test(async () => {

Line 0 a/LayoutTests/webgpu/texture-triangle-strip-expected.html_sec1
- a/LayoutTests/webgpu/texture-triangle-strip-expected.html +29 lines
	1	<!DOCTYPE html>
	2	<meta charset="utf-8">
	3	<title>HTML Reference File</title>
	4	<p>Pass if square canvas below is a 4 by 4 blue/green checkerboard.</p>
	5	<canvas width="400" height="400"></canvas>
	6	<script>
	7	const canvas = document.querySelector("canvas");
	8	const context = canvas.getContext('2d');
	9
	10	context.fillStyle = 'rgb(0, 255, 0)';
	11	context.fillRect(0, 0, canvas.width, canvas.height);
	12
	13	const numColumns = 4;
	14	const numRows = 4;
	15	context.beginPath();
	16	context.fillStyle = 'rgb(0, 0, 255)';
	17	for (let x = 0; x < numColumns; ++x) {
	18	for (let y = 0; y < numRows; ++y) {
	19	if (x % 2 == 0 && y % 2 == 0 \|\| x % 2 == 1 && y % 2 == 1)
	20	context.rect(
	21	x * canvas.width / numColumns,
	22	y * canvas.height / numRows,
	23	canvas.width / numColumns,
	24	canvas.height / numRows
	25	);
	26	}
	27	}
	28	context.fill();
	29	</script>