Changeset 243456 in webkit

Timestamp:

Mar 25, 2019, 2:10:38 PM (7 years ago)

Author:

Truitt Savell

Message:

Unreviewed, rolling out r243438.

243319 Caused Mac WK2 testers to crash and become
unresponsive.

Reverted changeset:

"Update WebGPU class names based on sketch.idl"
​https://bugs.webkit.org/show_bug.cgi?id=194260
​https://trac.webkit.org/changeset/243438

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgpu/adapter-options.html (modified) (3 diffs)
• LayoutTests/webgpu/bind-groups.html (modified) (1 diff)
• LayoutTests/webgpu/map-read-buffers.html (modified) (1 diff)
• LayoutTests/webgpu/map-write-buffers.html (modified) (1 diff)
• LayoutTests/webgpu/pipeline-layouts.html (modified) (1 diff)
• LayoutTests/webgpu/queue-creation.html (modified) (1 diff)
• LayoutTests/webgpu/render-command-encoding.html (modified) (1 diff)
• LayoutTests/webgpu/render-pipelines.html (modified) (1 diff)
• LayoutTests/webgpu/textures-textureviews.html (modified) (3 diffs)
• LayoutTests/webgpu/webgpu-enabled.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPU.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUAdapter.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUBindGroup.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUBindGroupLayout.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUBuffer.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUDevice.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUInputStepMode.h (copied) (copied from trunk/Source/WebCore/Modules/webgpu/WebGPUTextureView.idl ) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUPipelineLayout.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUQueue.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPURenderPipeline.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUSampler.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUTexture.idl (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WebGPUTextureView.idl (modified) (1 diff)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• Source/WebCore/bindings/js/WebCoreBuiltinNames.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-25  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r243438.
+
+        243319 Caused Mac WK2 testers to crash and become
+        unresponsive.
+
+        Reverted changeset:
+
+        "Update WebGPU class names based on sketch.idl"
+        https://bugs.webkit.org/show_bug.cgi?id=194260
+        https://trac.webkit.org/changeset/243438
+
 2019-03-25  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/LayoutTests/webgpu/adapter-options.html

@@ -10 +10 @@
     const device = await defaultAdapter.requestDevice();
 
-    assert_true(device instanceof GPUDevice, "Default device successfully created.");
+    assert_true(device instanceof WebGPUDevice, "Default device successfully created.");
 }, "Create the default device.");
 
@@ -17 +17 @@
     const device = await lowPowerAdapter.requestDevice();
 
-    assert_true(device instanceof GPUDevice, "Device successfully created using low-power option.");
+    assert_true(device instanceof WebGPUDevice, "Device successfully created using low-power option.");
 }, "Create a device with a low-power option.");
 
@@ -24 +24 @@
     const device = await highPerfAdapter.requestDevice();
 
-    assert_true(device instanceof GPUDevice, "Device successfully created using high-performance option.");
+    assert_true(device instanceof WebGPUDevice, "Device successfully created using high-performance option.");
 }, "Create a device with a high-performance option.");
 </script>

trunk/LayoutTests/webgpu/bind-groups.html

@@ -25 +25 @@
 
     const bindGroup = device.createBindGroup({ layout: bindGroupLayout, bindings: [bindGroupBinding]});
-    assert_true(bindGroup instanceof GPUBindGroup, "WebGPUBindGroup successfully created.")
+    assert_true(bindGroup instanceof WebGPUBindGroup, "WebGPUBindGroup successfully created.")
 }, "Create a basic WebGPUBindGroup via WebGPUDevice.")
 </script>

trunk/LayoutTests/webgpu/map-read-buffers.html

@@ -13 +13 @@
     promise_test(async () => {
         const buffer = device.createBuffer({ size: 16, usage: GPUBufferUsage.TRANSFER_DST | GPUBufferUsage.MAP_READ });
-        assert_true(buffer instanceof GPUBuffer, "createBuffer returned a WebGPUBuffer");
+        assert_true(buffer instanceof WebGPUBuffer, "createBuffer returned a WebGPUBuffer");
 
         let array = new Float32Array([1, 2, 3, 4]);

trunk/LayoutTests/webgpu/map-write-buffers.html

@@ -13 +13 @@
     promise_test(async () => {
         const buffer = device.createBuffer({ size: 16, usage: GPUBufferUsage.MAP_WRITE });
-        assert_true(buffer instanceof GPUBuffer, "createBuffer returned a WebGPUBuffer");
+        assert_true(buffer instanceof WebGPUBuffer, "createBuffer returned a WebGPUBuffer");
 
         let arrayBuffer = await buffer.mapWriteAsync();

trunk/LayoutTests/webgpu/pipeline-layouts.html

@@ -25 +25 @@
     const device = await getBasicDevice();
     const bindGroupLayout = device.createBindGroupLayout({ bindings: [createBindGroupLayoutBinding()] });
-    assert_true(bindGroupLayout instanceof GPUBindGroupLayout, "createBindGroupLayout returned a WebGPUBindGroupLayout");
+    assert_true(bindGroupLayout instanceof WebGPUBindGroupLayout, "createBindGroupLayout returned a WebGPUBindGroupLayout");
 
     const pipelineLayout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] });
-    assert_true(pipelineLayout instanceof GPUPipelineLayout, "createPipelineLayout returned a WebGPUPipelineLayout");
+    assert_true(pipelineLayout instanceof WebGPUPipelineLayout, "createPipelineLayout returned a WebGPUPipelineLayout");
 }, "Create a basic WebGPUPipelineLayout wtih a WebGPUDevice.");
 </script>

trunk/LayoutTests/webgpu/queue-creation.html

@@ -16 +16 @@
 
     const adapter = await window.gpu.requestAdapter({});
-    assert_true(adapter instanceof GPUAdapter, "requestAdapter returned a WebGPUAdapter.");
+    assert_true(adapter instanceof WebGPUAdapter, "requestAdapter returned a WebGPUAdapter.");
 
     const device = await adapter.requestDevice();
-    assert_true(device instanceof GPUDevice, "requestDevice returned a WebGPUDevice.");
+    assert_true(device instanceof WebGPUDevice, "requestDevice returned a WebGPUDevice.");
 
     const queue = device.getQueue();
-    assert_true(queue instanceof GPUQueue, "getQueue returned a WebGPUQueue.");
+    assert_true(queue instanceof WebGPUQueue, "getQueue returned a WebGPUQueue.");
 
     queue.label = "Example label";

trunk/LayoutTests/webgpu/render-command-encoding.html

@@ -39 +39 @@
 
     const encoder = beginBasicRenderPass(swapChain, commandEncoder);
-    assert_true(encoder instanceof GPURenderPassEncoder, "beginRenderPass() returned a WebGPURenderPassEncoder");
+    assert_true(encoder instanceof WebGPURenderPassEncoder, "beginRenderPass() returned a WebGPURenderPassEncoder");
 
     encoder.setPipeline(pipeline);

trunk/LayoutTests/webgpu/render-pipelines.html

@@ -49 +49 @@
 
     const pipeline = createBasicPipeline(shaderModule, device, pipelineLayout);
-    assert_true(pipeline instanceof GPURenderPipeline, "Successfully created WebGPURenderPipeline");
+    assert_true(pipeline instanceof WebGPURenderPipeline, "Successfully created WebGPURenderPipeline");
 }, "Create basic WebGPURenderPipeline");
 </script>

trunk/LayoutTests/webgpu/textures-textureviews.html

@@ -32 +32 @@
 
     const texture = swapChain.getCurrentTexture();
-    assert_true(texture instanceof GPUTexture, "Successfully acquired next texture.");
+    assert_true(texture instanceof WebGPUTexture, "Successfully acquired next texture.");
 
     const textureView = texture.createDefaultView();
-    assert_true(textureView instanceof GPUTextureView, "Successfully created texture view from next texture.");
+    assert_true(textureView instanceof WebGPUTextureView, "Successfully created texture view from next texture.");
 }, "Create texture view from swap chain.");
 
 promise_test(async () => {
     const depthTexture = device.createTexture(texDescriptor);
-    assert_true(depthTexture instanceof GPUTexture, "Successfully created depth texture.");
+    assert_true(depthTexture instanceof WebGPUTexture, "Successfully created depth texture.");
 }, "Create basic depth texture from device.");
 
@@ -49 +49 @@
 
     const multisampledTexture = device.createTexture(texDescriptor);
-    assert_true(multisampledTexture instanceof GPUTexture, "Successfully created multisampled texture.");
+    assert_true(multisampledTexture instanceof WebGPUTexture, "Successfully created multisampled texture.");
 }, "Create basic 4x multisampled texture.");
 
@@ -58 +58 @@
 
     const texture3d = device.createTexture(texDescriptor);
-    assert_true(texture3d instanceof GPUTexture, "Successfully created basic 3D texture.");
+    assert_true(texture3d instanceof WebGPUTexture, "Successfully created basic 3D texture.");
 }, "Create basic 3D texture from device.");
 

trunk/LayoutTests/webgpu/webgpu-enabled.html

@@ -14 +14 @@
 
     const adapter = await window.gpu.requestAdapter();
-    assert_true(adapter instanceof GPUAdapter, "Created default GPUAdapter.");
+    assert_true(adapter instanceof WebGPUAdapter, "Created default GPUAdapter.");
     
     const device = await adapter.requestDevice();
-    assert_true(device instanceof GPUDevice, "Created GPUDevice.");
+    assert_true(device instanceof WebGPUDevice, "Created GPUDevice.");
 }, "Web GPU is enabled.");
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-25  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r243438.
+
+        243319 Caused Mac WK2 testers to crash and become
+        unresponsive.
+
+        Reverted changeset:
+
+        "Update WebGPU class names based on sketch.idl"
+        https://bugs.webkit.org/show_bug.cgi?id=194260
+        https://trac.webkit.org/changeset/243438
+
 2019-03-25  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/Modules/webgpu/WebGPU.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPU
+    ImplementationLacksVTable
 ] interface WebGPU {
     Promise<WebGPUAdapter> requestAdapter(optional GPURequestAdapterOptions options);

trunk/Source/WebCore/Modules/webgpu/WebGPUAdapter.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUAdapter
+    ImplementationLacksVTable
 ] interface WebGPUAdapter {
     // readonly attribute DOMString name;

trunk/Source/WebCore/Modules/webgpu/WebGPUBindGroup.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUBindGroup
+    ImplementationLacksVTable
 ] interface WebGPUBindGroup {
 };

trunk/Source/WebCore/Modules/webgpu/WebGPUBindGroupLayout.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUBindGroupLayout
+    ImplementationLacksVTable
 ] interface WebGPUBindGroupLayout {
 };

trunk/Source/WebCore/Modules/webgpu/WebGPUBuffer.idl

@@ -30 +30 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUBuffer
+    ImplementationLacksVTable
 ] interface WebGPUBuffer {
     void setSubData(u64 offset, ArrayBuffer data);

trunk/Source/WebCore/Modules/webgpu/WebGPUDevice.idl

@@ -40 +40 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUDevice
+    ImplementationLacksVTable
 ] interface WebGPUDevice {
     readonly attribute WebGPUAdapter adapter;

trunk/Source/WebCore/Modules/webgpu/WebGPUInputStepMode.h

@@ -23 +23 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-// https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl
 
-[
-    Conditional=WEBGPU,
-    EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUTextureView
-] interface WebGPUTextureView {
-};
+#pragma once
+
+#if ENABLE(WEBGPU)
+
+#include "GPUVertexInputDescriptor.h"
+
+namespace WebCore {
+
+using WebGPUInputStepMode = GPUInputStepMode;
+
+} // namespace WebCore
+
+#endif // ENABLE(WEBGPU)

trunk/Source/WebCore/Modules/webgpu/WebGPUPipelineLayout.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUPipelineLayout
+    ImplementationLacksVTable
 ] interface WebGPUPipelineLayout {
 };

trunk/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.idl

@@ -30 +30 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    InterfaceName=GPUProgrammablePassEncoder,
     SkipVTableValidation
 ] interface WebGPUProgrammablePassEncoder {

trunk/Source/WebCore/Modules/webgpu/WebGPUQueue.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUQueue
+    ImplementationLacksVTable
 ] interface WebGPUQueue {
     void submit(sequence<WebGPUCommandBuffer> buffers);

trunk/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl

@@ -31 +31 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    InterfaceName=GPURenderPassEncoder,
     JSGenerateToJSObject
 ] interface WebGPURenderPassEncoder : WebGPUProgrammablePassEncoder {

trunk/Source/WebCore/Modules/webgpu/WebGPURenderPipeline.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPURenderPipeline
+    ImplementationLacksVTable
 ] interface WebGPURenderPipeline {
 };

trunk/Source/WebCore/Modules/webgpu/WebGPUSampler.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUSampler
+    ImplementationLacksVTable
 ] interface WebGPUSampler {
 };

trunk/Source/WebCore/Modules/webgpu/WebGPUTexture.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUTexture
+    ImplementationLacksVTable
 ] interface WebGPUTexture {
     WebGPUTextureView createDefaultView();

trunk/Source/WebCore/Modules/webgpu/WebGPUTextureView.idl

@@ -28 +28 @@
     Conditional=WEBGPU,
     EnabledAtRuntime=WebGPU,
-    ImplementationLacksVTable,
-    InterfaceName=GPUTextureView
+    ImplementationLacksVTable
 ] interface WebGPUTextureView {
 };

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -14128 +14128 @@
                 D0615FCD217FE5C6008A48A8 /* WebGPUShaderModule.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUShaderModule.cpp; sourceTree = "<group>"; };
                 D0615FCE217FE5C6008A48A8 /* WebGPUShaderModule.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUShaderModule.idl; sourceTree = "<group>"; };
+                D063AE4621C06626000E6A35 /* WebGPUInputStepMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUInputStepMode.h; sourceTree = "<group>"; };
                 D06A9A2122026C7A0083C662 /* GPURequestAdapterOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPURequestAdapterOptions.h; sourceTree = "<group>"; };
                 D06C0D8D0CFD11460065F43F /* RemoveFormatCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoveFormatCommand.h; sourceTree = "<group>"; };
@@ -26277 +26278 @@
                                 D00F595221701D8C000D71DB /* WebGPUDevice.h */,
                                 D00F595421701D8C000D71DB /* WebGPUDevice.idl */,
+                                D063AE4621C06626000E6A35 /* WebGPUInputStepMode.h */,
                                 D0C419F02183EB31009EC1DE /* WebGPUPipelineDescriptorBase.h */,
                                 D0C419F12183EB31009EC1DE /* WebGPUPipelineDescriptorBase.idl */,

trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h

@@ -82 +82 @@
     macro(GamepadButton) \
     macro(GamepadEvent) \
-    macro(GPU) \
-    macro(GPUAdapter) \
-    macro(GPUBindGroup) \
-    macro(GPUBindGroupLayout) \
-    macro(GPUBuffer) \
     macro(GPUBufferUsage) \
     macro(GPUCanvasContext) \
@@ -94 +89 @@
     macro(GPUComputePassEncoder) \
     macro(GPUComputePipeline) \
-    macro(GPUDevice) \
-    macro(GPUPipelineLayout) \
-    macro(GPUProgrammablePassEncoder) \
-    macro(GPUQueue) \
-    macro(GPURenderPassEncoder) \
-    macro(GPURenderPipeline) \
-    macro(GPUSampler) \
     macro(GPUShaderStageBit) \
     macro(GPUSwapChain) \
-    macro(GPUTexture) \
     macro(GPUTextureUsage) \
-    macro(GPUTextureView) \
     macro(HTMLAttachmentElement) \
     macro(HTMLAudioElement) \
@@ -215 +201 @@
     macro(WebGL2RenderingContext) \
     macro(WebGLVertexArrayObject) \
+    macro(WebGPU) \
+    macro(WebGPUAdapter) \
+    macro(WebGPUBindGroup) \
+    macro(WebGPUBindGroupLayout) \
+    macro(WebGPUBuffer) \
+    macro(WebGPUDevice) \
+    macro(WebGPUIndexFormat) \
+    macro(WebGPUInputStepMode) \
+    macro(WebGPUQueue) \
+    macro(WebGPUPipelineLayout) \
+    macro(WebGPUProgrammablePassEncoder) \
+    macro(WebGPURenderPassEncoder) \
+    macro(WebGPURenderPipeline) \
+    macro(WebGPUSampler) \
+    macro(WebGPUTexture) \
+    macro(WebGPUTextureView) \
+    macro(WebGPUVertexFormat) \
     macro(WebMetalBuffer) \
     macro(WebMetalCommandBuffer) \