Attachment 357872 Details for Bug 192956 – Patch

[patch] Patch

bug-192956-20181220144035.patch (text/plain), 10.30 KB, created by Justin Fan on 2018-12-20 14:40:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Fan

Created: 2018-12-20 14:40:36 PST

Size: 10.30 KB

patch

obsolete

>Subversion Revision: 239355
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d571afad6e461219af1dc2aff2bc92b088818d82..5e8b58962e55d135a2323aae094d3d690f91080b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-12-20  Justin Fan  <justin_fan@apple.com>
>+
>+        [WebGPU] Convert WebGPUBindGroups into MTLArgumentEncoders
>+        https://bugs.webkit.org/show_bug.cgi?id=192956
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No testable behavior change. Existing tests cover possible crashing.
>+
>+        Add GPUBindGroupLayoutMetal.mm:
>+        * SourcesCocoa.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+
>+        Flesh out GPUBindGroupLayout::create:
>+        * platform/graphics/gpu/GPUBindGroupLayout.cpp:
>+        * platform/graphics/gpu/GPUBindGroupLayout.h:
>+        * platform/graphics/gpu/GPUDevice.cpp:
>+        (WebCore::GPUDevice::createBindGroupLayout const):
>+        * platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm: Added.
>+        (WebCore::appendArgumentToArrayInMap):
>+        (WebCore::GPUBindGroupLayout::create):
>+        (WebCore::GPUBindGroupLayout::GPUBindGroupLayout):
>+
> 2018-12-19  Justin Fan  <justin_fan@apple.com>
> 
>         [WebGPU] Add stubs for WebGPUPipelineLayout/Descriptor and device::createPipelineLayout
>diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
>index fb7985520f9f9aebb67ea6060f3c3aa2e883f113..8ee125dcd561c74d2bf097c73ed8a06442a9c94d 100644
>--- a/Source/WebCore/SourcesCocoa.txt
>+++ b/Source/WebCore/SourcesCocoa.txt
>@@ -318,6 +318,7 @@ platform/graphics/cv/PixelBufferConformerCV.cpp
> platform/graphics/cv/TextureCacheCV.mm
> platform/graphics/cv/VideoTextureCopierCV.cpp
> 
>+platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm
> platform/graphics/gpu/cocoa/GPUBufferMetal.mm
> platform/graphics/gpu/cocoa/GPUCommandBufferMetal.mm
> platform/graphics/gpu/cocoa/GPUDeviceMetal.mm
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 52919e50634f81ba1dcec7ea0598554719ef7579..dcbd7934ba94adc220ef83228e5527f359ed8f0e 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -13737,6 +13737,7 @@
> 		D00F595421701D8C000D71DB /* WebGPUDevice.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUDevice.idl; sourceTree = "<group>"; };
> 		D01A27AB10C9BFD800026A42 /* SpaceSplitString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpaceSplitString.cpp; sourceTree = "<group>"; };
> 		D01A27AC10C9BFD800026A42 /* SpaceSplitString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpaceSplitString.h; sourceTree = "<group>"; };
>+		D0232B5821CB49B7009483B9 /* GPUBindGroupLayoutMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUBindGroupLayoutMetal.mm; sourceTree = "<group>"; };
> 		D02454D021C4A41C00B73628 /* GPUBindGroupLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUBindGroupLayout.h; sourceTree = "<group>"; };
> 		D02454D121C4A41C00B73628 /* GPUBindGroupLayout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPUBindGroupLayout.cpp; sourceTree = "<group>"; };
> 		D02B83ED21C8397A00F85473 /* WebGPUBindGroupLayoutDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUBindGroupLayoutDescriptor.idl; sourceTree = "<group>"; };
>@@ -25670,6 +25671,7 @@
> 		D087CE3721ACA94200BDE174 /* cocoa */ = {
> 			isa = PBXGroup;
> 			children = (
>+				D0232B5821CB49B7009483B9 /* GPUBindGroupLayoutMetal.mm */,
> 				D0D8649121B760C4003C983C /* GPUBufferMetal.mm */,
> 				D087CE3821ACA94200BDE174 /* GPUCommandBufferMetal.mm */,
> 				D087CE3C21ACA94200BDE174 /* GPUDeviceMetal.mm */,
>diff --git a/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.cpp b/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.cpp
>index 3a7b179f4b1eead173c386e87c4ec7cfb17be57e..729c062834a03ca83d8197c4a001e0b221e9860c 100644
>--- a/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.cpp
>+++ b/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.cpp
>@@ -30,16 +30,6 @@
> 
> namespace WebCore {
> 
>-Ref<GPUBindGroupLayout> GPUBindGroupLayout::create(GPUBindGroupLayoutDescriptor&& descriptor)
>-{
>-    return adoptRef(*new GPUBindGroupLayout(WTFMove(descriptor)));
>-}
>-
>-GPUBindGroupLayout::GPUBindGroupLayout(GPUBindGroupLayoutDescriptor&&)
>-{
>-    // FIXME: Stub implementation.
>-}
>-
> } // namespace WebCore
> 
> #endif // ENABLE(WEBGPU)
>diff --git a/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h b/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h
>index bfba690df1e277b339904e4b87f75dae9261e6d0..1c0a91590bf163d8679f788d12e5753a4b157c11 100644
>--- a/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h
>+++ b/Source/WebCore/platform/graphics/gpu/GPUBindGroupLayout.h
>@@ -29,17 +29,28 @@
> 
> #include "GPUBindGroupLayoutDescriptor.h"
> 
>+#include <wtf/HashMap.h>
> #include <wtf/Ref.h>
> #include <wtf/RefCounted.h>
>+#include <wtf/RetainPtr.h>
>+#include <wtf/Vector.h>
>+
>+OBJC_PROTOCOL(MTLArgumentEncoder);
> 
> namespace WebCore {
> 
>+class GPUDevice;
>+
> class GPUBindGroupLayout : public RefCounted<GPUBindGroupLayout> {
> public:
>-    static Ref<GPUBindGroupLayout> create(GPUBindGroupLayoutDescriptor&&);
>+    using ArgumentsMap = HashMap<GPUShaderStageFlags, RetainPtr<MTLArgumentEncoder>>;
>+
>+    static Ref<GPUBindGroupLayout> create(const GPUDevice&, GPUBindGroupLayoutDescriptor&&);
> 
> private:
>-    GPUBindGroupLayout(GPUBindGroupLayoutDescriptor&&);
>+    GPUBindGroupLayout(ArgumentsMap&&);
>+
>+    ArgumentsMap m_argumentsMap;
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp b/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp
>index 17c76fd3b5e772bc8fb0558bec1383fc90170a65..8097d590c6c544cd2db230c86104b98be22450c8 100644
>--- a/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp
>+++ b/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp
>@@ -48,7 +48,7 @@ RefPtr<GPUBuffer> GPUDevice::createBuffer(GPUBufferDescriptor&& descriptor) cons
> 
> Ref<GPUBindGroupLayout> GPUDevice::createBindGroupLayout(GPUBindGroupLayoutDescriptor&& descriptor) const
> {
>-    return GPUBindGroupLayout::create(WTFMove(descriptor));
>+    return GPUBindGroupLayout::create(*this, WTFMove(descriptor));
> }
> 
> Ref<GPUPipelineLayout> GPUDevice::createPipelineLayout(GPUPipelineLayoutDescriptor&& descriptor) const
>diff --git a/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm b/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm
>new file mode 100644
>index 0000000000000000000000000000000000000000..fdc635a8b08f753e718341480691ff26669918ab
>--- /dev/null
>+++ b/Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupLayoutMetal.mm
>@@ -0,0 +1,83 @@
>+/*
>+ * 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.
>+ */
>+
>+#import "config.h"
>+#import "GPUBindGroupLayout.h"
>+
>+#if ENABLE(WEBGPU)
>+
>+#import "GPUDevice.h"
>+
>+#import <Metal/Metal.h>
>+
>+namespace WebCore {
>+
>+using ArgumentArraysMap = HashMap<GPUShaderStageFlags, RetainPtr<NSMutableArray<MTLArgumentDescriptor *>>>;
>+static void appendArgumentToArrayInMap(ArgumentArraysMap& map, GPUShaderStageFlags stage, RetainPtr<MTLArgumentDescriptor> argument)
>+{
>+    auto iterator = map.find(stage);
>+    if (iterator == map.end())
>+        map.set(stage, [[NSMutableArray alloc] initWithObjects:argument.get(), nil]);
>+    else
>+        [iterator->value addObject:argument.get()];
>+}
>+
>+Ref<GPUBindGroupLayout> GPUBindGroupLayout::create(const GPUDevice& device, GPUBindGroupLayoutDescriptor&& descriptor)
>+{
>+    ArgumentArraysMap argumentArraysMap;
>+
>+    for (const auto& binding : descriptor.bindings) {
>+        auto mtlArgument = adoptNS([MTLArgumentDescriptor new]);
>+        // FIXME: According to docs, this should be MTLDataTypeNone, but that crashes newArgumentEncoderWithArguments.
>+        mtlArgument.get().dataType = MTLDataTypeSampler;
>+        mtlArgument.get().index = binding.binding;
>+        mtlArgument.get().arrayLength = 0;
>+
>+        if (binding.visibility & GPUShaderStageBit::VERTEX)
>+            appendArgumentToArrayInMap(argumentArraysMap, GPUShaderStageBit::VERTEX, mtlArgument);
>+        if (binding.visibility & GPUShaderStageBit::FRAGMENT)
>+            appendArgumentToArrayInMap(argumentArraysMap, GPUShaderStageBit::FRAGMENT, mtlArgument);
>+        if (binding.visibility & GPUShaderStageBit::COMPUTE)
>+            appendArgumentToArrayInMap(argumentArraysMap, GPUShaderStageBit::COMPUTE, mtlArgument);
>+    }
>+
>+    ArgumentsMap argumentsMap;
>+
>+    for (const auto& argumentArrayPair : argumentArraysMap) {
>+        auto mtlArgumentEncoder = adoptNS([device.platformDevice() newArgumentEncoderWithArguments:argumentArrayPair.value.get()]);
>+        argumentsMap.set(argumentArrayPair.key, mtlArgumentEncoder);
>+    }
>+
>+    return adoptRef(*new GPUBindGroupLayout(WTFMove(argumentsMap)));
>+}
>+
>+GPUBindGroupLayout::GPUBindGroupLayout(ArgumentsMap&& map)
>+    : m_argumentsMap(map)
>+{
>+}
>+
>+} // namespace WebCore
>+
>+#endif // ENABLE(WEBGPU)

Actions: View | Formatted Diff | Diff

Attachments on bug 192956: 357872 | 357887 | 357911 | 357913 | 357914