WebKit Bugzilla
Attachment 368713 Details for
Bug 194260
: Update WebGPU class names based on sketch.idl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194260-20190501143529.patch (text/plain), 35.82 KB, created by
Justin Fan
on 2019-05-01 14:35:30 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Justin Fan
Created:
2019-05-01 14:35:30 PDT
Size:
35.82 KB
patch
obsolete
>Subversion Revision: 244805 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index c1ca7a22d5a7c6189503ad8f29bb231dfbb5f54f..485849719b73956e7f83ca1786faa5f09629736e 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,32 @@ >+2019-05-01 Justin Fan <justin_fan@apple.com> >+ >+ Update WebGPU class names based on sketch.idl >+ https://bugs.webkit.org/show_bug.cgi?id=194260 >+ >+ Reviewed by Dean Jackson. >+ >+ Update all exposed Web GPU interface names to GPU* prefix. >+ >+ Existing Web GPU tests updated to expect new names. >+ >+ * Modules/webgpu/WebGPU.idl: >+ * Modules/webgpu/WebGPUAdapter.idl: >+ * Modules/webgpu/WebGPUBindGroup.idl: >+ * Modules/webgpu/WebGPUBindGroupLayout.idl: >+ * Modules/webgpu/WebGPUBuffer.idl: >+ * Modules/webgpu/WebGPUDevice.idl: >+ * Modules/webgpu/WebGPUInputStepMode.h: Removed. >+ * Modules/webgpu/WebGPUPipelineLayout.idl: >+ * Modules/webgpu/WebGPUProgrammablePassEncoder.idl: >+ * Modules/webgpu/WebGPUQueue.idl: >+ * Modules/webgpu/WebGPURenderPassEncoder.idl: >+ * Modules/webgpu/WebGPURenderPipeline.idl: >+ * Modules/webgpu/WebGPUSampler.idl: >+ * Modules/webgpu/WebGPUTexture.idl: >+ * Modules/webgpu/WebGPUTextureView.idl: >+ * WebCore.xcodeproj/project.pbxproj: >+ * bindings/js/WebCoreBuiltinNames.h: >+ > 2019-04-30 Commit Queue <commit-queue@webkit.org> > > Unreviewed, rolling out r244773. >diff --git a/Source/WebCore/Modules/webgpu/WebGPU.idl b/Source/WebCore/Modules/webgpu/WebGPU.idl >index 1cc9e4f9760fc99358de77d67016b39b0f3cebdc..92a96ebbb6b9e00aa8e47bf34de1dc13b97c330c 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPU.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPU.idl >@@ -27,7 +27,8 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPU > ] interface WebGPU { > Promise<WebGPUAdapter> requestAdapter(optional GPURequestAdapterOptions options); > }; >diff --git a/Source/WebCore/Modules/webgpu/WebGPUAdapter.idl b/Source/WebCore/Modules/webgpu/WebGPUAdapter.idl >index 722d54e5eeeb76f2809fa67b625a754ad98ff0f4..0b439d64e843009d832e030a259beeff169c09a6 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUAdapter.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUAdapter.idl >@@ -27,7 +27,8 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUAdapter > ] interface WebGPUAdapter { > // readonly attribute DOMString name; > // readonly attribute WebGPUExtensions extensions; >diff --git a/Source/WebCore/Modules/webgpu/WebGPUBindGroup.idl b/Source/WebCore/Modules/webgpu/WebGPUBindGroup.idl >index 290b0e12cda93a2f6d2be9ee48a7a462d7e78551..15205c71c8ecaba239cdb2aafd61d9f062843af5 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUBindGroup.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUBindGroup.idl >@@ -27,6 +27,7 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUBindGroup > ] interface WebGPUBindGroup { > }; >diff --git a/Source/WebCore/Modules/webgpu/WebGPUBindGroupLayout.idl b/Source/WebCore/Modules/webgpu/WebGPUBindGroupLayout.idl >index 6742f98bc3ab48741d43a3074cfa94413c6ad603..2e4197562674e19fd4424c6ff9df8e702e1c5131 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUBindGroupLayout.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUBindGroupLayout.idl >@@ -27,6 +27,7 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUBindGroupLayout > ] interface WebGPUBindGroupLayout { > }; >diff --git a/Source/WebCore/Modules/webgpu/WebGPUBuffer.idl b/Source/WebCore/Modules/webgpu/WebGPUBuffer.idl >index 61da09ed94a9bc67d08ad3ac7325eb421c3b9793..a870547b38e025e0ccbae36c4b346e8a4755a020 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUBuffer.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUBuffer.idl >@@ -29,7 +29,8 @@ typedef unsigned long long u64; > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUBuffer > ] interface WebGPUBuffer { > void setSubData(u64 offset, ArrayBuffer data); > >diff --git a/Source/WebCore/Modules/webgpu/WebGPUDevice.idl b/Source/WebCore/Modules/webgpu/WebGPUDevice.idl >index def5e5610edad3ff3d0723d55e8de139cc281c65..057260ef441e6cf67412f933599567dcbb14c656 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUDevice.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUDevice.idl >@@ -27,7 +27,8 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUDevice > ] interface WebGPUDevice { > readonly attribute WebGPUAdapter adapter; > >diff --git a/Source/WebCore/Modules/webgpu/WebGPUInputStepMode.h b/Source/WebCore/Modules/webgpu/WebGPUInputStepMode.h >deleted file mode 100644 >index 1d3d342c3403efc9ae87af0ca9ebdd96cb8cc5ac..0000000000000000000000000000000000000000 >--- a/Source/WebCore/Modules/webgpu/WebGPUInputStepMode.h >+++ /dev/null >@@ -1,38 +0,0 @@ >-/* >- * 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 "GPUVertexInputDescriptor.h" >- >-namespace WebCore { >- >-using WebGPUInputStepMode = GPUInputStepMode; >- >-} // namespace WebCore >- >-#endif // ENABLE(WEBGPU) >diff --git a/Source/WebCore/Modules/webgpu/WebGPUPipelineLayout.idl b/Source/WebCore/Modules/webgpu/WebGPUPipelineLayout.idl >index c0e856f375d3979f0f732b78be2f8bbce685e7c9..c75f310a9d409a56e8812ad39d796f5495b2e67c 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUPipelineLayout.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUPipelineLayout.idl >@@ -27,6 +27,7 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUPipelineLayout > ] interface WebGPUPipelineLayout { > }; >diff --git a/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.idl b/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.idl >index 70fc1fe65567fc473d32a53f08c571e267e5a43e..9da7a0cd36630817b9d199c4568316542b94278c 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUProgrammablePassEncoder.idl >@@ -29,6 +29,7 @@ typedef unsigned long u32; > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >+ InterfaceName=GPUProgrammablePassEncoder, > SkipVTableValidation > ] interface WebGPUProgrammablePassEncoder { > void endPass(); >diff --git a/Source/WebCore/Modules/webgpu/WebGPUQueue.idl b/Source/WebCore/Modules/webgpu/WebGPUQueue.idl >index 5a1a15aedb2ed39646e1819b02d85cf6bf342220..7b10d953a11e817c5443888f816830bbfe5af814 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUQueue.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUQueue.idl >@@ -27,7 +27,8 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUQueue > ] interface WebGPUQueue { > void submit(sequence<WebGPUCommandBuffer> buffers); > >diff --git a/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl b/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl >index 2b85591beb3bac63cb9b7e55330d09887b23348c..9091423917d90e3f980d7f0396befdb1e4b9c7a1 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPURenderPassEncoder.idl >@@ -31,6 +31,7 @@ typedef unsigned long long u64; > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >+ InterfaceName=GPURenderPassEncoder, > JSGenerateToJSObject > ] interface WebGPURenderPassEncoder : WebGPUProgrammablePassEncoder { > void setPipeline(WebGPURenderPipeline pipeline); >diff --git a/Source/WebCore/Modules/webgpu/WebGPURenderPipeline.idl b/Source/WebCore/Modules/webgpu/WebGPURenderPipeline.idl >index a46d01a295e1aadda176d955ad29ee490b4103d4..0de84009793b877db4f063a7db0412f27dc786e3 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPURenderPipeline.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPURenderPipeline.idl >@@ -27,6 +27,7 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPURenderPipeline > ] interface WebGPURenderPipeline { > }; >diff --git a/Source/WebCore/Modules/webgpu/WebGPUSampler.idl b/Source/WebCore/Modules/webgpu/WebGPUSampler.idl >index da2c3b5398efc028d4a655aae5db11b516476f0a..6f6f370fcd4e4552403a5f959272dde400681a84 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUSampler.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUSampler.idl >@@ -27,6 +27,7 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUSampler > ] interface WebGPUSampler { > }; >diff --git a/Source/WebCore/Modules/webgpu/WebGPUTexture.idl b/Source/WebCore/Modules/webgpu/WebGPUTexture.idl >index 6f55e747e097b61423072ae6ff3455ea177efecc..11f4c8b6d422dc136ea4cc5fd2d0b35728416e60 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUTexture.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUTexture.idl >@@ -27,7 +27,8 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUTexture > ] interface WebGPUTexture { > WebGPUTextureView createDefaultView(); > void destroy(); >diff --git a/Source/WebCore/Modules/webgpu/WebGPUTextureView.idl b/Source/WebCore/Modules/webgpu/WebGPUTextureView.idl >index 9931c5ea97700646bfa400dc3cf27c53883759b3..ddca9204041649f670c44b84636fac7e06a1ddef 100644 >--- a/Source/WebCore/Modules/webgpu/WebGPUTextureView.idl >+++ b/Source/WebCore/Modules/webgpu/WebGPUTextureView.idl >@@ -27,6 +27,7 @@ > [ > Conditional=WEBGPU, > EnabledAtRuntime=WebGPU, >- ImplementationLacksVTable >+ ImplementationLacksVTable, >+ InterfaceName=GPUTextureView > ] interface WebGPUTextureView { > }; >diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >index 7bfdca2fbf1b9f6350bdac29ddd8c9c918275eec..37d615ce10ae044f65f6a42016616120ef07c232 100644 >--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj >+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >@@ -13877,7 +13877,6 @@ > D0615FCC217FE5C6008A48A8 /* WebGPUShaderModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUShaderModule.h; sourceTree = "<group>"; }; > 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>"; }; > D06C0D8E0CFD11460065F43F /* RemoveFormatCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoveFormatCommand.cpp; sourceTree = "<group>"; }; >@@ -25832,7 +25831,6 @@ > D00F595321701D8C000D71DB /* WebGPUDevice.cpp */, > D00F595221701D8C000D71DB /* WebGPUDevice.h */, > D00F595421701D8C000D71DB /* WebGPUDevice.idl */, >- D063AE4621C06626000E6A35 /* WebGPUInputStepMode.h */, > D0C419F02183EB31009EC1DE /* WebGPUPipelineDescriptorBase.h */, > D0C419F12183EB31009EC1DE /* WebGPUPipelineDescriptorBase.idl */, > D05A99E521C9BF2C00032B75 /* WebGPUPipelineLayout.cpp */, >diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h >index 68887146a9dff24b6f587b633d9d4175e1e9bf44..0a3fa837ac6e998a15482899f5e88232f8da91ba 100644 >--- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h >+++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h >@@ -81,6 +81,11 @@ namespace WebCore { > macro(Gamepad) \ > macro(GamepadButton) \ > macro(GamepadEvent) \ >+ macro(GPU) \ >+ macro(GPUAdapter) \ >+ macro(GPUBindGroup) \ >+ macro(GPUBindGroupLayout) \ >+ macro(GPUBuffer) \ > macro(GPUBufferUsage) \ > macro(GPUCanvasContext) \ > macro(GPUColorWriteBits) \ >@@ -88,10 +93,19 @@ namespace WebCore { > macro(GPUCommandEncoder) \ > macro(GPUComputePassEncoder) \ > macro(GPUComputePipeline) \ >+ macro(GPUDevice) \ >+ macro(GPUPipelineLayout) \ >+ macro(GPUProgrammablePassEncoder) \ >+ macro(GPUQueue) \ >+ macro(GPURenderPassEncoder) \ >+ macro(GPURenderPipeline) \ >+ macro(GPUSampler) \ > macro(GPUShaderModule) \ > macro(GPUShaderStageBit) \ > macro(GPUSwapChain) \ >+ macro(GPUTexture) \ > macro(GPUTextureUsage) \ >+ macro(GPUTextureView) \ > macro(HTMLAttachmentElement) \ > macro(HTMLAudioElement) \ > macro(HTMLDataListElement) \ >@@ -203,23 +217,6 @@ namespace WebCore { > macro(VisualViewport) \ > 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(WebKitMediaKeyError) \ > macro(WebKitMediaKeyMessageEvent) \ > macro(WebKitMediaKeyNeededEvent) \ >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index c59c09195a739dc43c8dfe48c6271291d11c97d7..6e75f0840aed37cf94c40552d8acc13609d0218a 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,31 @@ >+2019-05-01 Justin Fan <justin_fan@apple.com> >+ >+ Update WebGPU class names based on sketch.idl >+ https://bugs.webkit.org/show_bug.cgi?id=194260 >+ >+ Reviewed by Dean Jackson. >+ >+ Update all exposed Web GPU interface names to GPU* prefix. >+ >+ * webgpu/adapter-options.html: >+ * webgpu/bind-groups-expected.txt: >+ * webgpu/bind-groups.html: >+ * webgpu/buffer-resource-triangles.html: >+ * webgpu/js/webgpu-functions.js: >+ (beginBasicRenderPass): >+ * webgpu/map-read-buffers.html: >+ * webgpu/map-write-buffers.html: >+ * webgpu/pipeline-layouts-expected.txt: >+ * webgpu/pipeline-layouts.html: >+ * webgpu/queue-creation-expected.txt: >+ * webgpu/queue-creation.html: >+ * webgpu/render-command-encoding-expected.txt: >+ * webgpu/render-command-encoding.html: >+ * webgpu/render-pipelines-expected.txt: >+ * webgpu/render-pipelines.html: >+ * webgpu/textures-textureviews.html: >+ * webgpu/webgpu-enabled.html: >+ > 2019-04-30 Commit Queue <commit-queue@webkit.org> > > Unreviewed, rolling out r244774. >diff --git a/LayoutTests/webgpu/adapter-options.html b/LayoutTests/webgpu/adapter-options.html >index 9f5187a42eb649da05cfda49e9a8c8cf44a67de9..cc464b51f16c2f2ada7e39f72e209a0f0a8e28d5 100644 >--- a/LayoutTests/webgpu/adapter-options.html >+++ b/LayoutTests/webgpu/adapter-options.html >@@ -9,21 +9,21 @@ promise_test(async () => { > const defaultAdapter = await navigator.gpu.requestAdapter(); > const device = await defaultAdapter.requestDevice(); > >- assert_true(device instanceof WebGPUDevice, "Default device successfully created."); >+ assert_true(device instanceof GPUDevice, "Default device successfully created."); > }, "Create the default device."); > > promise_test(async () => { > const lowPowerAdapter = await navigator.gpu.requestAdapter({ powerPreference: "low-power" }); > const device = await lowPowerAdapter.requestDevice(); > >- assert_true(device instanceof WebGPUDevice, "Device successfully created using low-power option."); >+ assert_true(device instanceof GPUDevice, "Device successfully created using low-power option."); > }, "Create a device with a low-power option."); > > promise_test(async () => { > const highPerfAdapter = await navigator.gpu.requestAdapter({ powerPreference: "high-performance" }); > const device = await highPerfAdapter.requestDevice(); > >- assert_true(device instanceof WebGPUDevice, "Device successfully created using high-performance option."); >+ assert_true(device instanceof GPUDevice, "Device successfully created using high-performance option."); > }, "Create a device with a high-performance option."); > </script> > </body> >\ No newline at end of file >diff --git a/LayoutTests/webgpu/bind-groups-expected.txt b/LayoutTests/webgpu/bind-groups-expected.txt >index 51eb7deb4813b3ac6ae5136d5009d2db8160a342..b7d4781dccbd959098ee790cdd1d5d5df6bc0880 100644 >--- a/LayoutTests/webgpu/bind-groups-expected.txt >+++ b/LayoutTests/webgpu/bind-groups-expected.txt >@@ -1,3 +1,3 @@ > >-PASS Create a basic WebGPUBindGroup via WebGPUDevice. >+PASS Create a basic GPUBindGroup via GPUDevice. > >diff --git a/LayoutTests/webgpu/bind-groups.html b/LayoutTests/webgpu/bind-groups.html >index 970c1fddb549d0eee3085245465061b3bd645fcd..ebd153ccd116bfb2a545d33b4f45da25c1d0a479 100644 >--- a/LayoutTests/webgpu/bind-groups.html >+++ b/LayoutTests/webgpu/bind-groups.html >@@ -1,6 +1,6 @@ > <!DOCTYPE html><!-- webkit-test-runner [ experimental:WebGPUEnabled=true ] --> > <meta charset=utf-8> >-<title>Create a basic WebGPUBindGroup.</title> >+<title>Create a basic GPUBindGroup.</title> > <body> > <script src="js/webgpu-functions.js"></script> > <script src="../resources/testharness.js"></script> >@@ -9,7 +9,7 @@ > promise_test(async () => { > const device = await getBasicDevice(); > >- // WebGPUBindGroupLayoutBindings >+ // GPUBindGroupLayoutBindings > // FIXME: Also test sampled texture bindings. > const bufferLayoutBinding = { > binding: 1, >@@ -24,7 +24,7 @@ promise_test(async () => { > const bindGroupBinding = { binding: 1, resource: bufferBinding }; > > const bindGroup = device.createBindGroup({ layout: bindGroupLayout, bindings: [bindGroupBinding]}); >- assert_true(bindGroup instanceof WebGPUBindGroup, "WebGPUBindGroup successfully created.") >-}, "Create a basic WebGPUBindGroup via WebGPUDevice.") >+ assert_true(bindGroup instanceof GPUBindGroup, "GPUBindGroup successfully created.") >+}, "Create a basic GPUBindGroup via GPUDevice.") > </script> > </body> >\ No newline at end of file >diff --git a/LayoutTests/webgpu/buffer-resource-triangles.html b/LayoutTests/webgpu/buffer-resource-triangles.html >index 08f9ca1b8e9cad22d13fa4f63377b695b1bcb81f..2bff4a93fa857d82c2aef4ff2ed126b0fb287faf 100644 >--- a/LayoutTests/webgpu/buffer-resource-triangles.html >+++ b/LayoutTests/webgpu/buffer-resource-triangles.html >@@ -118,7 +118,7 @@ async function test() { > // FIXME: Replace with non-MSL shaders. > const shaderModule = device.createShaderModule({ code: shaderCode }); > >- // Create vertex data WebGPUBuffers. >+ // Create vertex data GPUBuffers. > const verticesBuffer = createAndUploadVerticesBuffer(device); > > let bufferPromises = []; >@@ -145,7 +145,7 @@ async function test() { > }] > }; > >- // Create buffer WebGPUBindGroupLayoutBindings. >+ // Create buffer GPUBindGroupLayoutBindings. > const layoutUL = createUniformBufferBindGroupLayout(bindingNums.UL); > const layoutUM = createUniformBufferBindGroupLayout(bindingNums.UM); > const layoutUR = createUniformBufferBindGroupLayout(bindingNums.UR); >@@ -153,15 +153,15 @@ async function test() { > const layoutLR = createUniformBufferBindGroupLayout(bindingNums.LR); > const layoutG = createUniformBufferBindGroupLayout(bindingNums.G, GPUShaderStageBit.FRAGMENT); > >- // WebGPUBindGroupLayouts >+ // GPUBindGroupLayouts > const leftTriangleBGLayout = device.createBindGroupLayout({ bindings: [layoutUL, layoutUM, layoutLL, layoutG] }); > const rightTriangleBGLayout = device.createBindGroupLayout({ bindings: [layoutUR, layoutUM, layoutLR] }); > >- // WebGPUPipelineLayout and WebGPURenderPipeline >+ // GPUPipelineLayout and GPURenderPipeline > const pipelineLayout = device.createPipelineLayout({ bindGroupLayouts: [leftTriangleBGLayout, rightTriangleBGLayout] }); > const pipeline = createBasicPipeline(shaderModule, device, null, pipelineLayout, inputState, null, "triangle-list"); > >- // WebGPUBufferBindings >+ // GPUBufferBindings > const bindingUL = createBufferBinding(upperLeft); > const bindingUM = createBufferBinding(upperMiddle); > const bindingUR = createBufferBinding(upperRight); >@@ -169,7 +169,7 @@ async function test() { > const bindingLR = createBufferBinding(lowerRight); > const bindingG = createBufferBinding(green); > >- // WebGPUBindGroupBindings >+ // GPUBindGroupBindings > const bgBindingUL = { binding: bindingNums.UL, resource: bindingUL }; > const bgBindingUM = { binding: bindingNums.UM, resource: bindingUM }; > const bgBindingUR = { binding: bindingNums.UR, resource: bindingUR }; >@@ -177,7 +177,7 @@ async function test() { > const bgBindingLR = { binding: bindingNums.LR, resource: bindingLR }; > const bgBindingG = { binding: bindingNums.G, resource: bindingG }; > >- // WebGPUBindGroups >+ // GPUBindGroups > const leftTriangleBG = device.createBindGroup({ > layout: leftTriangleBGLayout, > bindings: [bgBindingUL, bgBindingUM, bgBindingLL, bgBindingG] >diff --git a/LayoutTests/webgpu/js/webgpu-functions.js b/LayoutTests/webgpu/js/webgpu-functions.js >index 270876b1a897f393ea9ef7fd68507e71ba1b7c8f..5409714177ebba4d79c28d9aec0686b6e8864bfa 100644 >--- a/LayoutTests/webgpu/js/webgpu-functions.js >+++ b/LayoutTests/webgpu/js/webgpu-functions.js >@@ -77,7 +77,7 @@ function beginBasicRenderPass(swapChain, commandEncoder) { > clearColor: { r: 1.0, g: 0, b: 0, a: 1.0 } > }; > >- // FIXME: Flesh out the rest of WebGPURenderPassDescriptor. >+ // FIXME: Flesh out the rest of GPURenderPassDescriptor. > return commandEncoder.beginRenderPass({ colorAttachments : [basicAttachment] }); > } > >diff --git a/LayoutTests/webgpu/map-read-buffers.html b/LayoutTests/webgpu/map-read-buffers.html >index 3b00cf25514e7f67110a7016b5fd507938706b2d..58ce09198892e758d944cbc5b80dbcab0d825650 100644 >--- a/LayoutTests/webgpu/map-read-buffers.html >+++ b/LayoutTests/webgpu/map-read-buffers.html >@@ -12,7 +12,7 @@ async function runTests() { > // Basic mapReadAsync functionality > promise_test(async () => { > const buffer = device.createBuffer({ size: 16, usage: GPUBufferUsage.TRANSFER_DST | GPUBufferUsage.MAP_READ }); >- assert_true(buffer instanceof WebGPUBuffer, "createBuffer returned a WebGPUBuffer"); >+ assert_true(buffer instanceof GPUBuffer, "createBuffer returned a GPUBuffer"); > > let array = new Float32Array([1, 2, 3, 4]); > buffer.setSubData(0, array.buffer); >diff --git a/LayoutTests/webgpu/map-write-buffers.html b/LayoutTests/webgpu/map-write-buffers.html >index 0a9fff2939656fb4016136d151ddc3618b480aa0..887967cf5c0dbe2c82c68b4be6aa7b76cdf802c5 100644 >--- a/LayoutTests/webgpu/map-write-buffers.html >+++ b/LayoutTests/webgpu/map-write-buffers.html >@@ -12,7 +12,7 @@ async function runTests() { > // Basic mapWriteAsync functionality > promise_test(async () => { > const buffer = device.createBuffer({ size: 16, usage: GPUBufferUsage.MAP_WRITE }); >- assert_true(buffer instanceof WebGPUBuffer, "createBuffer returned a WebGPUBuffer"); >+ assert_true(buffer instanceof GPUBuffer, "createBuffer returned a GPUBuffer"); > > let arrayBuffer = await buffer.mapWriteAsync(); > >diff --git a/LayoutTests/webgpu/pipeline-layouts-expected.txt b/LayoutTests/webgpu/pipeline-layouts-expected.txt >index a87787d32004a1933901be740efc4da22f4e097c..025ef53da5efe2ad955778d13988bcf07e94f79f 100644 >--- a/LayoutTests/webgpu/pipeline-layouts-expected.txt >+++ b/LayoutTests/webgpu/pipeline-layouts-expected.txt >@@ -1,4 +1,4 @@ > >-PASS Create a basic WebGPUBindGroupLayoutDescriptor. >-PASS Create a basic WebGPUPipelineLayout wtih a WebGPUDevice. >+PASS Create a basic GPUBindGroupLayoutDescriptor. >+PASS Create a basic GPUPipelineLayout wtih a GPUDevice. > >diff --git a/LayoutTests/webgpu/pipeline-layouts.html b/LayoutTests/webgpu/pipeline-layouts.html >index a23d2329e51a2be2c4756ef5f02c45bfd558508d..0d24f4bd712e28684dae9b8adead05c11b30935f 100644 >--- a/LayoutTests/webgpu/pipeline-layouts.html >+++ b/LayoutTests/webgpu/pipeline-layouts.html >@@ -1,6 +1,6 @@ > <!DOCTYPE html><!-- webkit-test-runner [ experimental:WebGPUEnabled=true ] --> > <meta charset=utf-8> >-<title>Create WebGPUBindGroupLayout.</title> >+<title>Create GPUBindGroupLayout.</title> > <body> > <script src="js/webgpu-functions.js"></script> > <script src="../resources/testharness.js"></script> >@@ -19,15 +19,15 @@ test(() => { > 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."); >+}, "Create a basic GPUBindGroupLayoutDescriptor."); > > promise_test(async () => { > const device = await getBasicDevice(); > const bindGroupLayout = device.createBindGroupLayout({ bindings: [createBindGroupLayoutBinding()] }); >- assert_true(bindGroupLayout instanceof WebGPUBindGroupLayout, "createBindGroupLayout returned a WebGPUBindGroupLayout"); >+ assert_true(bindGroupLayout instanceof GPUBindGroupLayout, "createBindGroupLayout returned a GPUBindGroupLayout"); > > const pipelineLayout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] }); >- assert_true(pipelineLayout instanceof WebGPUPipelineLayout, "createPipelineLayout returned a WebGPUPipelineLayout"); >-}, "Create a basic WebGPUPipelineLayout wtih a WebGPUDevice."); >+ assert_true(pipelineLayout instanceof GPUPipelineLayout, "createPipelineLayout returned a GPUPipelineLayout"); >+}, "Create a basic GPUPipelineLayout wtih a GPUDevice."); > </script> > </body> >\ No newline at end of file >diff --git a/LayoutTests/webgpu/queue-creation-expected.txt b/LayoutTests/webgpu/queue-creation-expected.txt >index ca569b2c228dd4dcfac6938f5cfc239c2365d447..2785735e2a2877afa490791bf2292f70f14ede25 100644 >--- a/LayoutTests/webgpu/queue-creation-expected.txt >+++ b/LayoutTests/webgpu/queue-creation-expected.txt >@@ -1,3 +1,3 @@ > >-PASS getQueue() on WebGPUDevice. >+PASS getQueue() on GPUDevice. > >diff --git a/LayoutTests/webgpu/queue-creation.html b/LayoutTests/webgpu/queue-creation.html >index 6bd18e1c855e17b02d2de639d548385271dc10fe..db35b4ee4946145c744632d2c84f10892e659055 100644 >--- a/LayoutTests/webgpu/queue-creation.html >+++ b/LayoutTests/webgpu/queue-creation.html >@@ -1,6 +1,6 @@ > <!DOCTYPE html><!-- webkit-test-runner [ experimental:WebGPUEnabled=true ] --> > <meta charset=utf-8> >-<title>Get the WebGPUDevice and ask for the WebGPUQueue</title> >+<title>Get the GPUDevice and ask for the GPUQueue</title> > <body> > <script src="../resources/testharness.js"></script> > <script src="../resources/testharnessreport.js"></script> >@@ -15,17 +15,17 @@ promise_test(async t => { > assert_true(context instanceof GPUCanvasContext, "getContext returned a GPUCanvasContext."); > > const adapter = await navigator.gpu.requestAdapter({}); >- assert_true(adapter instanceof WebGPUAdapter, "requestAdapter returned a WebGPUAdapter."); >+ assert_true(adapter instanceof GPUAdapter, "requestAdapter returned a GPUAdapter."); > > const device = await adapter.requestDevice(); >- assert_true(device instanceof WebGPUDevice, "requestDevice returned a WebGPUDevice."); >+ assert_true(device instanceof GPUDevice, "requestDevice returned a GPUDevice."); > > const queue = device.getQueue(); >- assert_true(queue instanceof WebGPUQueue, "getQueue returned a WebGPUQueue."); >+ assert_true(queue instanceof GPUQueue, "getQueue returned a GPUQueue."); > > queue.label = "Example label"; > assert_equals(queue.label, "Example label", "queue.label was set."); >-}, "getQueue() on WebGPUDevice."); >+}, "getQueue() on GPUDevice."); > > </script> > </body> >diff --git a/LayoutTests/webgpu/render-command-encoding-expected.txt b/LayoutTests/webgpu/render-command-encoding-expected.txt >index 2c7468982549ea9bc6e83bc26e87743afdfc6b35..c72f0fcbbeaed6283b24b970a272ec22133f736b 100644 >--- a/LayoutTests/webgpu/render-command-encoding-expected.txt >+++ b/LayoutTests/webgpu/render-command-encoding-expected.txt >@@ -1,3 +1,3 @@ > >-PASS WebGPURenderPassEncoder created and successfully ended >+PASS GPURenderPassEncoder created and successfully ended > >diff --git a/LayoutTests/webgpu/render-command-encoding.html b/LayoutTests/webgpu/render-command-encoding.html >index c03a480a9ad28a801416cee80e4aefc9d248a5f7..7c600df11328c15bdda6d482cf30abe933347440 100644 >--- a/LayoutTests/webgpu/render-command-encoding.html >+++ b/LayoutTests/webgpu/render-command-encoding.html >@@ -1,6 +1,6 @@ > <!DOCTYPE html><!-- webkit-test-runner [ experimental:WebGPUEnabled=true ] --> > <meta charset=utf-8> >-<title>Get the WebGPUDevice and ask for the WebGPUQueue</title> >+<title>Get the GPUDevice and ask for the GPUQueue</title> > <body> > <script src="../resources/testharness.js"></script> > <script src="../resources/testharnessreport.js"></script> >@@ -38,11 +38,11 @@ promise_test(async () => { > assert_true(commandEncoder instanceof GPUCommandEncoder, "createCommandEncoder returned a GPUCommandEncoder"); > > const encoder = beginBasicRenderPass(swapChain, commandEncoder); >- assert_true(encoder instanceof WebGPURenderPassEncoder, "beginRenderPass() returned a WebGPURenderPassEncoder"); >+ assert_true(encoder instanceof GPURenderPassEncoder, "beginRenderPass() returned a GPURenderPassEncoder"); > > encoder.setPipeline(pipeline); > encoder.endPass(); >-}, "WebGPURenderPassEncoder created and successfully ended"); >+}, "GPURenderPassEncoder created and successfully ended"); > > </script> > </body> >diff --git a/LayoutTests/webgpu/render-pipelines-expected.txt b/LayoutTests/webgpu/render-pipelines-expected.txt >index 7a97e4096494612c897b72e45fbcf6089b8cd569..f36ed9d6f1851d43bb7dac7637bdf96c832dba60 100644 >--- a/LayoutTests/webgpu/render-pipelines-expected.txt >+++ b/LayoutTests/webgpu/render-pipelines-expected.txt >@@ -1,3 +1,3 @@ > >-PASS Create basic WebGPURenderPipeline >+PASS Create basic GPURenderPipeline > >diff --git a/LayoutTests/webgpu/render-pipelines.html b/LayoutTests/webgpu/render-pipelines.html >index 7cc37c2f9b223da64fc9a0319579772ea75806fc..7593956f14f0e30c7404a64ec26ebc97e5b38c8c 100644 >--- a/LayoutTests/webgpu/render-pipelines.html >+++ b/LayoutTests/webgpu/render-pipelines.html >@@ -48,7 +48,7 @@ promise_test(async () => { > const pipelineLayout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] }); > > const pipeline = createBasicPipeline(shaderModule, device, null, pipelineLayout); >- assert_true(pipeline instanceof WebGPURenderPipeline, "Successfully created WebGPURenderPipeline"); >-}, "Create basic WebGPURenderPipeline"); >+ assert_true(pipeline instanceof GPURenderPipeline, "Successfully created GPURenderPipeline"); >+}, "Create basic GPURenderPipeline"); > </script> > </html> >\ No newline at end of file >diff --git a/LayoutTests/webgpu/textures-textureviews.html b/LayoutTests/webgpu/textures-textureviews.html >index 43000ff89fc366cc9ad74709fd8a1a27ac4f1622..0becd337673fc2c976f2adf5e4718df881ac8e05 100644 >--- a/LayoutTests/webgpu/textures-textureviews.html >+++ b/LayoutTests/webgpu/textures-textureviews.html >@@ -27,15 +27,15 @@ promise_test(async () => { > swapChain = createBasicSwapChain(canvas, device); > > const texture = swapChain.getCurrentTexture(); >- assert_true(texture instanceof WebGPUTexture, "Successfully acquired next texture."); >+ assert_true(texture instanceof GPUTexture, "Successfully acquired next texture."); > > const textureView = texture.createDefaultView(); >- assert_true(textureView instanceof WebGPUTextureView, "Successfully created texture view from next texture."); >+ assert_true(textureView instanceof GPUTextureView, "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 WebGPUTexture, "Successfully created depth texture."); >+ assert_true(depthTexture instanceof GPUTexture, "Successfully created depth texture."); > }, "Create basic depth texture from device."); > > promise_test(async () => { >@@ -44,7 +44,7 @@ promise_test(async () => { > texDescriptor.usage = GPUTextureUsage.SAMPLED | GPUTextureUsage.TRANSFER_SRC > > const multisampledTexture = device.createTexture(texDescriptor); >- assert_true(multisampledTexture instanceof WebGPUTexture, "Successfully created multisampled texture."); >+ assert_true(multisampledTexture instanceof GPUTexture, "Successfully created multisampled texture."); > }, "Create basic 4x multisampled texture."); > > promise_test(async () => { >@@ -53,10 +53,10 @@ promise_test(async () => { > texDescriptor.dimension = "3d"; > > const texture3d = device.createTexture(texDescriptor); >- assert_true(texture3d instanceof WebGPUTexture, "Successfully created basic 3D texture."); >+ assert_true(texture3d instanceof GPUTexture, "Successfully created basic 3D texture."); > }, "Create basic 3D texture from device."); > >-// FIXME: Add tests for 1D textures, textureArrays, and WebGPUTextureViews. >+// FIXME: Add tests for 1D textures, textureArrays, and GPUTextureViews. > </script> > </body> > </html> >\ No newline at end of file >diff --git a/LayoutTests/webgpu/webgpu-enabled.html b/LayoutTests/webgpu/webgpu-enabled.html >index 537350bdc15ec0e152f96f907417c3e91ff0c39d..a2434cd88a4e04b686ebf4606a97837c3a902b0b 100644 >--- a/LayoutTests/webgpu/webgpu-enabled.html >+++ b/LayoutTests/webgpu/webgpu-enabled.html >@@ -14,10 +14,10 @@ promise_test(async () => { > assert_not_equals(navigator.gpu, undefined, "navigator.gpu is defined."); > > const adapter = await navigator.gpu.requestAdapter(); >- assert_true(adapter instanceof WebGPUAdapter, "Created default GPUAdapter."); >+ assert_true(adapter instanceof GPUAdapter, "Created default GPUAdapter."); > > const device = await adapter.requestDevice(); >- assert_true(device instanceof WebGPUDevice, "Created GPUDevice."); >+ assert_true(device instanceof GPUDevice, "Created GPUDevice."); > }, "Web GPU is enabled."); > </script> > </html> >\ No newline at end of file
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=368713">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194260
:
365823
|
368704
| 368713