Delete WebMetal implementation in favor of WebGPU
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Mar 2019 22:18:59 +0000 (22:18 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Mar 2019 22:18:59 +0000 (22:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=195418

Reviewed by Dean Jackson.

.:

* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmake/tools/vsprops/FeatureDefines.props:
* Source/cmake/tools/vsprops/FeatureDefinesCairo.props:

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:
* inspector/protocol/Canvas.json:
* inspector/scripts/codegen/generator.py:

Source/WebCore:

WebMetal was only ever intended to be a proof-of-concept, and was never intended to be shipped.
Now that our WebGPU implementation is achieving good functionality, we're hitting conflicts
because we have both implementations. We should delete the non-standard implementation in favor
of the standards-based implementation.

Deletes relevant tests.

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* DerivedSources-input.xcfilelist:
* DerivedSources-output.xcfilelist:
* DerivedSources.make:
* Sources.txt:
* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp: Removed.
* bindings/js/JSWebMetalRenderingContextCustom.cpp: Removed.
* bindings/js/WebCoreBuiltinNames.h:
* dom/Document.cpp:
(WebCore::Document::getCSSCanvasContext):
* dom/Document.h:
* dom/Document.idl:
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext):
(WebCore::HTMLCanvasElement::isWebMetalType): Deleted.
(WebCore::HTMLCanvasElement::createContextWebMetal): Deleted.
(WebCore::HTMLCanvasElement::getContextWebMetal): Deleted.
* html/HTMLCanvasElement.h:
* html/HTMLCanvasElement.idl:
* html/canvas/CanvasRenderingContext.h:
(WebCore::CanvasRenderingContext::isWebGPU const):
(WebCore::CanvasRenderingContext::isWebMetal const): Deleted.
* html/canvas/WebMetalBuffer.cpp: Removed.
* html/canvas/WebMetalBuffer.h: Removed.
* html/canvas/WebMetalBuffer.idl: Removed.
* html/canvas/WebMetalCommandBuffer.cpp: Removed.
* html/canvas/WebMetalCommandBuffer.h: Removed.
* html/canvas/WebMetalCommandBuffer.idl: Removed.
* html/canvas/WebMetalCommandQueue.cpp: Removed.
* html/canvas/WebMetalCommandQueue.h: Removed.
* html/canvas/WebMetalCommandQueue.idl: Removed.
* html/canvas/WebMetalComputeCommandEncoder.cpp: Removed.
* html/canvas/WebMetalComputeCommandEncoder.h: Removed.
* html/canvas/WebMetalComputeCommandEncoder.idl: Removed.
* html/canvas/WebMetalComputePipelineState.cpp: Removed.
* html/canvas/WebMetalComputePipelineState.h: Removed.
* html/canvas/WebMetalComputePipelineState.idl: Removed.
* html/canvas/WebMetalDepthStencilDescriptor.cpp: Removed.
* html/canvas/WebMetalDepthStencilDescriptor.h: Removed.
* html/canvas/WebMetalDepthStencilDescriptor.idl: Removed.
* html/canvas/WebMetalDepthStencilState.cpp: Removed.
* html/canvas/WebMetalDepthStencilState.h: Removed.
* html/canvas/WebMetalDepthStencilState.idl: Removed.
* html/canvas/WebMetalDrawable.cpp: Removed.
* html/canvas/WebMetalDrawable.h: Removed.
* html/canvas/WebMetalDrawable.idl: Removed.
* html/canvas/WebMetalEnums.cpp: Removed.
* html/canvas/WebMetalEnums.h: Removed.
* html/canvas/WebMetalEnums.idl: Removed.
* html/canvas/WebMetalFunction.cpp: Removed.
* html/canvas/WebMetalFunction.h: Removed.
* html/canvas/WebMetalFunction.idl: Removed.
* html/canvas/WebMetalLibrary.cpp: Removed.
* html/canvas/WebMetalLibrary.h: Removed.
* html/canvas/WebMetalLibrary.idl: Removed.
* html/canvas/WebMetalRenderCommandEncoder.cpp: Removed.
* html/canvas/WebMetalRenderCommandEncoder.h: Removed.
* html/canvas/WebMetalRenderCommandEncoder.idl: Removed.
* html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp: Removed.
* html/canvas/WebMetalRenderPassAttachmentDescriptor.h: Removed.
* html/canvas/WebMetalRenderPassAttachmentDescriptor.idl: Removed.
* html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp: Removed.
* html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h: Removed.
* html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl: Removed.
* html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp: Removed.
* html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h: Removed.
* html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl: Removed.
* html/canvas/WebMetalRenderPassDescriptor.cpp: Removed.
* html/canvas/WebMetalRenderPassDescriptor.h: Removed.
* html/canvas/WebMetalRenderPassDescriptor.idl: Removed.
* html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp: Removed.
* html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h: Removed.
* html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl: Removed.
* html/canvas/WebMetalRenderPipelineDescriptor.cpp: Removed.
* html/canvas/WebMetalRenderPipelineDescriptor.h: Removed.
* html/canvas/WebMetalRenderPipelineDescriptor.idl: Removed.
* html/canvas/WebMetalRenderPipelineState.cpp: Removed.
* html/canvas/WebMetalRenderPipelineState.h: Removed.
* html/canvas/WebMetalRenderPipelineState.idl: Removed.
* html/canvas/WebMetalRenderingContext.cpp: Removed.
* html/canvas/WebMetalRenderingContext.h: Removed.
* html/canvas/WebMetalRenderingContext.idl: Removed.
* html/canvas/WebMetalSize.h: Removed.
* html/canvas/WebMetalSize.idl: Removed.
* html/canvas/WebMetalTexture.cpp: Removed.
* html/canvas/WebMetalTexture.h: Removed.
* html/canvas/WebMetalTexture.idl: Removed.
* html/canvas/WebMetalTextureDescriptor.cpp: Removed.
* html/canvas/WebMetalTextureDescriptor.h: Removed.
* html/canvas/WebMetalTextureDescriptor.idl: Removed.
* inspector/InspectorCanvas.cpp:
(WebCore::InspectorCanvas::buildObjectForCanvas):
* inspector/agents/InspectorCanvasAgent.cpp:
(WebCore::InspectorCanvasAgent::requestContent):
(WebCore::contextAsScriptValue):
* page/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setWebMetalEnabled): Deleted.
(WebCore::RuntimeEnabledFeatures::webMetalEnabled const): Deleted.
* platform/Logging.h:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(WebCore::PlatformCALayerCocoa::layerTypeForPlatformLayer):
(WebCore::PlatformCALayerCocoa::PlatformCALayerCocoa):
* platform/graphics/cocoa/WebMetalLayer.h: Removed.
* platform/graphics/cocoa/WebMetalLayer.mm: Removed.
* platform/graphics/gpu/legacy/GPULegacyBuffer.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyBuffer.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyCommandBuffer.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyCommandBuffer.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyCommandQueue.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyCommandQueue.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyComputeCommandEncoder.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyComputeCommandEncoder.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyComputePipelineState.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyComputePipelineState.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyDepthStencilDescriptor.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyDepthStencilDescriptor.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyDepthStencilState.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyDepthStencilState.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyDevice.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyDevice.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyDrawable.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyDrawable.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyEnums.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyFunction.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyFunction.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyLibrary.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyLibrary.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderCommandEncoder.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderCommandEncoder.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPassAttachmentDescriptor.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPassAttachmentDescriptor.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPassColorAttachmentDescriptor.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPassColorAttachmentDescriptor.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPassDepthAttachmentDescriptor.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPassDepthAttachmentDescriptor.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPassDescriptor.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPassDescriptor.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPipelineColorAttachmentDescriptor.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPipelineDescriptor.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPipelineDescriptor.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPipelineState.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyRenderPipelineState.h: Removed.
* platform/graphics/gpu/legacy/GPULegacySize.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyTexture.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyTexture.h: Removed.
* platform/graphics/gpu/legacy/GPULegacyTextureDescriptor.cpp: Removed.
* platform/graphics/gpu/legacy/GPULegacyTextureDescriptor.h: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyBufferMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyCommandBufferMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyCommandQueueMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyComputeCommandEncoderMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyComputePipelineStateMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyDepthStencilDescriptorMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyDepthStencilStateMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyDeviceMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyDrawableMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyFunctionMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyLibraryMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyRenderCommandEncoderMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassAttachmentDescriptorMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassColorAttachmentDescriptorMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassDescriptorMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineDescriptorMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineStateMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyTextureDescriptorMetal.mm: Removed.
* platform/graphics/gpu/legacy/cocoa/GPULegacyTextureMetal.mm: Removed.
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setWebMetalEnabled): Deleted.
* testing/InternalSettings.h:
* testing/InternalSettings.idl:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebInspectorUI:

* UserInterface/Models/Canvas.js:
(WI.Canvas.fromPayload):
(WI.Canvas.displayNameForContextType):
* UserInterface/Protocol/Legacy/12.2/InspectorBackendCommands.js:
* Versions/Inspector-iOS-12.2.json:

Source/WebKit:

* Configurations/FeatureDefines.xcconfig:
* Shared/WebPreferences.yaml:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):

Source/WebKitLegacy/mac:

* Configurations/FeatureDefines.xcconfig:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences webMetalEnabled]): Deleted.
(-[WebPreferences setWebMetalEnabled:]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm:
(enableExperimentalFeatures):
(resetWebPreferencesToConsistentValues):
* Scripts/webkitperl/FeatureList.pm:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebCore/mac/GPUCommandQueue.mm: Removed.
* TestWebKitAPI/Tests/WebCore/mac/GPULegacyBuffer.mm: Removed.
* TestWebKitAPI/Tests/WebCore/mac/GPULegacyCommandQueue.mm: Removed.
* TestWebKitAPI/Tests/WebCore/mac/GPULegacyDevice.mm: Removed.
* TestWebKitAPI/Tests/WebCore/mac/GPULegacyFunction.mm: Removed.
* TestWebKitAPI/Tests/WebCore/mac/GPULegacyLibrary.mm: Removed.
* TestWebKitAPI/Tests/WebCore/mac/GPULegacyTest.h: Removed.
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::beginTesting):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::setWebMetalEnabled): Deleted.
* WebKitTestRunner/InjectedBundle/TestRunner.h:

LayoutTests:

* fast/canvas/webmetal/webmetal-dispatch-expected.txt: Removed.
* fast/canvas/webmetal/webmetal-dispatch.html: Removed.
* fast/canvas/webmetal/webmetal-runtime-flag-expected.txt: Removed.
* fast/canvas/webmetal/webmetal-runtime-flag.html: Removed.
* inspector/canvas/create-context-webmetal-expected.txt: Removed.
* inspector/canvas/create-context-webmetal.html: Removed.
* inspector/canvas/resolveCanvasContext-webmetal-expected.txt: Removed.
* inspector/canvas/resolveCanvasContext-webmetal.html: Removed.
* platform/gtk/TestExpectations:
* platform/ios/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
* platform/wincairo/TestExpectations:
* platform/wpe/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243666 268f45cc-cd09-0410-ab3c-d52691b4dbfc

218 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/fast/canvas/webmetal/webmetal-dispatch-expected.txt [deleted file]
LayoutTests/fast/canvas/webmetal/webmetal-dispatch.html [deleted file]
LayoutTests/fast/canvas/webmetal/webmetal-runtime-flag-expected.txt [deleted file]
LayoutTests/fast/canvas/webmetal/webmetal-runtime-flag.html [deleted file]
LayoutTests/inspector/canvas/create-context-webmetal-expected.txt [deleted file]
LayoutTests/inspector/canvas/create-context-webmetal.html [deleted file]
LayoutTests/inspector/canvas/resolveCanvasContext-webmetal-expected.txt [deleted file]
LayoutTests/inspector/canvas/resolveCanvasContext-webmetal.html [deleted file]
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/ios/TestExpectations
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/wincairo/TestExpectations
LayoutTests/platform/wpe/TestExpectations
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/JavaScriptCore/inspector/protocol/Canvas.json
Source/JavaScriptCore/inspector/scripts/codegen/generator.py
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/DerivedSources-input.xcfilelist
Source/WebCore/DerivedSources-output.xcfilelist
Source/WebCore/DerivedSources.make
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/Sources.txt
Source/WebCore/SourcesCocoa.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp [deleted file]
Source/WebCore/bindings/js/JSWebMetalRenderingContextCustom.cpp [deleted file]
Source/WebCore/bindings/js/WebCoreBuiltinNames.h
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/dom/Document.idl
Source/WebCore/html/HTMLCanvasElement.cpp
Source/WebCore/html/HTMLCanvasElement.h
Source/WebCore/html/HTMLCanvasElement.idl
Source/WebCore/html/canvas/CanvasRenderingContext.h
Source/WebCore/html/canvas/WebMetalBuffer.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalBuffer.h [deleted file]
Source/WebCore/html/canvas/WebMetalBuffer.idl [deleted file]
Source/WebCore/html/canvas/WebMetalCommandBuffer.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalCommandBuffer.h [deleted file]
Source/WebCore/html/canvas/WebMetalCommandBuffer.idl [deleted file]
Source/WebCore/html/canvas/WebMetalCommandQueue.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalCommandQueue.h [deleted file]
Source/WebCore/html/canvas/WebMetalCommandQueue.idl [deleted file]
Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.h [deleted file]
Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.idl [deleted file]
Source/WebCore/html/canvas/WebMetalComputePipelineState.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalComputePipelineState.h [deleted file]
Source/WebCore/html/canvas/WebMetalComputePipelineState.idl [deleted file]
Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.h [deleted file]
Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.idl [deleted file]
Source/WebCore/html/canvas/WebMetalDepthStencilState.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalDepthStencilState.h [deleted file]
Source/WebCore/html/canvas/WebMetalDepthStencilState.idl [deleted file]
Source/WebCore/html/canvas/WebMetalDrawable.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalDrawable.h [deleted file]
Source/WebCore/html/canvas/WebMetalDrawable.idl [deleted file]
Source/WebCore/html/canvas/WebMetalEnums.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalEnums.h [deleted file]
Source/WebCore/html/canvas/WebMetalEnums.idl [deleted file]
Source/WebCore/html/canvas/WebMetalFunction.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalFunction.h [deleted file]
Source/WebCore/html/canvas/WebMetalFunction.idl [deleted file]
Source/WebCore/html/canvas/WebMetalLibrary.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalLibrary.h [deleted file]
Source/WebCore/html/canvas/WebMetalLibrary.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineState.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineState.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderPipelineState.idl [deleted file]
Source/WebCore/html/canvas/WebMetalRenderingContext.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalRenderingContext.h [deleted file]
Source/WebCore/html/canvas/WebMetalRenderingContext.idl [deleted file]
Source/WebCore/html/canvas/WebMetalSize.h [deleted file]
Source/WebCore/html/canvas/WebMetalSize.idl [deleted file]
Source/WebCore/html/canvas/WebMetalTexture.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalTexture.h [deleted file]
Source/WebCore/html/canvas/WebMetalTexture.idl [deleted file]
Source/WebCore/html/canvas/WebMetalTextureDescriptor.cpp [deleted file]
Source/WebCore/html/canvas/WebMetalTextureDescriptor.h [deleted file]
Source/WebCore/html/canvas/WebMetalTextureDescriptor.idl [deleted file]
Source/WebCore/inspector/InspectorCanvas.cpp
Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp
Source/WebCore/page/RuntimeEnabledFeatures.h
Source/WebCore/platform/Logging.h
Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
Source/WebCore/platform/graphics/cocoa/WebMetalLayer.h [deleted file]
Source/WebCore/platform/graphics/cocoa/WebMetalLayer.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyBuffer.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyBuffer.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyCommandBuffer.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyCommandBuffer.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyCommandQueue.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyCommandQueue.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyComputeCommandEncoder.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyComputeCommandEncoder.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyComputePipelineState.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyComputePipelineState.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyDepthStencilDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyDepthStencilDescriptor.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyDepthStencilState.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyDepthStencilState.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyDevice.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyDevice.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyDrawable.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyDrawable.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyEnums.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyFunction.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyFunction.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyLibrary.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyLibrary.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderCommandEncoder.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderCommandEncoder.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPassAttachmentDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPassAttachmentDescriptor.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPassColorAttachmentDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPassColorAttachmentDescriptor.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPassDepthAttachmentDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPassDepthAttachmentDescriptor.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPassDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPassDescriptor.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPipelineColorAttachmentDescriptor.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPipelineDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPipelineDescriptor.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPipelineState.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyRenderPipelineState.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacySize.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyTexture.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyTexture.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyTextureDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/GPULegacyTextureDescriptor.h [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyBufferMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyCommandBufferMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyCommandQueueMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyComputeCommandEncoderMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyComputePipelineStateMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyDepthStencilDescriptorMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyDepthStencilStateMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyDeviceMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyDrawableMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyFunctionMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyLibraryMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyRenderCommandEncoderMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassAttachmentDescriptorMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassColorAttachmentDescriptorMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassDescriptorMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineDescriptorMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineStateMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyTextureDescriptorMetal.mm [deleted file]
Source/WebCore/platform/graphics/gpu/legacy/cocoa/GPULegacyTextureMetal.mm [deleted file]
Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h
Source/WebCore/testing/InternalSettings.idl
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Models/Canvas.js
Source/WebInspectorUI/UserInterface/Protocol/Legacy/12.2/InspectorBackendCommands.js
Source/WebInspectorUI/Versions/Inspector-iOS-12.2.json
Source/WebKit/ChangeLog
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKit/Shared/WebPreferences.yaml
Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
Source/WebKitLegacy/mac/WebView/WebPreferences.mm
Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
Source/WebKitLegacy/mac/WebView/WebView.mm
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitFeatures.cmake
Source/cmake/tools/vsprops/FeatureDefines.props
Source/cmake/tools/vsprops/FeatureDefinesCairo.props
Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/Scripts/webkitperl/FeatureList.pm
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
Tools/TestWebKitAPI/Tests/WebCore/mac/GPUCommandQueue.mm [deleted file]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyBuffer.mm [deleted file]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyCommandQueue.mm [deleted file]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyDevice.mm [deleted file]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyFunction.mm [deleted file]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyLibrary.mm [deleted file]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyTest.h [deleted file]
Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

index 91a88f2..e5d16c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-03-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Delete WebMetal implementation in favor of WebGPU
+        https://bugs.webkit.org/show_bug.cgi?id=195418
+
+        Reviewed by Dean Jackson.
+
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmake/tools/vsprops/FeatureDefines.props:
+        * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
 2019-03-29  Cathie Chen  <cathiechen@igalia.com>
 
         Implement ResizeObserver.
index 31dab5c..a2ddd93 100644 (file)
@@ -1,3 +1,25 @@
+2019-03-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Delete WebMetal implementation in favor of WebGPU
+        https://bugs.webkit.org/show_bug.cgi?id=195418
+
+        Reviewed by Dean Jackson.
+
+        * fast/canvas/webmetal/webmetal-dispatch-expected.txt: Removed.
+        * fast/canvas/webmetal/webmetal-dispatch.html: Removed.
+        * fast/canvas/webmetal/webmetal-runtime-flag-expected.txt: Removed.
+        * fast/canvas/webmetal/webmetal-runtime-flag.html: Removed.
+        * inspector/canvas/create-context-webmetal-expected.txt: Removed.
+        * inspector/canvas/create-context-webmetal.html: Removed.
+        * inspector/canvas/resolveCanvasContext-webmetal-expected.txt: Removed.
+        * inspector/canvas/resolveCanvasContext-webmetal.html: Removed.
+        * platform/gtk/TestExpectations:
+        * platform/ios/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+        * platform/wincairo/TestExpectations:
+        * platform/wpe/TestExpectations:
+
 2019-03-29  Zalan Bujtas  <zalan@apple.com>
 
         [Simple line layout] Turn off inline boxtree generation for multiline content
diff --git a/LayoutTests/fast/canvas/webmetal/webmetal-dispatch-expected.txt b/LayoutTests/fast/canvas/webmetal/webmetal-dispatch-expected.txt
deleted file mode 100644 (file)
index 7ef22e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/LayoutTests/fast/canvas/webmetal/webmetal-dispatch.html b/LayoutTests/fast/canvas/webmetal/webmetal-dispatch.html
deleted file mode 100644 (file)
index a9d1ea5..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<script id="script" type="x-shader/x-metal">
-using namespace metal;
-
-kernel void get_kernel_size(device int *result[[buffer(0)]],
-                            uint3 grid_size[[threadgroups_per_grid]],
-                            uint3 group_size[[threads_per_threadgroup]],
-                            uint3 gid[[thread_position_in_grid]])
-{
-    if (gid.x != 0 || gid.y != 0 || gid.z != 0) 
-        return;
-
-    result[0] = grid_size.x;
-    result[1] = grid_size.y;
-    result[2] = grid_size.z;
-    result[3] = group_size.x;
-    result[4] = group_size.y;
-    result[5] = group_size.z;
-}
-</script>
-
-<script>
-if (window.testRunner) {
-    window.testRunner.dumpAsText();
-    window.testRunner.waitUntilDone();
-}
-
-function assert(a) {
-    if (!a) {
-        throw new Error('Assertion Failed.');
-    }
-}
-
-function run() {
-    let output = document.getElementById("output");
-
-    if (!window.testRunner) {
-        output.textContent = "This test only runs inside DRT/WKTR.";
-        return;
-    }
-
-    window.internals.settings.setWebMetalEnabled(true);
-    let gpu = document.createElement("canvas").getContext("webmetal");
-    let commandQueue = gpu.createCommandQueue();
-
-    let library = gpu.createLibrary(document.getElementById("script").text);
-    let kernelFunction = library.functionWithName("get_kernel_size");
-    let pipelineState = gpu.createComputePipelineState(kernelFunction);
-
-    let resultBuffer = gpu.createBuffer(new Int32Array(6));
-    
-    let commandBuffer = commandQueue.createCommandBuffer();
-    let commandEncoder = commandBuffer.createComputeCommandEncoder();
-
-    let gridSize = {
-        width: 7,
-        height: 6,
-        depth: 5
-    };
-    let groupSize = {
-        width: 4,
-        height: 3,
-        depth: 2
-    };
-    
-    commandEncoder.setComputePipelineState(pipelineState);
-    commandEncoder.setBuffer(resultBuffer, 0, 0);
-    commandEncoder.dispatch(gridSize, groupSize);
-    commandEncoder.endEncoding();
-
-    commandBuffer.completed.then(() => {
-        let result = new Int32Array(resultBuffer.contents);
-
-        try {
-            assert(result[0] === gridSize.width);
-            assert(result[1] === gridSize.height);
-            assert(result[2] === gridSize.depth);
-            assert(result[3] === groupSize.width);
-            assert(result[4] === groupSize.height);
-            assert(result[5] === groupSize.depth);
-
-        } catch(err) {
-            output.textContent = `FAIL: ${err.message}`;
-            return;
-        }
-
-        output.textContent = 'PASS';
-        window.testRunner.notifyDone();
-    });
-
-    commandBuffer.commit();
-}
-
-window.addEventListener("load", run, false);
-
-</script>
-<div id="output"></div>
diff --git a/LayoutTests/fast/canvas/webmetal/webmetal-runtime-flag-expected.txt b/LayoutTests/fast/canvas/webmetal/webmetal-runtime-flag-expected.txt
deleted file mode 100644 (file)
index df3901a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-PASS: WebMetal was available when enabled.
-PASS: WebMetal was not available when disabled.
diff --git a/LayoutTests/fast/canvas/webmetal/webmetal-runtime-flag.html b/LayoutTests/fast/canvas/webmetal/webmetal-runtime-flag.html
deleted file mode 100644 (file)
index 12c02b1..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-
-if (window.testRunner)
-    window.testRunner.dumpAsText();
-
-function getContext(name) {
-    var c = document.createElement("canvas");
-    return c.getContext(name);
-}
-
-function run() {
-    var output;
-
-    output = document.getElementById("output1");
-
-    if (!window.testRunner) {
-        output.textContent = "This test only runs inside DRT/WKTR.";
-        return;
-    }
-
-    window.internals.settings.setWebMetalEnabled(true);
-    var ctx = getContext("webmetal");
-    if (ctx)
-        output.textContent = "PASS: WebMetal was available when enabled.";
-    else
-        output.textContent = "FAIL: WebMetal was not available when enabled.";
-
-    output = document.getElementById("output2");
-
-    window.internals.settings.setWebMetalEnabled(false);
-    var ctx = getContext("webmetal");
-    if (ctx)
-        output.textContent = "FAIL: WebMetal was available when disabled.";
-    else
-        output.textContent = "PASS: WebMetal was not available when disabled.";
-}
-
-window.addEventListener("load", run, false);
-
-</script>
-<div id="output1"></div>
-<div id="output2"></div>
diff --git a/LayoutTests/inspector/canvas/create-context-webmetal-expected.txt b/LayoutTests/inspector/canvas/create-context-webmetal-expected.txt
deleted file mode 100644 (file)
index 54e675a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-Test that CanvasManager tracks creation and destruction of WebMetal canvases.
-
-
-== Running test suite: Canvas.CreateContextWebMetal
--- Running test case: Canvas.CreateContextWebMetal.NoCanvases
-PASS: CanvasManager should have no canvases.
-
--- Running test case: Canvas.CreateContextWebMetal.Attached
-PASS: Canvas context should be WebMetal.
-  0: getContext - [native code]
-  1: createAttachedCanvas - inspector/canvas/resources/create-context-utilities.js:4:36
-  2: Global Code - [program code]
-  3: evaluateWithScopeExtension - [native code]
-  4: (anonymous function) - [native code]
-  5: _wrapCall - [native code]
-
-PASS: Removed canvas has expected ID.
-
--- Running test case: Canvas.CreateContextWebMetal.Detached
-PASS: Canvas context should be WebMetal.
-  0: getContext - [native code]
-  1: createDetachedCanvas - inspector/canvas/resources/create-context-utilities.js:8:62
-  2: Global Code - [program code]
-  3: evaluateWithScopeExtension - [native code]
-  4: (anonymous function) - [native code]
-  5: _wrapCall - [native code]
-
-PASS: Removed canvas has expected ID.
-
--- Running test case: Canvas.CreateContextWebMetal.CSSCanvas
-Create CSS canvas from -webkit-canvas(css-canvas).
-PASS: Canvas context should be WebMetal.
-  0: getCSSCanvasContext - [native code]
-  1: createCSSCanvas - inspector/canvas/resources/create-context-utilities.js:12:47
-  2: Global Code - [program code]
-  3: evaluateWithScopeExtension - [native code]
-  4: (anonymous function) - [native code]
-  5: _wrapCall - [native code]
-
-PASS: Canvas name should equal the identifier passed to -webkit-canvas.
-
diff --git a/LayoutTests/inspector/canvas/create-context-webmetal.html b/LayoutTests/inspector/canvas/create-context-webmetal.html
deleted file mode 100644 (file)
index fb41143..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="stylesheet" href="resources/create-context-utilities.css">
-<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
-<script src="resources/create-context-utilities.js"></script>
-<script>
-if (window.internals)
-    window.internals.settings.setWebMetalEnabled(true);
-
-function test() {
-    let suite = initializeTestSuite("Canvas.CreateContextWebMetal");
-
-    addSimpleTestCase({
-        name: "Attached",
-        expression: `createAttachedCanvas("webmetal")`,
-        contextType: WI.Canvas.ContextType.WebMetal,
-    });
-
-    addSimpleTestCase({
-        name: "Detached",
-        expression: `createDetachedCanvas("webmetal")`,
-        contextType: WI.Canvas.ContextType.WebMetal,
-    });
-
-    addCSSCanvasTestCase(WI.Canvas.ContextType.WebMetal);
-
-    suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body onload="runTest()">
-    <p>Test that CanvasManager tracks creation and destruction of WebMetal canvases.</p>
-</body>
-</html>
diff --git a/LayoutTests/inspector/canvas/resolveCanvasContext-webmetal-expected.txt b/LayoutTests/inspector/canvas/resolveCanvasContext-webmetal-expected.txt
deleted file mode 100644 (file)
index bebf2d7..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Tests for the Canvas.resolveCanvasContext command for WebMetal contexts.
-
-
-== Running test suite: Canvas.resolveCanvasContextWebMetal
--- Running test case: Canvas.resolveCanvasContextWebMetal.validIdentifier
-PASS: Payload should have type "object".
-PASS: Payload should have className "WebMetalRenderingContext".
-
diff --git a/LayoutTests/inspector/canvas/resolveCanvasContext-webmetal.html b/LayoutTests/inspector/canvas/resolveCanvasContext-webmetal.html
deleted file mode 100644 (file)
index 4566495..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
-<script>
-if (window.internals)
-    window.internals.settings.setWebMetalEnabled(true);
-
-function load() {
-    window.contextWebMetal = document.body.appendChild(document.createElement("canvas")).getContext("webmetal");
-
-    runTest();
-}
-
-function test()
-{
-    let suite = InspectorTest.createAsyncSuite("Canvas.resolveCanvasContextWebMetal");
-
-    suite.addTestCase({
-        name: `Canvas.resolveCanvasContextWebMetal.validIdentifier`,
-        description: "Should return a valid object for the given canvas identifier.",
-        test(resolve, reject) {
-            let canvas = WI.canvasManager.canvases.find((canvas) => canvas.contextType === WI.Canvas.ContextType.WebMetal);
-            if (!canvas) {
-                reject(`Missing Canvas.`);
-                return;
-            }
-
-            const objectGroup = "test";
-            CanvasAgent.resolveCanvasContext(canvas.identifier, objectGroup)
-            .then(({object}) => {
-                InspectorTest.expectEqual(object.type, "object", `Payload should have type "object".`);
-                InspectorTest.expectEqual(object.className, "WebMetalRenderingContext", `Payload should have className "WebMetalRenderingContext".`);
-            })
-            .then(resolve, reject);
-        }
-    });
-
-    suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body onload="load()">
-    <p>Tests for the Canvas.resolveCanvasContext command for WebMetal contexts.</p>
-</body>
-</html>
index 2b42436..b19fb15 100644 (file)
@@ -1098,11 +1098,6 @@ plugins/form-value.html [ Skip ]
 fast/files/filereader-zip-bundle-using-open-panel.html [ Skip ]
 http/tests/local/fileapi/upload-zip-bundle-as-blob-using-open-panel.html [ Skip ]
 
-# WebMetal is not enabled on GTK+.
-fast/canvas/webmetal [ Skip ]
-inspector/canvas/create-context-webmetal.html [ Skip ]
-inspector/canvas/resolveCanvasContext-webmetal.html [ Skip ]
-
 # We don't support APPLE_PAY.
 http/tests/ssl/applepay [ Skip ]
 
index 62851bf..1692edb 100644 (file)
@@ -39,10 +39,7 @@ fullscreen
 http/tests/fullscreen
 compositing/no-compositing-when-fulll-screen-is-present.html
 
-# WebMetal and WebGPU are not enabled on iOS Simulator.
-fast/canvas/webmetal
-inspector/canvas/create-context-webmetal.html [ Skip ]
-inspector/canvas/resolveCanvasContext-webmetal.html [ Skip ]
+# WebGPU is not enabled on iOS Simulator.
 webgpu [ Skip ]
 
 # Encrypted Media Extensions are not enabled
index 82257bf..10abfe3 100644 (file)
@@ -1030,7 +1030,6 @@ webkit.org/b/150978 fast/canvas/webgl/oes-texture-half-float-linear.html [ Pass
 webkit.org/b/173931 inspector/canvas/context-attributes.html [ Pass Timeout ]
 webkit.org/b/178028 inspector/canvas/create-context-2d.html [ Pass Timeout ]
 webkit.org/b/174066 inspector/canvas/create-context-webgl2.html [ Pass Timeout ]
-webkit.org/b/174066 inspector/canvas/create-context-webmetal.html [ Pass Timeout ]
 webkit.org/b/174272 inspector/canvas/css-canvas-clients.html [ Pass Timeout ]
 webkit.org/b/174066 inspector/canvas/shaderProgram-add-remove-webgl2.html [ Pass Failure Timeout ]
 webkit.org/b/160048 [ Debug ] inspector/codemirror/prettyprinting-javascript.html [ Pass Timeout ]
index 669fee8..85e3d60 100644 (file)
@@ -2438,9 +2438,6 @@ inspector/cpu-profiler [ Skip ]
 # inspector/debugger/removeBreakpoint.html [ Skip ] # Crashing
 # inspector/debugger/searchInContent-linebreaks.html [ Pass Crash ] # Flaky
 
-inspector/canvas/create-context-webmetal.html [ Skip ]
-inspector/canvas/resolveCanvasContext-webmetal.html [ Skip ]
-
 ################################################################################
 #################        End Inspector Issues               ####################
 ################################################################################
@@ -3520,7 +3517,6 @@ fast/animation/request-animation-frame-throttling-lowPowerMode.html [ Failure ]
 fast/block/positioning/016.html [ Failure ]
 fast/block/positioning/025.html [ Failure ]
 fast/block/positioning/fixed-position-stacking-context.html [ Failure ]
-fast/canvas/webmetal/webmetal-runtime-flag.html [ Failure ]
 fast/css/getComputedStyle/computed-style-font-family.html [ Failure ]
 fast/css/getComputedStyle/computed-style-without-renderer.html [ Failure ]
 fast/css/getComputedStyle/computed-style.html [ Failure ]
@@ -3634,7 +3630,6 @@ legacy-animation-engine/animations/font-variations/font-style.html [ Skip ]
 editing/selection/caret-after-tap-in-editable-selection.html [ Skip ]
 editing/selection/character-granularity-select-text-with-click-handler.html [ Skip ]
 editing/selection/character-granularity-selected-range-after-dismissing-selection.html [ Skip ]
-fast/canvas/webmetal/webmetal-dispatch.html [ Skip ]
 fast/dom/FileList-iterator-using-open-panel.html [ Skip ]
 fast/forms/file/file-input-reset-using-open-panel.html [ Skip ]
 fast/forms/file/file-reset-in-change-using-open-panel.html [ Skip ]
index d50c821..95ddd30 100644 (file)
@@ -289,10 +289,7 @@ inspector/canvas/shaderProgram-add-remove-webgl2.html [ Skip ]
 webgl/webgl2-rendering-context-defined.html [ Skip ]
 webgl/webgl2-rendering-context-obtain.html [ Skip ]
 
-# WEBMETAL and WEBGPU are disabled
-fast/canvas/webmetal [ Skip ]
-inspector/canvas/create-context-webmetal.html [ Skip ]
-inspector/canvas/resolveCanvasContext-webmetal.html [ Skip ]
+# WEBGPU is disabled
 webgpu [ Skip ]
 
 # WIRELESS_PLAYBACK_TARGET is disabled
index 33e8245..e1ad108 100644 (file)
@@ -293,8 +293,7 @@ Bug(WPE) js/stringimpl-to-jsstring-on-large-strings-1.html [ Skip ]
 Bug(WPE) js/stringimpl-to-jsstring-on-large-strings-2.html [ Skip ]
 Bug(WPE) js/stringimpl-to-jsstring-on-large-strings-3.html [ Skip ]
 
-# No WebMetal or WebGPU support yet
-fast/canvas/webmetal [ Skip ]
+# No WebGPU support yet
 webgpu [ Skip ]
 
 # Skipped due to untestable DRM key system. ClearKey counterparts are tested instead.
index 465306d..85a1673 100644 (file)
@@ -1,3 +1,14 @@
+2019-03-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Delete WebMetal implementation in favor of WebGPU
+        https://bugs.webkit.org/show_bug.cgi?id=195418
+
+        Reviewed by Dean Jackson.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * inspector/protocol/Canvas.json:
+        * inspector/scripts/codegen/generator.py:
+
 2019-03-29  Tadeu Zagallo  <tzagallo@apple.com>
 
         Assertion failed in JSC::createError
index ac52484..5e05c65 100644 (file)
@@ -391,12 +391,6 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1013));
 ENABLE_WEBGPU_MACOS_SINCE_1013 = ENABLE_WEBGPU;
 
-ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
-ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
-
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
@@ -413,4 +407,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_C_LOOP) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_C_LOOP) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 9d17be6..8580f87 100644 (file)
@@ -16,7 +16,7 @@
         {
             "id": "ContextType",
             "type": "string",
-            "enum": ["canvas-2d", "bitmaprenderer", "webgl", "webgl2", "webgpu", "webmetal"],
+            "enum": ["canvas-2d", "bitmaprenderer", "webgl", "webgl2", "webgpu"],
             "description": "The type of rendering context backing the canvas element."
         },
         {
index ce499c6..98536bc 100755 (executable)
@@ -51,7 +51,6 @@ _ENUM_IDENTIFIER_RENAME_MAP = {
     'webgl': 'WebGL',  # Canvas.ContextType.webgl
     'webgl2': 'WebGL2',  # Canvas.ContextType.webgl2
     'webgpu': 'WebGPU',  # Canvas.ContextType.gpu
-    'webmetal': 'WebMetal',  # Canvas.ContextType.webmetal
     'bitmaprenderer': 'BitmapRenderer',  # Canvas.ContextType.bitmaprenderer
     'webrtc': 'WebRTC',  # Console.ChannelSource.webrtc
     'mediasource': 'MediaSource',  # Console.ChannelSource.mediasource
index a222687..b211ad5 100644 (file)
@@ -879,28 +879,6 @@ set(WebCore_NON_SVG_IDL_FILES
     html/canvas/OffscreenCanvasRenderingContext2D.idl
     html/canvas/PaintRenderingContext2D.idl
     html/canvas/Path2D.idl
-    html/canvas/WebMetalBuffer.idl
-    html/canvas/WebMetalCommandBuffer.idl
-    html/canvas/WebMetalCommandQueue.idl
-    html/canvas/WebMetalComputeCommandEncoder.idl
-    html/canvas/WebMetalComputePipelineState.idl
-    html/canvas/WebMetalDepthStencilDescriptor.idl
-    html/canvas/WebMetalDepthStencilState.idl
-    html/canvas/WebMetalDrawable.idl
-    html/canvas/WebMetalFunction.idl
-    html/canvas/WebMetalLibrary.idl
-    html/canvas/WebMetalRenderCommandEncoder.idl
-    html/canvas/WebMetalRenderPassAttachmentDescriptor.idl
-    html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl
-    html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl
-    html/canvas/WebMetalRenderPassDescriptor.idl
-    html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl
-    html/canvas/WebMetalRenderPipelineDescriptor.idl
-    html/canvas/WebMetalRenderPipelineState.idl
-    html/canvas/WebMetalRenderingContext.idl
-    html/canvas/WebMetalSize.idl
-    html/canvas/WebMetalTexture.idl
-    html/canvas/WebMetalTextureDescriptor.idl
 
     inspector/CommandLineAPIHost.idl
     inspector/InspectorAuditAccessibilityObject.idl
index adf5d43..9bf7c8e 100644 (file)
@@ -1,3 +1,196 @@
+2019-03-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Delete WebMetal implementation in favor of WebGPU
+        https://bugs.webkit.org/show_bug.cgi?id=195418
+
+        Reviewed by Dean Jackson.
+
+        WebMetal was only ever intended to be a proof-of-concept, and was never intended to be shipped.
+        Now that our WebGPU implementation is achieving good functionality, we're hitting conflicts
+        because we have both implementations. We should delete the non-standard implementation in favor
+        of the standards-based implementation.
+
+        Deletes relevant tests.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * DerivedSources-input.xcfilelist:
+        * DerivedSources-output.xcfilelist:
+        * DerivedSources.make:
+        * Sources.txt:
+        * SourcesCocoa.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp: Removed.
+        * bindings/js/JSWebMetalRenderingContextCustom.cpp: Removed.
+        * bindings/js/WebCoreBuiltinNames.h:
+        * dom/Document.cpp:
+        (WebCore::Document::getCSSCanvasContext):
+        * dom/Document.h:
+        * dom/Document.idl:
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::getContext):
+        (WebCore::HTMLCanvasElement::isWebMetalType): Deleted.
+        (WebCore::HTMLCanvasElement::createContextWebMetal): Deleted.
+        (WebCore::HTMLCanvasElement::getContextWebMetal): Deleted.
+        * html/HTMLCanvasElement.h:
+        * html/HTMLCanvasElement.idl:
+        * html/canvas/CanvasRenderingContext.h:
+        (WebCore::CanvasRenderingContext::isWebGPU const):
+        (WebCore::CanvasRenderingContext::isWebMetal const): Deleted.
+        * html/canvas/WebMetalBuffer.cpp: Removed.
+        * html/canvas/WebMetalBuffer.h: Removed.
+        * html/canvas/WebMetalBuffer.idl: Removed.
+        * html/canvas/WebMetalCommandBuffer.cpp: Removed.
+        * html/canvas/WebMetalCommandBuffer.h: Removed.
+        * html/canvas/WebMetalCommandBuffer.idl: Removed.
+        * html/canvas/WebMetalCommandQueue.cpp: Removed.
+        * html/canvas/WebMetalCommandQueue.h: Removed.
+        * html/canvas/WebMetalCommandQueue.idl: Removed.
+        * html/canvas/WebMetalComputeCommandEncoder.cpp: Removed.
+        * html/canvas/WebMetalComputeCommandEncoder.h: Removed.
+        * html/canvas/WebMetalComputeCommandEncoder.idl: Removed.
+        * html/canvas/WebMetalComputePipelineState.cpp: Removed.
+        * html/canvas/WebMetalComputePipelineState.h: Removed.
+        * html/canvas/WebMetalComputePipelineState.idl: Removed.
+        * html/canvas/WebMetalDepthStencilDescriptor.cpp: Removed.
+        * html/canvas/WebMetalDepthStencilDescriptor.h: Removed.
+        * html/canvas/WebMetalDepthStencilDescriptor.idl: Removed.
+        * html/canvas/WebMetalDepthStencilState.cpp: Removed.
+        * html/canvas/WebMetalDepthStencilState.h: Removed.
+        * html/canvas/WebMetalDepthStencilState.idl: Removed.
+        * html/canvas/WebMetalDrawable.cpp: Removed.
+        * html/canvas/WebMetalDrawable.h: Removed.
+        * html/canvas/WebMetalDrawable.idl: Removed.
+        * html/canvas/WebMetalEnums.cpp: Removed.
+        * html/canvas/WebMetalEnums.h: Removed.
+        * html/canvas/WebMetalEnums.idl: Removed.
+        * html/canvas/WebMetalFunction.cpp: Removed.
+        * html/canvas/WebMetalFunction.h: Removed.
+        * html/canvas/WebMetalFunction.idl: Removed.
+        * html/canvas/WebMetalLibrary.cpp: Removed.
+        * html/canvas/WebMetalLibrary.h: Removed.
+        * html/canvas/WebMetalLibrary.idl: Removed.
+        * html/canvas/WebMetalRenderCommandEncoder.cpp: Removed.
+        * html/canvas/WebMetalRenderCommandEncoder.h: Removed.
+        * html/canvas/WebMetalRenderCommandEncoder.idl: Removed.
+        * html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp: Removed.
+        * html/canvas/WebMetalRenderPassAttachmentDescriptor.h: Removed.
+        * html/canvas/WebMetalRenderPassAttachmentDescriptor.idl: Removed.
+        * html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp: Removed.
+        * html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h: Removed.
+        * html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl: Removed.
+        * html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp: Removed.
+        * html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h: Removed.
+        * html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl: Removed.
+        * html/canvas/WebMetalRenderPassDescriptor.cpp: Removed.
+        * html/canvas/WebMetalRenderPassDescriptor.h: Removed.
+        * html/canvas/WebMetalRenderPassDescriptor.idl: Removed.
+        * html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp: Removed.
+        * html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h: Removed.
+        * html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl: Removed.
+        * html/canvas/WebMetalRenderPipelineDescriptor.cpp: Removed.
+        * html/canvas/WebMetalRenderPipelineDescriptor.h: Removed.
+        * html/canvas/WebMetalRenderPipelineDescriptor.idl: Removed.
+        * html/canvas/WebMetalRenderPipelineState.cpp: Removed.
+        * html/canvas/WebMetalRenderPipelineState.h: Removed.
+        * html/canvas/WebMetalRenderPipelineState.idl: Removed.
+        * html/canvas/WebMetalRenderingContext.cpp: Removed.
+        * html/canvas/WebMetalRenderingContext.h: Removed.
+        * html/canvas/WebMetalRenderingContext.idl: Removed.
+        * html/canvas/WebMetalSize.h: Removed.
+        * html/canvas/WebMetalSize.idl: Removed.
+        * html/canvas/WebMetalTexture.cpp: Removed.
+        * html/canvas/WebMetalTexture.h: Removed.
+        * html/canvas/WebMetalTexture.idl: Removed.
+        * html/canvas/WebMetalTextureDescriptor.cpp: Removed.
+        * html/canvas/WebMetalTextureDescriptor.h: Removed.
+        * html/canvas/WebMetalTextureDescriptor.idl: Removed.
+        * inspector/InspectorCanvas.cpp:
+        (WebCore::InspectorCanvas::buildObjectForCanvas):
+        * inspector/agents/InspectorCanvasAgent.cpp:
+        (WebCore::InspectorCanvasAgent::requestContent):
+        (WebCore::contextAsScriptValue):
+        * page/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setWebMetalEnabled): Deleted.
+        (WebCore::RuntimeEnabledFeatures::webMetalEnabled const): Deleted.
+        * platform/Logging.h:
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+        (WebCore::PlatformCALayerCocoa::layerTypeForPlatformLayer):
+        (WebCore::PlatformCALayerCocoa::PlatformCALayerCocoa):
+        * platform/graphics/cocoa/WebMetalLayer.h: Removed.
+        * platform/graphics/cocoa/WebMetalLayer.mm: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyBuffer.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyBuffer.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyCommandBuffer.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyCommandBuffer.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyCommandQueue.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyCommandQueue.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyComputeCommandEncoder.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyComputeCommandEncoder.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyComputePipelineState.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyComputePipelineState.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyDepthStencilDescriptor.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyDepthStencilDescriptor.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyDepthStencilState.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyDepthStencilState.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyDevice.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyDevice.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyDrawable.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyDrawable.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyEnums.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyFunction.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyFunction.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyLibrary.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyLibrary.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderCommandEncoder.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderCommandEncoder.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPassAttachmentDescriptor.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPassAttachmentDescriptor.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPassColorAttachmentDescriptor.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPassColorAttachmentDescriptor.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPassDepthAttachmentDescriptor.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPassDepthAttachmentDescriptor.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPassDescriptor.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPassDescriptor.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPipelineColorAttachmentDescriptor.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPipelineDescriptor.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPipelineDescriptor.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPipelineState.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyRenderPipelineState.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacySize.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyTexture.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyTexture.h: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyTextureDescriptor.cpp: Removed.
+        * platform/graphics/gpu/legacy/GPULegacyTextureDescriptor.h: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyBufferMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyCommandBufferMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyCommandQueueMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyComputeCommandEncoderMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyComputePipelineStateMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyDepthStencilDescriptorMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyDepthStencilStateMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyDeviceMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyDrawableMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyFunctionMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyLibraryMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyRenderCommandEncoderMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassAttachmentDescriptorMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassColorAttachmentDescriptorMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassDescriptorMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineDescriptorMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineStateMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyTextureDescriptorMetal.mm: Removed.
+        * platform/graphics/gpu/legacy/cocoa/GPULegacyTextureMetal.mm: Removed.
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        (WebCore::InternalSettings::setWebMetalEnabled): Deleted.
+        * testing/InternalSettings.h:
+        * testing/InternalSettings.idl:
+
 2019-03-29  Devin Rousso  <drousso@apple.com>
 
         Web Inspector: add fast returns for instrumentation hooks that have no affect before a frontend is connected
index ac52484..5e05c65 100644 (file)
@@ -391,12 +391,6 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1013));
 ENABLE_WEBGPU_MACOS_SINCE_1013 = ENABLE_WEBGPU;
 
-ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
-ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
-
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
@@ -413,4 +407,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_C_LOOP) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_C_LOOP) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index b5f0e91..c1e8f34 100644 (file)
@@ -836,28 +836,6 @@ $(PROJECT_DIR)/html/canvas/WebGLTransformFeedback.idl
 $(PROJECT_DIR)/html/canvas/WebGLUniformLocation.idl
 $(PROJECT_DIR)/html/canvas/WebGLVertexArrayObject.idl
 $(PROJECT_DIR)/html/canvas/WebGLVertexArrayObjectOES.idl
-$(PROJECT_DIR)/html/canvas/WebMetalBuffer.idl
-$(PROJECT_DIR)/html/canvas/WebMetalCommandBuffer.idl
-$(PROJECT_DIR)/html/canvas/WebMetalCommandQueue.idl
-$(PROJECT_DIR)/html/canvas/WebMetalComputeCommandEncoder.idl
-$(PROJECT_DIR)/html/canvas/WebMetalComputePipelineState.idl
-$(PROJECT_DIR)/html/canvas/WebMetalDepthStencilDescriptor.idl
-$(PROJECT_DIR)/html/canvas/WebMetalDepthStencilState.idl
-$(PROJECT_DIR)/html/canvas/WebMetalDrawable.idl
-$(PROJECT_DIR)/html/canvas/WebMetalFunction.idl
-$(PROJECT_DIR)/html/canvas/WebMetalLibrary.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderCommandEncoder.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderPassAttachmentDescriptor.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderPassDescriptor.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderPipelineDescriptor.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderPipelineState.idl
-$(PROJECT_DIR)/html/canvas/WebMetalRenderingContext.idl
-$(PROJECT_DIR)/html/canvas/WebMetalSize.idl
-$(PROJECT_DIR)/html/canvas/WebMetalTexture.idl
-$(PROJECT_DIR)/html/canvas/WebMetalTextureDescriptor.idl
 $(PROJECT_DIR)/html/parser/HTMLEntityNames.in
 $(PROJECT_DIR)/html/parser/create-html-entity-table
 $(PROJECT_DIR)/html/shadow/mac/imageControlsMac.css
index 9127e1f..feeb61e 100644 (file)
@@ -2019,50 +2019,6 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitPoint.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitPoint.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitTransitionEvent.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitTransitionEvent.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalBuffer.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalBuffer.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalCommandBuffer.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalCommandBuffer.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalCommandQueue.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalCommandQueue.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalComputeCommandEncoder.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalComputeCommandEncoder.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalComputePipelineState.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalComputePipelineState.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalDepthStencilDescriptor.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalDepthStencilDescriptor.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalDepthStencilState.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalDepthStencilState.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalDrawable.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalDrawable.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalFunction.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalFunction.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalLibrary.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalLibrary.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderCommandEncoder.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderCommandEncoder.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPassAttachmentDescriptor.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPassAttachmentDescriptor.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPassColorAttachmentDescriptor.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPassColorAttachmentDescriptor.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPassDepthAttachmentDescriptor.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPassDepthAttachmentDescriptor.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPassDescriptor.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPassDescriptor.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPipelineColorAttachmentDescriptor.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPipelineColorAttachmentDescriptor.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPipelineDescriptor.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPipelineDescriptor.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPipelineState.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderPipelineState.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderingContext.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalRenderingContext.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalSize.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalSize.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalTexture.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalTexture.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalTextureDescriptor.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebMetalTextureDescriptor.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebSocket.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebSocket.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWheelEvent.cpp
index 951b96a..187402f 100644 (file)
@@ -819,28 +819,6 @@ JS_BINDING_IDLS = \
     $(WebCore)/html/canvas/WebGLUniformLocation.idl \
     $(WebCore)/html/canvas/WebGLVertexArrayObject.idl \
     $(WebCore)/html/canvas/WebGLVertexArrayObjectOES.idl \
-    $(WebCore)/html/canvas/WebMetalBuffer.idl \
-    $(WebCore)/html/canvas/WebMetalCommandBuffer.idl \
-    $(WebCore)/html/canvas/WebMetalCommandQueue.idl \
-    $(WebCore)/html/canvas/WebMetalComputeCommandEncoder.idl \
-    $(WebCore)/html/canvas/WebMetalComputePipelineState.idl \
-    $(WebCore)/html/canvas/WebMetalDepthStencilDescriptor.idl \
-    $(WebCore)/html/canvas/WebMetalDepthStencilState.idl \
-    $(WebCore)/html/canvas/WebMetalDrawable.idl \
-    $(WebCore)/html/canvas/WebMetalFunction.idl \
-    $(WebCore)/html/canvas/WebMetalLibrary.idl \
-    $(WebCore)/html/canvas/WebMetalRenderCommandEncoder.idl \
-    $(WebCore)/html/canvas/WebMetalRenderPassAttachmentDescriptor.idl \
-    $(WebCore)/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl \
-    $(WebCore)/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl \
-    $(WebCore)/html/canvas/WebMetalRenderPassDescriptor.idl \
-    $(WebCore)/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl \
-    $(WebCore)/html/canvas/WebMetalRenderPipelineDescriptor.idl \
-    $(WebCore)/html/canvas/WebMetalRenderPipelineState.idl \
-    $(WebCore)/html/canvas/WebMetalRenderingContext.idl \
-    $(WebCore)/html/canvas/WebMetalSize.idl \
-    $(WebCore)/html/canvas/WebMetalTexture.idl \
-    $(WebCore)/html/canvas/WebMetalTextureDescriptor.idl \
     $(WebCore)/html/track/AudioTrack.idl \
     $(WebCore)/html/track/AudioTrackList.idl \
     $(WebCore)/html/track/DataCue.idl \
index 024fa87..d5abab0 100644 (file)
@@ -1,3 +1,12 @@
+2019-03-29  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Delete WebMetal implementation in favor of WebGPU
+        https://bugs.webkit.org/show_bug.cgi?id=195418
+
+        Reviewed by Dean Jackson.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-03-29  Cathie Chen  <cathiechen@igalia.com>
 
         Implement ResizeObserver.
index ac52484..5e05c65 100644 (file)
@@ -391,12 +391,6 @@ ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
 ENABLE_WEBGPU_macosx = $(ENABLE_WEBGPU$(WK_MACOS_1013));
 ENABLE_WEBGPU_MACOS_SINCE_1013 = ENABLE_WEBGPU;
 
-ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
-ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
-ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
-
 ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 
 ENABLE_WEB_AUTHN = $(ENABLE_WEB_AUTHN_$(WK_PLATFORM_NAME));
@@ -413,4 +407,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_C_LOOP) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_C_LOOP) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 9d30181..50438bb 100644 (file)
@@ -546,8 +546,6 @@ bindings/js/JSVideoTrackListCustom.cpp
 bindings/js/JSWebAnimationCustom.cpp
 bindings/js/JSWebGL2RenderingContextCustom.cpp
 bindings/js/JSWebGLRenderingContextCustom.cpp
-bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp
-bindings/js/JSWebMetalRenderingContextCustom.cpp
 bindings/js/JSWindowProxy.cpp
 bindings/js/JSWorkerGlobalScopeBase.cpp
 bindings/js/JSWorkerGlobalScopeCustom.cpp
@@ -1216,28 +1214,6 @@ html/canvas/OffscreenCanvasRenderingContext2D.cpp
 html/canvas/PaintRenderingContext2D.cpp
 html/canvas/Path2D.cpp
 html/canvas/PlaceholderRenderingContext.cpp
-html/canvas/WebMetalBuffer.cpp
-html/canvas/WebMetalCommandBuffer.cpp
-html/canvas/WebMetalCommandQueue.cpp
-html/canvas/WebMetalComputeCommandEncoder.cpp
-html/canvas/WebMetalComputePipelineState.cpp
-html/canvas/WebMetalDepthStencilDescriptor.cpp
-html/canvas/WebMetalDepthStencilState.cpp
-html/canvas/WebMetalDrawable.cpp
-html/canvas/WebMetalEnums.cpp
-html/canvas/WebMetalFunction.cpp
-html/canvas/WebMetalLibrary.cpp
-html/canvas/WebMetalRenderCommandEncoder.cpp
-html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp
-html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp
-html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp
-html/canvas/WebMetalRenderPassDescriptor.cpp
-html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp
-html/canvas/WebMetalRenderPipelineDescriptor.cpp
-html/canvas/WebMetalRenderPipelineState.cpp
-html/canvas/WebMetalRenderingContext.cpp
-html/canvas/WebMetalTexture.cpp
-html/canvas/WebMetalTextureDescriptor.cpp
 
 html/forms/FileIconLoader.cpp
 
@@ -1825,27 +1801,6 @@ platform/graphics/filters/SpotLightSource.cpp
 platform/graphics/gpu/GPUDevice.cpp
 platform/graphics/gpu/GPUPipelineLayout.cpp
 platform/graphics/gpu/GPUProgrammablePassEncoder.cpp
-platform/graphics/gpu/legacy/GPULegacyBuffer.cpp
-platform/graphics/gpu/legacy/GPULegacyCommandBuffer.cpp
-platform/graphics/gpu/legacy/GPULegacyCommandQueue.cpp
-platform/graphics/gpu/legacy/GPULegacyComputeCommandEncoder.cpp
-platform/graphics/gpu/legacy/GPULegacyComputePipelineState.cpp
-platform/graphics/gpu/legacy/GPULegacyDepthStencilDescriptor.cpp
-platform/graphics/gpu/legacy/GPULegacyDepthStencilState.cpp
-platform/graphics/gpu/legacy/GPULegacyDevice.cpp
-platform/graphics/gpu/legacy/GPULegacyDrawable.cpp
-platform/graphics/gpu/legacy/GPULegacyFunction.cpp
-platform/graphics/gpu/legacy/GPULegacyLibrary.cpp
-platform/graphics/gpu/legacy/GPULegacyRenderCommandEncoder.cpp
-platform/graphics/gpu/legacy/GPULegacyRenderPassAttachmentDescriptor.cpp
-platform/graphics/gpu/legacy/GPULegacyRenderPassColorAttachmentDescriptor.cpp
-platform/graphics/gpu/legacy/GPULegacyRenderPassDepthAttachmentDescriptor.cpp
-platform/graphics/gpu/legacy/GPULegacyRenderPassDescriptor.cpp
-platform/graphics/gpu/legacy/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp
-platform/graphics/gpu/legacy/GPULegacyRenderPipelineDescriptor.cpp
-platform/graphics/gpu/legacy/GPULegacyRenderPipelineState.cpp
-platform/graphics/gpu/legacy/GPULegacyTexture.cpp
-platform/graphics/gpu/legacy/GPULegacyTextureDescriptor.cpp
 
 platform/graphics/iso/ISOBox.cpp
 platform/graphics/iso/ISOOriginalFormatBox.cpp
@@ -3353,28 +3308,6 @@ JSWebGPUShaderModuleDescriptor.cpp
 JSWebGPUSwapChain.cpp
 JSWebGPUTexture.cpp
 JSWebGPUTextureView.cpp
-JSWebMetalBuffer.cpp
-JSWebMetalCommandBuffer.cpp
-JSWebMetalCommandQueue.cpp
-JSWebMetalComputeCommandEncoder.cpp
-JSWebMetalComputePipelineState.cpp
-JSWebMetalDepthStencilDescriptor.cpp
-JSWebMetalDepthStencilState.cpp
-JSWebMetalDrawable.cpp
-JSWebMetalFunction.cpp
-JSWebMetalLibrary.cpp
-JSWebMetalRenderCommandEncoder.cpp
-JSWebMetalRenderPassAttachmentDescriptor.cpp
-JSWebMetalRenderPassColorAttachmentDescriptor.cpp
-JSWebMetalRenderPassDepthAttachmentDescriptor.cpp
-JSWebMetalRenderPassDescriptor.cpp
-JSWebMetalRenderPipelineColorAttachmentDescriptor.cpp
-JSWebMetalRenderPipelineDescriptor.cpp
-JSWebMetalRenderPipelineState.cpp
-JSWebMetalRenderingContext.cpp
-JSWebMetalSize.cpp
-JSWebMetalTexture.cpp
-JSWebMetalTextureDescriptor.cpp
 JSWebKitAnimationEvent.cpp
 JSWebKitCSSMatrix.cpp
 JSWebKitCSSViewportRule.cpp
index de74edc..496bb4b 100644 (file)
@@ -310,7 +310,6 @@ platform/graphics/cocoa/WebCoreCALayerExtras.mm
 platform/graphics/cocoa/WebCoreDecompressionSession.mm
 platform/graphics/cocoa/WebGLLayer.mm
 platform/graphics/cocoa/WebGPULayer.mm
-platform/graphics/cocoa/WebMetalLayer.mm
 platform/graphics/cocoa/TextTrackRepresentationCocoa.mm
 
 platform/graphics/cv/ImageTransferSessionVT.mm
@@ -361,28 +360,6 @@ platform/graphics/mac/SwitchingGPUClient.cpp
 platform/graphics/mac/WebLayer.mm
 platform/graphics/mac/WebKitNSImageExtras.mm
 
-platform/graphics/gpu/legacy/cocoa/GPULegacyBufferMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyCommandBufferMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyCommandQueueMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyComputeCommandEncoderMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyComputePipelineStateMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyDepthStencilDescriptorMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyDepthStencilStateMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyDeviceMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyDrawableMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyFunctionMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyLibraryMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyRenderCommandEncoderMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassAttachmentDescriptorMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassColorAttachmentDescriptorMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPassDescriptorMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineDescriptorMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyRenderPipelineStateMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyTextureDescriptorMetal.mm
-platform/graphics/gpu/legacy/cocoa/GPULegacyTextureMetal.mm
-
 platform/graphics/opengl/Extensions3DOpenGL.cpp
 platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
 platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
@@ -539,7 +516,6 @@ platform/network/mac/ResourceErrorMac.mm
 platform/network/mac/ResourceHandleMac.mm
 platform/network/mac/SynchronousLoaderClient.mm
 platform/network/mac/UTIUtilities.mm
-platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
 platform/network/mac/WebCoreURLResponse.mm
 
 platform/text/cf/HyphenationCF.cpp
index 4e937eb..c142980 100644 (file)
                1CAF34810A6C405200ABE06E /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAF347E0A6C405200ABE06E /* WebScriptObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1CAF34820A6C405200ABE06E /* WebScriptObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CAF347F0A6C405200ABE06E /* WebScriptObject.mm */; };
                1CAF34830A6C405200ABE06E /* WebScriptObjectPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAF34800A6C405200ABE06E /* WebScriptObjectPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               1CCD81502231F83E0065FC2B /* WebCoreResourceHandleAsOperationQueueDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = E152551416FD234F003D7ADB /* WebCoreResourceHandleAsOperationQueueDelegate.mm */; };
                1CCDF5BE1990332400BCEBAD /* SVGToOTFFontConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CCDF5BC1990332400BCEBAD /* SVGToOTFFontConversion.h */; };
                1CFAE3230A6D6A3F0032593D /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CFAE3220A6D6A3F0032593D /* libobjc.dylib */; };
                1D9F0FC12122029B005D8FD4 /* ShareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DC55400211BA8C8004B780E /* ShareData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                312FF91A21A4C36500EB199D /* GPUSwapChain.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8BA21A4C2EF00EB199D /* GPUSwapChain.h */; };
                312FF91B21A4C36500EB199D /* GPUTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8C521A4C2F400EB199D /* GPUTexture.h */; };
                312FF91C21A4C36500EB199D /* GPUTextureFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8C321A4C2F300EB199D /* GPUTextureFormat.h */; };
-               312FF91D21A4C37300EB199D /* GPULegacyRenderPassDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8FF21A4C33F00EB199D /* GPULegacyRenderPassDescriptor.h */; };
-               312FF91E21A4C37300EB199D /* GPULegacyBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF90221A4C33F00EB199D /* GPULegacyBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               312FF91F21A4C37300EB199D /* GPULegacyTextureDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF90421A4C33F00EB199D /* GPULegacyTextureDescriptor.h */; };
-               312FF92021A4C37300EB199D /* GPULegacyRenderPassAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF90A21A4C33F00EB199D /* GPULegacyRenderPassAttachmentDescriptor.h */; };
-               312FF92121A4C37300EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF90B21A4C33F00EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */; };
-               312FF92221A4C37300EB199D /* GPULegacyLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF90C21A4C33F00EB199D /* GPULegacyLibrary.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               312FF92321A4C37300EB199D /* GPULegacyRenderPipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF90E21A4C33F00EB199D /* GPULegacyRenderPipelineState.h */; };
-               312FF92421A4C37300EB199D /* GPULegacyFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF91021A4C33F00EB199D /* GPULegacyFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               312FF92521A4C38B00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8D121A4C33F00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptor.h */; };
-               312FF92621A4C38B00EB199D /* GPULegacyDepthStencilDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8D221A4C33F00EB199D /* GPULegacyDepthStencilDescriptor.h */; };
-               312FF92721A4C38B00EB199D /* GPULegacyDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8D321A4C33F00EB199D /* GPULegacyDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               312FF92821A4C38B00EB199D /* GPULegacyTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8D421A4C33F00EB199D /* GPULegacyTexture.h */; };
-               312FF92921A4C38B00EB199D /* GPULegacyRenderCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8D621A4C33F00EB199D /* GPULegacyRenderCommandEncoder.h */; };
-               312FF92A21A4C38B00EB199D /* GPULegacyCommandQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8D921A4C33F00EB199D /* GPULegacyCommandQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               312FF92B21A4C38B00EB199D /* GPULegacyDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8DB21A4C33F00EB199D /* GPULegacyDrawable.h */; };
-               312FF92C21A4C38B00EB199D /* GPULegacyEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8DC21A4C33F00EB199D /* GPULegacyEnums.h */; };
-               312FF92D21A4C38B00EB199D /* GPULegacySize.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8DF21A4C33F00EB199D /* GPULegacySize.h */; };
-               312FF92E21A4C38B00EB199D /* GPULegacyRenderPassColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8E321A4C33F00EB199D /* GPULegacyRenderPassColorAttachmentDescriptor.h */; };
-               312FF92F21A4C38B00EB199D /* GPULegacyComputeCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8E421A4C33F00EB199D /* GPULegacyComputeCommandEncoder.h */; };
-               312FF93021A4C38B00EB199D /* GPULegacyDepthStencilState.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8E621A4C33F00EB199D /* GPULegacyDepthStencilState.h */; };
-               312FF93121A4C38B00EB199D /* GPULegacyRenderPipelineDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8E721A4C33F00EB199D /* GPULegacyRenderPipelineDescriptor.h */; };
-               312FF93221A4C55200EB199D /* GPULegacyCommandBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 312FF8DE21A4C33F00EB199D /* GPULegacyCommandBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                313171561FB079E5008D91FC /* CanvasBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 313171541FB079D1008D91FC /* CanvasBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                313591061E7DDC7300F30630 /* RTCIceConnectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 313591001E7DDC6000F30630 /* RTCIceConnectionState.h */; };
                313591071E7DDC7300F30630 /* RTCIceGatheringState.h in Headers */ = {isa = PBXBuildFile; fileRef = 313591011E7DDC6000F30630 /* RTCIceGatheringState.h */; };
                314877E61FAAB02500C05759 /* JSOffscreenCanvas.h in Headers */ = {isa = PBXBuildFile; fileRef = 314877E41FAAB02200C05759 /* JSOffscreenCanvas.h */; };
                314BE3A11B30F6B700141982 /* CSSNamedImageValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A01B30F6B700141982 /* CSSNamedImageValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
                314BE3A71B3103FB00141982 /* NamedImageGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */; };
-               316BDB8C1E6E153000DE0D5A /* WebMetalLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */; };
                316DCB201E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1A1E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h */; };
                316DCB221E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1C1E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h */; };
                316DCB4C1E7910A6001B5F87 /* JSRTCIceConnectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB461E7910A6001B5F87 /* JSRTCIceConnectionState.h */; };
                312FF8C321A4C2F300EB199D /* GPUTextureFormat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUTextureFormat.h; sourceTree = "<group>"; };
                312FF8C421A4C2F400EB199D /* GPUPipelineDescriptorBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUPipelineDescriptorBase.h; sourceTree = "<group>"; };
                312FF8C521A4C2F400EB199D /* GPUTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUTexture.h; sourceTree = "<group>"; };
-               312FF8CF21A4C33F00EB199D /* GPULegacyTextureDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyTextureDescriptor.cpp; sourceTree = "<group>"; };
-               312FF8D021A4C33F00EB199D /* GPULegacyRenderPipelineDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineDescriptor.cpp; sourceTree = "<group>"; };
-               312FF8D121A4C33F00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassDepthAttachmentDescriptor.h; sourceTree = "<group>"; };
-               312FF8D221A4C33F00EB199D /* GPULegacyDepthStencilDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyDepthStencilDescriptor.h; sourceTree = "<group>"; };
-               312FF8D321A4C33F00EB199D /* GPULegacyDevice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyDevice.h; sourceTree = "<group>"; };
-               312FF8D421A4C33F00EB199D /* GPULegacyTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyTexture.h; sourceTree = "<group>"; };
-               312FF8D521A4C33F00EB199D /* GPULegacyTexture.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyTexture.cpp; sourceTree = "<group>"; };
-               312FF8D621A4C33F00EB199D /* GPULegacyRenderCommandEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderCommandEncoder.h; sourceTree = "<group>"; };
-               312FF8D721A4C33F00EB199D /* GPULegacyComputePipelineState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyComputePipelineState.h; sourceTree = "<group>"; };
-               312FF8D821A4C33F00EB199D /* GPULegacyFunction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyFunction.cpp; sourceTree = "<group>"; };
-               312FF8D921A4C33F00EB199D /* GPULegacyCommandQueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyCommandQueue.h; sourceTree = "<group>"; };
-               312FF8DA21A4C33F00EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               312FF8DB21A4C33F00EB199D /* GPULegacyDrawable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyDrawable.h; sourceTree = "<group>"; };
-               312FF8DC21A4C33F00EB199D /* GPULegacyEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyEnums.h; sourceTree = "<group>"; };
-               312FF8DD21A4C33F00EB199D /* GPULegacyRenderCommandEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderCommandEncoder.cpp; sourceTree = "<group>"; };
-               312FF8DE21A4C33F00EB199D /* GPULegacyCommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyCommandBuffer.h; sourceTree = "<group>"; };
-               312FF8DF21A4C33F00EB199D /* GPULegacySize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacySize.h; sourceTree = "<group>"; };
-               312FF8E021A4C33F00EB199D /* GPULegacyBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyBuffer.cpp; sourceTree = "<group>"; };
-               312FF8E121A4C33F00EB199D /* GPULegacyDepthStencilState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDepthStencilState.cpp; sourceTree = "<group>"; };
-               312FF8E221A4C33F00EB199D /* GPULegacyDevice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDevice.cpp; sourceTree = "<group>"; };
-               312FF8E321A4C33F00EB199D /* GPULegacyRenderPassColorAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassColorAttachmentDescriptor.h; sourceTree = "<group>"; };
-               312FF8E421A4C33F00EB199D /* GPULegacyComputeCommandEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyComputeCommandEncoder.h; sourceTree = "<group>"; };
-               312FF8E521A4C33F00EB199D /* GPULegacyRenderPassDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassDescriptor.cpp; sourceTree = "<group>"; };
-               312FF8E621A4C33F00EB199D /* GPULegacyDepthStencilState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyDepthStencilState.h; sourceTree = "<group>"; };
-               312FF8E721A4C33F00EB199D /* GPULegacyRenderPipelineDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineDescriptor.h; sourceTree = "<group>"; };
-               312FF8E821A4C33F00EB199D /* GPULegacyComputePipelineState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyComputePipelineState.cpp; sourceTree = "<group>"; };
-               312FF8EA21A4C33F00EB199D /* GPULegacyDepthStencilDescriptorMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDepthStencilDescriptorMetal.mm; sourceTree = "<group>"; };
-               312FF8EB21A4C33F00EB199D /* GPULegacyRenderCommandEncoderMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderCommandEncoderMetal.mm; sourceTree = "<group>"; };
-               312FF8EC21A4C33F00EB199D /* GPULegacyTextureDescriptorMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyTextureDescriptorMetal.mm; sourceTree = "<group>"; };
-               312FF8ED21A4C33F00EB199D /* GPULegacyFunctionMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyFunctionMetal.mm; sourceTree = "<group>"; };
-               312FF8EE21A4C33F00EB199D /* GPULegacyDrawableMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDrawableMetal.mm; sourceTree = "<group>"; };
-               312FF8EF21A4C33F00EB199D /* GPULegacyRenderPipelineDescriptorMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineDescriptorMetal.mm; sourceTree = "<group>"; };
-               312FF8F021A4C33F00EB199D /* GPULegacyRenderPassDescriptorMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassDescriptorMetal.mm; sourceTree = "<group>"; };
-               312FF8F121A4C33F00EB199D /* GPULegacyCommandQueueMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyCommandQueueMetal.mm; sourceTree = "<group>"; };
-               312FF8F221A4C33F00EB199D /* GPULegacyLibraryMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyLibraryMetal.mm; sourceTree = "<group>"; };
-               312FF8F321A4C33F00EB199D /* GPULegacyComputeCommandEncoderMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyComputeCommandEncoderMetal.mm; sourceTree = "<group>"; };
-               312FF8F421A4C33F00EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
-               312FF8F521A4C33F00EB199D /* GPULegacyRenderPassColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
-               312FF8F621A4C33F00EB199D /* GPULegacyCommandBufferMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyCommandBufferMetal.mm; sourceTree = "<group>"; };
-               312FF8F721A4C33F00EB199D /* GPULegacyRenderPassAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
-               312FF8F821A4C33F00EB199D /* GPULegacyDeviceMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDeviceMetal.mm; sourceTree = "<group>"; };
-               312FF8F921A4C33F00EB199D /* GPULegacyDepthStencilStateMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDepthStencilStateMetal.mm; sourceTree = "<group>"; };
-               312FF8FA21A4C33F00EB199D /* GPULegacyBufferMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyBufferMetal.mm; sourceTree = "<group>"; };
-               312FF8FB21A4C33F00EB199D /* GPULegacyComputePipelineStateMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyComputePipelineStateMetal.mm; sourceTree = "<group>"; };
-               312FF8FC21A4C33F00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
-               312FF8FD21A4C33F00EB199D /* GPULegacyRenderPipelineStateMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineStateMetal.mm; sourceTree = "<group>"; };
-               312FF8FE21A4C33F00EB199D /* GPULegacyTextureMetal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyTextureMetal.mm; sourceTree = "<group>"; };
-               312FF8FF21A4C33F00EB199D /* GPULegacyRenderPassDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassDescriptor.h; sourceTree = "<group>"; };
-               312FF90021A4C33F00EB199D /* GPULegacyRenderPassColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               312FF90121A4C33F00EB199D /* GPULegacyRenderPipelineState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineState.cpp; sourceTree = "<group>"; };
-               312FF90221A4C33F00EB199D /* GPULegacyBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyBuffer.h; sourceTree = "<group>"; };
-               312FF90321A4C33F00EB199D /* GPULegacyCommandBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyCommandBuffer.cpp; sourceTree = "<group>"; };
-               312FF90421A4C33F00EB199D /* GPULegacyTextureDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyTextureDescriptor.h; sourceTree = "<group>"; };
-               312FF90521A4C33F00EB199D /* GPULegacyLibrary.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyLibrary.cpp; sourceTree = "<group>"; };
-               312FF90621A4C33F00EB199D /* GPULegacyComputeCommandEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyComputeCommandEncoder.cpp; sourceTree = "<group>"; };
-               312FF90721A4C33F00EB199D /* GPULegacyDrawable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDrawable.cpp; sourceTree = "<group>"; };
-               312FF90821A4C33F00EB199D /* GPULegacyDepthStencilDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDepthStencilDescriptor.cpp; sourceTree = "<group>"; };
-               312FF90921A4C33F00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassDepthAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               312FF90A21A4C33F00EB199D /* GPULegacyRenderPassAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassAttachmentDescriptor.h; sourceTree = "<group>"; };
-               312FF90B21A4C33F00EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineColorAttachmentDescriptor.h; sourceTree = "<group>"; };
-               312FF90C21A4C33F00EB199D /* GPULegacyLibrary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyLibrary.h; sourceTree = "<group>"; };
-               312FF90D21A4C33F00EB199D /* GPULegacyRenderPassAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               312FF90E21A4C33F00EB199D /* GPULegacyRenderPipelineState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineState.h; sourceTree = "<group>"; };
-               312FF90F21A4C33F00EB199D /* GPULegacyCommandQueue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyCommandQueue.cpp; sourceTree = "<group>"; };
-               312FF91021A4C33F00EB199D /* GPULegacyFunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPULegacyFunction.h; sourceTree = "<group>"; };
                312FF93921A61C9F00EB199D /* WebGPUQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGPUQueue.h; sourceTree = "<group>"; };
                312FF93B21A61CA000EB199D /* WebGPUQueue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebGPUQueue.idl; sourceTree = "<group>"; };
                312FF93C21A61CA100EB199D /* WebGPUQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUQueue.cpp; sourceTree = "<group>"; };
                314BE3A41B3103FB00141982 /* NamedImageGeneratedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NamedImageGeneratedImage.cpp; sourceTree = "<group>"; };
                314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NamedImageGeneratedImage.h; sourceTree = "<group>"; };
                315574CC218F66D000D88F66 /* PointerEventIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PointerEventIOS.cpp; sourceTree = "<group>"; };
-               316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMetalLayer.h; sourceTree = "<group>"; };
                316DCB121E78BE43001B5F87 /* RTCOfferAnswerOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCOfferAnswerOptions.idl; sourceTree = "<group>"; };
                316DCB171E78C330001B5F87 /* RTCRtpTransceiverDirection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpTransceiverDirection.idl; sourceTree = "<group>"; };
                316DCB191E78CA55001B5F87 /* JSRTCOfferAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCOfferAnswerOptions.cpp; 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>"; };
                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>"; };
-               D02F855121682A560088EE74 /* WebMetalComputePipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMetalComputePipelineState.h; sourceTree = "<group>"; };
-               D02F855221682A910088EE74 /* WebMetalRenderPipelineState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPipelineState.h; sourceTree = "<group>"; };
-               D02F855321682A910088EE74 /* WebMetalRenderPassDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPassDescriptor.cpp; sourceTree = "<group>"; };
-               D02F855421682A910088EE74 /* WebMetalRenderingContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderingContext.h; sourceTree = "<group>"; };
-               D02F855521682A920088EE74 /* WebMetalDepthStencilDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalDepthStencilDescriptor.h; sourceTree = "<group>"; };
-               D02F855621682A920088EE74 /* WebMetalSize.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalSize.idl; sourceTree = "<group>"; };
-               D02F855721682A930088EE74 /* WebMetalRenderPassAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPassAttachmentDescriptor.h; sourceTree = "<group>"; };
-               D02F855821682A930088EE74 /* WebMetalTexture.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalTexture.idl; sourceTree = "<group>"; };
-               D02F855921682A940088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPassColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               D02F855A21682A940088EE74 /* WebMetalRenderingContext.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderingContext.idl; sourceTree = "<group>"; };
-               D02F855B21682A940088EE74 /* WebMetalComputePipelineState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalComputePipelineState.cpp; sourceTree = "<group>"; };
-               D02F855C21682A950088EE74 /* WebMetalTextureDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalTextureDescriptor.idl; sourceTree = "<group>"; };
-               D02F855D21682A950088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPassColorAttachmentDescriptor.h; sourceTree = "<group>"; };
-               D02F855E21682A960088EE74 /* WebMetalRenderPipelineDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPipelineDescriptor.cpp; sourceTree = "<group>"; };
-               D02F855F21682A960088EE74 /* WebMetalRenderPipelineState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPipelineState.cpp; sourceTree = "<group>"; };
-               D02F856021682A970088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPassColorAttachmentDescriptor.idl; sourceTree = "<group>"; };
-               D02F856121682A970088EE74 /* WebMetalRenderPassAttachmentDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPassAttachmentDescriptor.idl; sourceTree = "<group>"; };
-               D02F856221682A980088EE74 /* WebMetalRenderCommandEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderCommandEncoder.cpp; sourceTree = "<group>"; };
-               D02F856321682A980088EE74 /* WebMetalRenderCommandEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderCommandEncoder.h; sourceTree = "<group>"; };
-               D02F856421682A980088EE74 /* WebMetalDepthStencilState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalDepthStencilState.h; sourceTree = "<group>"; };
-               D02F856521682A990088EE74 /* WebMetalDepthStencilState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalDepthStencilState.cpp; sourceTree = "<group>"; };
-               D02F856621682A990088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPipelineColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               D02F856721682A9A0088EE74 /* WebMetalRenderPipelineState.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPipelineState.idl; sourceTree = "<group>"; };
-               D02F856821682A9A0088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPassDepthAttachmentDescriptor.idl; sourceTree = "<group>"; };
-               D02F856921682A9B0088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPassDepthAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               D02F856A21682A9B0088EE74 /* WebMetalTextureDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalTextureDescriptor.h; sourceTree = "<group>"; };
-               D02F856B21682A9C0088EE74 /* WebMetalRenderPassDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPassDescriptor.h; sourceTree = "<group>"; };
-               D02F856C21682A9C0088EE74 /* WebMetalLibrary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalLibrary.h; sourceTree = "<group>"; };
-               D02F856D21682A9C0088EE74 /* WebMetalSize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalSize.h; sourceTree = "<group>"; };
-               D02F856E21682A9D0088EE74 /* WebMetalTextureDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalTextureDescriptor.cpp; sourceTree = "<group>"; };
-               D02F856F21682A9D0088EE74 /* WebMetalDrawable.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalDrawable.idl; sourceTree = "<group>"; };
-               D02F857021682A9E0088EE74 /* WebMetalEnums.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalEnums.cpp; sourceTree = "<group>"; };
-               D02F857121682A9E0088EE74 /* WebMetalRenderPassAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPassAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               D02F857221682A9E0088EE74 /* WebMetalLibrary.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalLibrary.idl; sourceTree = "<group>"; };
-               D02F857321682A9F0088EE74 /* WebMetalTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalTexture.h; sourceTree = "<group>"; };
-               D02F857421682A9F0088EE74 /* WebMetalEnums.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalEnums.idl; sourceTree = "<group>"; };
-               D02F857521682AA00088EE74 /* WebMetalEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalEnums.h; sourceTree = "<group>"; };
-               D02F857621682AA00088EE74 /* WebMetalDrawable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalDrawable.h; sourceTree = "<group>"; };
-               D02F857721682AA10088EE74 /* WebMetalDepthStencilState.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalDepthStencilState.idl; sourceTree = "<group>"; };
-               D02F857821682AA10088EE74 /* WebMetalDepthStencilDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalDepthStencilDescriptor.idl; sourceTree = "<group>"; };
-               D02F857921682AA20088EE74 /* WebMetalFunction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalFunction.cpp; sourceTree = "<group>"; };
-               D02F857A21682AA20088EE74 /* WebMetalFunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalFunction.h; sourceTree = "<group>"; };
-               D02F857B21682AA20088EE74 /* WebMetalLibrary.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalLibrary.cpp; sourceTree = "<group>"; };
-               D02F857C21682AA30088EE74 /* WebMetalRenderPipelineDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPipelineDescriptor.h; sourceTree = "<group>"; };
-               D02F857D21682AA30088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPassDepthAttachmentDescriptor.h; sourceTree = "<group>"; };
-               D02F857E21682AA40088EE74 /* WebMetalRenderPassDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPassDescriptor.idl; sourceTree = "<group>"; };
-               D02F857F21682AA40088EE74 /* WebMetalDrawable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalDrawable.cpp; sourceTree = "<group>"; };
-               D02F858021682AA40088EE74 /* WebMetalRenderPipelineDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPipelineDescriptor.idl; sourceTree = "<group>"; };
-               D02F858121682AA50088EE74 /* WebMetalRenderCommandEncoder.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderCommandEncoder.idl; sourceTree = "<group>"; };
-               D02F858221682AA50088EE74 /* WebMetalTexture.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalTexture.cpp; sourceTree = "<group>"; };
-               D02F858321682AA60088EE74 /* WebMetalComputePipelineState.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalComputePipelineState.idl; sourceTree = "<group>"; };
-               D02F858421682AA60088EE74 /* WebMetalDepthStencilDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalDepthStencilDescriptor.cpp; sourceTree = "<group>"; };
-               D02F858521682AA70088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPipelineColorAttachmentDescriptor.h; sourceTree = "<group>"; };
-               D02F858621682AA70088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPipelineColorAttachmentDescriptor.idl; sourceTree = "<group>"; };
-               D02F858721682AA70088EE74 /* WebMetalRenderingContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderingContext.cpp; sourceTree = "<group>"; };
-               D02F858821682AA80088EE74 /* WebMetalFunction.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalFunction.idl; sourceTree = "<group>"; };
                D03211CE21AC954E00763CF2 /* GPURenderPassEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPURenderPassEncoder.h; sourceTree = "<group>"; };
                D03211CF21AC954E00763CF2 /* GPUProgrammablePassEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUProgrammablePassEncoder.h; sourceTree = "<group>"; };
                D03211D021AC954F00763CF2 /* GPURenderPassDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPURenderPassDescriptor.h; sourceTree = "<group>"; };
                D03C849C21FFC7FC0002227F /* GPUCompareFunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUCompareFunction.h; sourceTree = "<group>"; };
                D03C849E21FFCF000002227F /* GPUCompareFunction.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUCompareFunction.idl; sourceTree = "<group>"; };
                D03C84A221FFD7230002227F /* GPUDepthStencilStateDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GPUDepthStencilStateDescriptor.idl; sourceTree = "<group>"; };
-               D045AD1D2168230B000A6E9B /* WebMetalLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMetalLayer.mm; sourceTree = "<group>"; };
-               D045AD1E21682449000A6E9B /* JSWebMetalRenderPassAttachmentDescriptorCustom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebMetalRenderPassAttachmentDescriptorCustom.cpp; sourceTree = "<group>"; };
-               D045AD1F21682449000A6E9B /* JSWebMetalRenderingContextCustom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebMetalRenderingContextCustom.cpp; sourceTree = "<group>"; };
-               D045AD2021682474000A6E9B /* WebMetalComputeCommandEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalComputeCommandEncoder.h; sourceTree = "<group>"; };
-               D045AD2121682474000A6E9B /* WebMetalBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalBuffer.cpp; sourceTree = "<group>"; };
-               D045AD2221682474000A6E9B /* WebMetalCommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalCommandBuffer.h; sourceTree = "<group>"; };
-               D045AD2321682475000A6E9B /* WebMetalCommandQueue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalCommandQueue.cpp; sourceTree = "<group>"; };
                D05A99E121C9B50F00032B75 /* WebGPUPipelineLayoutDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUPipelineLayoutDescriptor.h; sourceTree = "<group>"; };
                D05A99E221C9B50F00032B75 /* WebGPUPipelineLayoutDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPUPipelineLayoutDescriptor.idl; sourceTree = "<group>"; };
                D05A99E421C9BF2C00032B75 /* WebGPUPipelineLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPUPipelineLayout.h; sourceTree = "<group>"; };
                D0C419F7218404DA009EC1DE /* WebGPURenderPipeline.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebGPURenderPipeline.h; sourceTree = "<group>"; };
                D0C419F8218404DA009EC1DE /* WebGPURenderPipeline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPURenderPipeline.cpp; sourceTree = "<group>"; };
                D0C419F9218404DA009EC1DE /* WebGPURenderPipeline.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGPURenderPipeline.idl; sourceTree = "<group>"; };
-               D0CAAE98216824A6001C91C7 /* WebMetalBuffer.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalBuffer.idl; sourceTree = "<group>"; };
-               D0CAAE9A216824A6001C91C7 /* WebMetalCommandBuffer.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalCommandBuffer.idl; sourceTree = "<group>"; };
-               D0CAAE9B216824A7001C91C7 /* WebMetalCommandQueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalCommandQueue.h; sourceTree = "<group>"; };
-               D0CAAE9C216824A7001C91C7 /* WebMetalComputeCommandEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalComputeCommandEncoder.cpp; sourceTree = "<group>"; };
-               D0CAAE9D216824A7001C91C7 /* WebMetalBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalBuffer.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>"; };
                        path = workers;
                        sourceTree = "<group>";
                };
-               312FF8CE21A4C33F00EB199D /* legacy */ = {
-                       isa = PBXGroup;
-                       children = (
-                               312FF8E921A4C33F00EB199D /* cocoa */,
-                               312FF8E021A4C33F00EB199D /* GPULegacyBuffer.cpp */,
-                               312FF90221A4C33F00EB199D /* GPULegacyBuffer.h */,
-                               312FF90321A4C33F00EB199D /* GPULegacyCommandBuffer.cpp */,
-                               312FF8DE21A4C33F00EB199D /* GPULegacyCommandBuffer.h */,
-                               312FF90F21A4C33F00EB199D /* GPULegacyCommandQueue.cpp */,
-                               312FF8D921A4C33F00EB199D /* GPULegacyCommandQueue.h */,
-                               312FF90621A4C33F00EB199D /* GPULegacyComputeCommandEncoder.cpp */,
-                               312FF8E421A4C33F00EB199D /* GPULegacyComputeCommandEncoder.h */,
-                               312FF8E821A4C33F00EB199D /* GPULegacyComputePipelineState.cpp */,
-                               312FF8D721A4C33F00EB199D /* GPULegacyComputePipelineState.h */,
-                               312FF90821A4C33F00EB199D /* GPULegacyDepthStencilDescriptor.cpp */,
-                               312FF8D221A4C33F00EB199D /* GPULegacyDepthStencilDescriptor.h */,
-                               312FF8E121A4C33F00EB199D /* GPULegacyDepthStencilState.cpp */,
-                               312FF8E621A4C33F00EB199D /* GPULegacyDepthStencilState.h */,
-                               312FF8E221A4C33F00EB199D /* GPULegacyDevice.cpp */,
-                               312FF8D321A4C33F00EB199D /* GPULegacyDevice.h */,
-                               312FF90721A4C33F00EB199D /* GPULegacyDrawable.cpp */,
-                               312FF8DB21A4C33F00EB199D /* GPULegacyDrawable.h */,
-                               312FF8DC21A4C33F00EB199D /* GPULegacyEnums.h */,
-                               312FF8D821A4C33F00EB199D /* GPULegacyFunction.cpp */,
-                               312FF91021A4C33F00EB199D /* GPULegacyFunction.h */,
-                               312FF90521A4C33F00EB199D /* GPULegacyLibrary.cpp */,
-                               312FF90C21A4C33F00EB199D /* GPULegacyLibrary.h */,
-                               312FF8DD21A4C33F00EB199D /* GPULegacyRenderCommandEncoder.cpp */,
-                               312FF8D621A4C33F00EB199D /* GPULegacyRenderCommandEncoder.h */,
-                               312FF90D21A4C33F00EB199D /* GPULegacyRenderPassAttachmentDescriptor.cpp */,
-                               312FF90A21A4C33F00EB199D /* GPULegacyRenderPassAttachmentDescriptor.h */,
-                               312FF90021A4C33F00EB199D /* GPULegacyRenderPassColorAttachmentDescriptor.cpp */,
-                               312FF8E321A4C33F00EB199D /* GPULegacyRenderPassColorAttachmentDescriptor.h */,
-                               312FF90921A4C33F00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptor.cpp */,
-                               312FF8D121A4C33F00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptor.h */,
-                               312FF8E521A4C33F00EB199D /* GPULegacyRenderPassDescriptor.cpp */,
-                               312FF8FF21A4C33F00EB199D /* GPULegacyRenderPassDescriptor.h */,
-                               312FF8DA21A4C33F00EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptor.cpp */,
-                               312FF90B21A4C33F00EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */,
-                               312FF8D021A4C33F00EB199D /* GPULegacyRenderPipelineDescriptor.cpp */,
-                               312FF8E721A4C33F00EB199D /* GPULegacyRenderPipelineDescriptor.h */,
-                               312FF90121A4C33F00EB199D /* GPULegacyRenderPipelineState.cpp */,
-                               312FF90E21A4C33F00EB199D /* GPULegacyRenderPipelineState.h */,
-                               312FF8DF21A4C33F00EB199D /* GPULegacySize.h */,
-                               312FF8D521A4C33F00EB199D /* GPULegacyTexture.cpp */,
-                               312FF8D421A4C33F00EB199D /* GPULegacyTexture.h */,
-                               312FF8CF21A4C33F00EB199D /* GPULegacyTextureDescriptor.cpp */,
-                               312FF90421A4C33F00EB199D /* GPULegacyTextureDescriptor.h */,
-                       );
-                       path = legacy;
-                       sourceTree = "<group>";
-               };
-               312FF8E921A4C33F00EB199D /* cocoa */ = {
-                       isa = PBXGroup;
-                       children = (
-                               312FF8FA21A4C33F00EB199D /* GPULegacyBufferMetal.mm */,
-                               312FF8F621A4C33F00EB199D /* GPULegacyCommandBufferMetal.mm */,
-                               312FF8F121A4C33F00EB199D /* GPULegacyCommandQueueMetal.mm */,
-                               312FF8F321A4C33F00EB199D /* GPULegacyComputeCommandEncoderMetal.mm */,
-                               312FF8FB21A4C33F00EB199D /* GPULegacyComputePipelineStateMetal.mm */,
-                               312FF8EA21A4C33F00EB199D /* GPULegacyDepthStencilDescriptorMetal.mm */,
-                               312FF8F921A4C33F00EB199D /* GPULegacyDepthStencilStateMetal.mm */,
-                               312FF8F821A4C33F00EB199D /* GPULegacyDeviceMetal.mm */,
-                               312FF8EE21A4C33F00EB199D /* GPULegacyDrawableMetal.mm */,
-                               312FF8ED21A4C33F00EB199D /* GPULegacyFunctionMetal.mm */,
-                               312FF8F221A4C33F00EB199D /* GPULegacyLibraryMetal.mm */,
-                               312FF8EB21A4C33F00EB199D /* GPULegacyRenderCommandEncoderMetal.mm */,
-                               312FF8F721A4C33F00EB199D /* GPULegacyRenderPassAttachmentDescriptorMetal.mm */,
-                               312FF8F521A4C33F00EB199D /* GPULegacyRenderPassColorAttachmentDescriptorMetal.mm */,
-                               312FF8FC21A4C33F00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm */,
-                               312FF8F021A4C33F00EB199D /* GPULegacyRenderPassDescriptorMetal.mm */,
-                               312FF8F421A4C33F00EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm */,
-                               312FF8EF21A4C33F00EB199D /* GPULegacyRenderPipelineDescriptorMetal.mm */,
-                               312FF8FD21A4C33F00EB199D /* GPULegacyRenderPipelineStateMetal.mm */,
-                               312FF8EC21A4C33F00EB199D /* GPULegacyTextureDescriptorMetal.mm */,
-                               312FF8FE21A4C33F00EB199D /* GPULegacyTextureMetal.mm */,
-                       );
-                       path = cocoa;
-                       sourceTree = "<group>";
-               };
                316FE1060E6E1D8400BF6088 /* animation */ = {
                        isa = PBXGroup;
                        children = (
                                77A17A7412F28642004E02F6 /* WebGLVertexArrayObjectOES.cpp */,
                                77A17A7512F28642004E02F6 /* WebGLVertexArrayObjectOES.h */,
                                77A17A7612F28642004E02F6 /* WebGLVertexArrayObjectOES.idl */,
-                               D045AD2121682474000A6E9B /* WebMetalBuffer.cpp */,
-                               D0CAAE9D216824A7001C91C7 /* WebMetalBuffer.h */,
-                               D0CAAE98216824A6001C91C7 /* WebMetalBuffer.idl */,
-                               D0CAAE9E216824A8001C91C7 /* WebMetalCommandBuffer.cpp */,
-                               D045AD2221682474000A6E9B /* WebMetalCommandBuffer.h */,
-                               D0CAAE9A216824A6001C91C7 /* WebMetalCommandBuffer.idl */,
-                               D045AD2321682475000A6E9B /* WebMetalCommandQueue.cpp */,
-                               D0CAAE9B216824A7001C91C7 /* WebMetalCommandQueue.h */,
-                               D02F854E21682A4A0088EE74 /* WebMetalCommandQueue.idl */,
-                               D0CAAE9C216824A7001C91C7 /* WebMetalComputeCommandEncoder.cpp */,
-                               D045AD2021682474000A6E9B /* WebMetalComputeCommandEncoder.h */,
-                               D02F855021682A560088EE74 /* WebMetalComputeCommandEncoder.idl */,
-                               D02F855B21682A940088EE74 /* WebMetalComputePipelineState.cpp */,
-                               D02F855121682A560088EE74 /* WebMetalComputePipelineState.h */,
-                               D02F858321682AA60088EE74 /* WebMetalComputePipelineState.idl */,
-                               D02F858421682AA60088EE74 /* WebMetalDepthStencilDescriptor.cpp */,
-                               D02F855521682A920088EE74 /* WebMetalDepthStencilDescriptor.h */,
-                               D02F857821682AA10088EE74 /* WebMetalDepthStencilDescriptor.idl */,
-                               D02F856521682A990088EE74 /* WebMetalDepthStencilState.cpp */,
-                               D02F856421682A980088EE74 /* WebMetalDepthStencilState.h */,
-                               D02F857721682AA10088EE74 /* WebMetalDepthStencilState.idl */,
-                               D02F857F21682AA40088EE74 /* WebMetalDrawable.cpp */,
-                               D02F857621682AA00088EE74 /* WebMetalDrawable.h */,
-                               D02F856F21682A9D0088EE74 /* WebMetalDrawable.idl */,
-                               D02F857021682A9E0088EE74 /* WebMetalEnums.cpp */,
-                               D02F857521682AA00088EE74 /* WebMetalEnums.h */,
-                               D02F857421682A9F0088EE74 /* WebMetalEnums.idl */,
-                               D02F857921682AA20088EE74 /* WebMetalFunction.cpp */,
-                               D02F857A21682AA20088EE74 /* WebMetalFunction.h */,
-                               D02F858821682AA80088EE74 /* WebMetalFunction.idl */,
-                               D02F857B21682AA20088EE74 /* WebMetalLibrary.cpp */,
-                               D02F856C21682A9C0088EE74 /* WebMetalLibrary.h */,
-                               D02F857221682A9E0088EE74 /* WebMetalLibrary.idl */,
-                               D02F856221682A980088EE74 /* WebMetalRenderCommandEncoder.cpp */,
-                               D02F856321682A980088EE74 /* WebMetalRenderCommandEncoder.h */,
-                               D02F858121682AA50088EE74 /* WebMetalRenderCommandEncoder.idl */,
-                               D02F858721682AA70088EE74 /* WebMetalRenderingContext.cpp */,
-                               D02F855421682A910088EE74 /* WebMetalRenderingContext.h */,
-                               D02F855A21682A940088EE74 /* WebMetalRenderingContext.idl */,
-                               D02F857121682A9E0088EE74 /* WebMetalRenderPassAttachmentDescriptor.cpp */,
-                               D02F855721682A930088EE74 /* WebMetalRenderPassAttachmentDescriptor.h */,
-                               D02F856121682A970088EE74 /* WebMetalRenderPassAttachmentDescriptor.idl */,
-                               D02F855921682A940088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.cpp */,
-                               D02F855D21682A950088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.h */,
-                               D02F856021682A970088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.idl */,
-                               D02F856921682A9B0088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.cpp */,
-                               D02F857D21682AA30088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.h */,
-                               D02F856821682A9A0088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.idl */,
-                               D02F855321682A910088EE74 /* WebMetalRenderPassDescriptor.cpp */,
-                               D02F856B21682A9C0088EE74 /* WebMetalRenderPassDescriptor.h */,
-                               D02F857E21682AA40088EE74 /* WebMetalRenderPassDescriptor.idl */,
-                               D02F856621682A990088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.cpp */,
-                               D02F858521682AA70088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.h */,
-                               D02F858621682AA70088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.idl */,
-                               D02F855E21682A960088EE74 /* WebMetalRenderPipelineDescriptor.cpp */,
-                               D02F857C21682AA30088EE74 /* WebMetalRenderPipelineDescriptor.h */,
-                               D02F858021682AA40088EE74 /* WebMetalRenderPipelineDescriptor.idl */,
-                               D02F855F21682A960088EE74 /* WebMetalRenderPipelineState.cpp */,
-                               D02F855221682A910088EE74 /* WebMetalRenderPipelineState.h */,
-                               D02F856721682A9A0088EE74 /* WebMetalRenderPipelineState.idl */,
-                               D02F856D21682A9C0088EE74 /* WebMetalSize.h */,
-                               D02F855621682A920088EE74 /* WebMetalSize.idl */,
-                               D02F858221682AA50088EE74 /* WebMetalTexture.cpp */,
-                               D02F857321682A9F0088EE74 /* WebMetalTexture.h */,
-                               D02F855821682A930088EE74 /* WebMetalTexture.idl */,
-                               D02F856E21682A9D0088EE74 /* WebMetalTextureDescriptor.cpp */,
-                               D02F856A21682A9B0088EE74 /* WebMetalTextureDescriptor.h */,
-                               D02F855C21682A950088EE74 /* WebMetalTextureDescriptor.idl */,
                        );
                        path = canvas;
                        sourceTree = "<group>";
                        isa = PBXGroup;
                        children = (
                                D087CE3721ACA94200BDE174 /* cocoa */,
-                               312FF8CE21A4C33F00EB199D /* legacy */,
                                D0BE105E21E6BAD300E42A89 /* GPUBindGroup.h */,
                                D0BE104E21E695E200E42A89 /* GPUBindGroupBinding.h */,
                                D0BE105121E6A70E00E42A89 /* GPUBindGroupDescriptor.h */,
                                49FFBF3E11C93EE3006A7118 /* WebGLLayer.mm */,
                                318436DB21B9DAA000ED383E /* WebGPULayer.h */,
                                318436DD21B9DAA000ED383E /* WebGPULayer.mm */,
-                               316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */,
-                               D045AD1D2168230B000A6E9B /* WebMetalLayer.mm */,
                        );
                        path = cocoa;
                        sourceTree = "<group>";
                                46BCBBC12085008000710638 /* JSRemoteDOMWindowBase.cpp */,
                                46BCBBC02085007F00710638 /* JSRemoteDOMWindowBase.h */,
                                931AE3B81FB80EAE00F5EFB2 /* JSValueInWrappedObject.h */,
-                               D045AD1F21682449000A6E9B /* JSWebMetalRenderingContextCustom.cpp */,
-                               D045AD1E21682449000A6E9B /* JSWebMetalRenderPassAttachmentDescriptorCustom.cpp */,
                                BCBFB53A0DCD29CF0019B3E5 /* JSWindowProxy.cpp */,
                                BCBFB53B0DCD29CF0019B3E5 /* JSWindowProxy.h */,
                                E1C36D320EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp */,
                                311518FC1E78C15F00EC514A /* GPUBasedCanvasRenderingContext.h in Headers */,
                                312FF91121A4C36500EB199D /* GPUCommandBuffer.h in Headers */,
                                312FF91221A4C36500EB199D /* GPUDevice.h in Headers */,
-                               312FF91E21A4C37300EB199D /* GPULegacyBuffer.h in Headers */,
-                               312FF93221A4C55200EB199D /* GPULegacyCommandBuffer.h in Headers */,
-                               312FF92A21A4C38B00EB199D /* GPULegacyCommandQueue.h in Headers */,
-                               312FF92F21A4C38B00EB199D /* GPULegacyComputeCommandEncoder.h in Headers */,
-                               312FF92621A4C38B00EB199D /* GPULegacyDepthStencilDescriptor.h in Headers */,
-                               312FF93021A4C38B00EB199D /* GPULegacyDepthStencilState.h in Headers */,
-                               312FF92721A4C38B00EB199D /* GPULegacyDevice.h in Headers */,
-                               312FF92B21A4C38B00EB199D /* GPULegacyDrawable.h in Headers */,
-                               312FF92C21A4C38B00EB199D /* GPULegacyEnums.h in Headers */,
-                               312FF92421A4C37300EB199D /* GPULegacyFunction.h in Headers */,
-                               312FF92221A4C37300EB199D /* GPULegacyLibrary.h in Headers */,
-                               312FF92921A4C38B00EB199D /* GPULegacyRenderCommandEncoder.h in Headers */,
-                               312FF92021A4C37300EB199D /* GPULegacyRenderPassAttachmentDescriptor.h in Headers */,
-                               312FF92E21A4C38B00EB199D /* GPULegacyRenderPassColorAttachmentDescriptor.h in Headers */,
-                               312FF92521A4C38B00EB199D /* GPULegacyRenderPassDepthAttachmentDescriptor.h in Headers */,
-                               312FF91D21A4C37300EB199D /* GPULegacyRenderPassDescriptor.h in Headers */,
-                               312FF92121A4C37300EB199D /* GPULegacyRenderPipelineColorAttachmentDescriptor.h in Headers */,
-                               312FF93121A4C38B00EB199D /* GPULegacyRenderPipelineDescriptor.h in Headers */,
-                               312FF92321A4C37300EB199D /* GPULegacyRenderPipelineState.h in Headers */,
-                               312FF92D21A4C38B00EB199D /* GPULegacySize.h in Headers */,
-                               312FF92821A4C38B00EB199D /* GPULegacyTexture.h in Headers */,
-                               312FF91F21A4C37300EB199D /* GPULegacyTextureDescriptor.h in Headers */,
                                312FF91321A4C36500EB199D /* GPUPipelineDescriptorBase.h in Headers */,
                                312FF91421A4C36500EB199D /* GPUPipelineStageDescriptor.h in Headers */,
                                312FF91521A4C36500EB199D /* GPUQueue.h in Headers */,
                                0709D78F1AE55554004E42F8 /* WebMediaSessionManager.h in Headers */,
                                0709D7951AE55A29004E42F8 /* WebMediaSessionManagerClient.h in Headers */,
                                0709D7931AE5557E004E42F8 /* WebMediaSessionManagerMac.h in Headers */,
-                               316BDB8C1E6E153000DE0D5A /* WebMetalLayer.h in Headers */,
                                E1A3162D134BC32D007C9A4F /* WebNSAttributedStringExtras.h in Headers */,
                                CD5896E21CD2B15100B3BCC8 /* WebPlaybackControlsManager.h in Headers */,
                                1CAF34810A6C405200ABE06E /* WebScriptObject.h in Headers */,
                                A180AD5B219F81B000DC039A /* WebCoreAdditions.mm in Sources */,
                                CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */,
                                CD225C0B1C46FBF400140761 /* WebCoreNSURLSession.mm in Sources */,
+                               1CCD81502231F83E0065FC2B /* WebCoreResourceHandleAsOperationQueueDelegate.mm in Sources */,
                                93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */,
                                CECDC93D21F2973200976BD1 /* WebEvent.mm in Sources */,
                                D3F3D36D1A69B7DC0059FC2B /* WebGL2RenderingContext.cpp in Sources */,
diff --git a/Source/WebCore/bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp b/Source/WebCore/bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp
deleted file mode 100644 (file)
index 60b6636..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "JSWebMetalRenderPassAttachmentDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "JSDOMBinding.h"
-#include "JSWebMetalRenderPassColorAttachmentDescriptor.h"
-#include "JSWebMetalRenderPassDepthAttachmentDescriptor.h"
-#include "WebMetalRenderPassColorAttachmentDescriptor.h"
-#include "WebMetalRenderPassDepthAttachmentDescriptor.h"
-
-namespace WebCore {
-using namespace JSC;
-
-JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject* globalObject, Ref<WebMetalRenderPassAttachmentDescriptor>&& object)
-{
-    if (object->isColorAttachmentDescriptor())
-        return createWrapper<WebMetalRenderPassColorAttachmentDescriptor>(globalObject, WTFMove(object));
-    return createWrapper<WebMetalRenderPassDepthAttachmentDescriptor>(globalObject, WTFMove(object));
-}
-
-JSValue toJS(ExecState* state, JSDOMGlobalObject* globalObject, WebMetalRenderPassAttachmentDescriptor& object)
-{
-    return wrap(state, globalObject, object);
-}
-
-}
-
-#endif
diff --git a/Source/WebCore/bindings/js/JSWebMetalRenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSWebMetalRenderingContextCustom.cpp
deleted file mode 100644 (file)
index a634c28..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "JSWebMetalRenderingContext.h"
-
-#if ENABLE(WEBMETAL)
-
-
-namespace WebCore {
-using namespace JSC;
-
-void JSWebMetalRenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
-{
-    visitor.addOpaqueRoot(&wrapped());
-}
-
-} // namespace WebCore
-
-#endif
index 80d8e69..190e69f 100644 (file)
@@ -219,28 +219,6 @@ namespace WebCore {
     macro(WebGPUTexture) \
     macro(WebGPUTextureView) \
     macro(WebGPUVertexFormat) \
-    macro(WebMetalBuffer) \
-    macro(WebMetalCommandBuffer) \
-    macro(WebMetalCommandQueue) \
-    macro(WebMetalComputeCommandEncoder) \
-    macro(WebMetalComputePipelineState) \
-    macro(WebMetalDepthStencilDescriptor) \
-    macro(WebMetalDepthStencilState) \
-    macro(WebMetalDrawable) \
-    macro(WebMetalFunction) \
-    macro(WebMetalLibrary) \
-    macro(WebMetalRenderCommandEncoder) \
-    macro(WebMetalRenderPassAttachmentDescriptor) \
-    macro(WebMetalRenderPassColorAttachmentDescriptor) \
-    macro(WebMetalRenderPassDepthAttachmentDescriptor) \
-    macro(WebMetalRenderPassDescriptor) \
-    macro(WebMetalRenderPipelineColorAttachmentDescriptor) \
-    macro(WebMetalRenderPipelineDescriptor) \
-    macro(WebMetalRenderPipelineState) \
-    macro(WebMetalRenderingContext) \
-    macro(WebMetalSize) \
-    macro(WebMetalTexture) \
-    macro(WebMetalTextureDescriptor) \
     macro(WebKitMediaKeyError) \
     macro(WebKitMediaKeyMessageEvent) \
     macro(WebKitMediaKeyNeededEvent) \
index adf4dd8..efeb3f1 100644 (file)
 #if ENABLE(WEBGPU)
 #include "GPUCanvasContext.h"
 #endif
-#if ENABLE(WEBMETAL)
-#include "WebMetalRenderingContext.h"
-#endif
 
 namespace WebCore {
 
@@ -6067,10 +6064,6 @@ Optional<RenderingContext> Document::getCSSCanvasContext(const String& type, con
     if (is<GPUCanvasContext>(*context))
         return RenderingContext { RefPtr<GPUCanvasContext> { &downcast<GPUCanvasContext>(*context) } };
 #endif
-#if ENABLE(WEBMETAL)
-    if (is<WebMetalRenderingContext>(*context))
-        return RenderingContext { RefPtr<WebMetalRenderingContext> { &downcast<WebMetalRenderingContext>(*context) } };
-#endif
 
     return RenderingContext { RefPtr<CanvasRenderingContext2D> { &downcast<CanvasRenderingContext2D>(*context) } };
 }
index 837b05f..d67f6e8 100644 (file)
@@ -197,7 +197,6 @@ class WebAnimation;
 class WebGL2RenderingContext;
 class WebGLRenderingContext;
 class GPUCanvasContext;
-class WebMetalRenderingContext;
 class WindowProxy;
 class Worklet;
 class XPathEvaluator;
@@ -328,9 +327,6 @@ using RenderingContext = Variant<
 #if ENABLE(WEBGPU)
     RefPtr<GPUCanvasContext>,
 #endif
-#if ENABLE(WEBMETAL)
-    RefPtr<WebMetalRenderingContext>,
-#endif
     RefPtr<ImageBitmapRenderingContext>,
     RefPtr<CanvasRenderingContext2D>
 >;
index 1d417fc..bce2bfe 100644 (file)
@@ -28,9 +28,6 @@ typedef (
 #if defined(ENABLE_WEBGPU) && ENABLE_WEBGPU
     GPUCanvasContext or
 #endif
-#if defined(ENABLE_WEBMETAL) && ENABLE_WEBMETAL
-    WebMetalRenderingContext or
-#endif
     ImageBitmapRenderingContext or 
     CanvasRenderingContext2D) RenderingContext;
 
index b5981cf..a269eae 100644 (file)
 #include "GPUCanvasContext.h"
 #endif
 
-#if ENABLE(WEBMETAL)
-#include "WebMetalRenderingContext.h"
-#endif
-
 #if PLATFORM(COCOA)
 #include "MediaSampleAVFObjC.h"
 #include <pal/cf/CoreMediaSoftLink.h>
@@ -250,14 +246,6 @@ ExceptionOr<Optional<RenderingContext>> HTMLCanvasElement::getContext(JSC::ExecS
         }
 #endif
 
-#if ENABLE(WEBMETAL)
-        if (m_context->isWebMetal()) {
-            if (!isWebMetalType(contextId))
-                return Optional<RenderingContext> { WTF::nullopt };
-            return Optional<RenderingContext> { RefPtr<WebMetalRenderingContext> { &downcast<WebMetalRenderingContext>(*m_context) } };
-        }
-#endif
-
         ASSERT_NOT_REACHED();
         return Optional<RenderingContext> { WTF::nullopt };
     }
@@ -308,15 +296,6 @@ ExceptionOr<Optional<RenderingContext>> HTMLCanvasElement::getContext(JSC::ExecS
     }
 #endif
 
-#if ENABLE(WEBMETAL)
-    if (isWebMetalType(contextId)) {
-        auto context = createContextWebMetal(contextId);
-        if (!context)
-            return Optional<RenderingContext> { WTF::nullopt };
-        return Optional<RenderingContext> { RefPtr<WebMetalRenderingContext> { context } };
-    }
-#endif
-
     return Optional<RenderingContext> { WTF::nullopt };
 }
 
@@ -328,11 +307,6 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type)
     if (HTMLCanvasElement::isBitmapRendererType(type))
         return getContextBitmapRenderer(type);
 
-#if ENABLE(WEBMETAL)
-    if (HTMLCanvasElement::isWebMetalType(type) && RuntimeEnabledFeatures::sharedFeatures().webMetalEnabled())
-        return getContextWebMetal(type);
-#endif
-
 #if ENABLE(WEBGL)
     if (HTMLCanvasElement::isWebGLType(type))
         return getContextWebGL(type);
@@ -504,46 +478,6 @@ GPUCanvasContext* HTMLCanvasElement::getContextWebGPU(const String& type)
 
 #endif // ENABLE(WEBGPU)
 
-#if ENABLE(WEBMETAL)
-
-bool HTMLCanvasElement::isWebMetalType(const String& type)
-{
-    return type == "webmetal";
-}
-
-WebMetalRenderingContext* HTMLCanvasElement::createContextWebMetal(const String& type)
-{
-    ASSERT_UNUSED(type, HTMLCanvasElement::isWebMetalType(type));
-    ASSERT(!m_context);
-
-    if (!RuntimeEnabledFeatures::sharedFeatures().webMetalEnabled())
-        return nullptr;
-
-    m_context = WebMetalRenderingContext::create(*this);
-    if (m_context) {
-        // Need to make sure a RenderLayer and compositing layer get created for the Canvas.
-        invalidateStyleAndLayerComposition();
-    }
-
-    return static_cast<WebMetalRenderingContext*>(m_context.get());
-}
-
-WebMetalRenderingContext* HTMLCanvasElement::getContextWebMetal(const String& type)
-{
-    ASSERT_UNUSED(type, HTMLCanvasElement::isWebMetalType(type));
-
-    if (!RuntimeEnabledFeatures::sharedFeatures().webMetalEnabled())
-        return nullptr;
-
-    if (m_context && !m_context->isWebMetal())
-        return nullptr;
-
-    if (!m_context)
-        return createContextWebMetal(type);
-    return static_cast<WebMetalRenderingContext*>(m_context.get());
-}
-#endif
-
 bool HTMLCanvasElement::isBitmapRendererType(const String& type)
 {
     return type == "bitmaprenderer";
index 3132c01..0efc1f2 100644 (file)
@@ -52,7 +52,6 @@ class MediaSample;
 class MediaStream;
 class WebGLRenderingContextBase;
 class GPUCanvasContext;
-class WebMetalRenderingContext;
 struct UncachedString;
 
 namespace DisplayList {
@@ -103,11 +102,6 @@ public:
     GPUCanvasContext* createContextWebGPU(const String&);
     GPUCanvasContext* getContextWebGPU(const String&);
 #endif
-#if ENABLE(WEBMETAL)
-    static bool isWebMetalType(const String&);
-    WebMetalRenderingContext* createContextWebMetal(const String&);
-    WebMetalRenderingContext* getContextWebMetal(const String&);
-#endif
 
     static bool isBitmapRendererType(const String&);
     ImageBitmapRenderingContext* createContextBitmapRenderer(const String&, ImageBitmapRenderingContextSettings&& = { });
index 7670278..fe06c2b 100644 (file)
@@ -34,9 +34,6 @@ typedef (
 #if defined(ENABLE_WEBGPU) && ENABLE_WEBGPU
     GPUCanvasContext or
 #endif
-#if defined(ENABLE_WEBMETAL) && ENABLE_WEBMETAL
-    WebMetalRenderingContext or
-#endif
     ImageBitmapRenderingContext or 
     CanvasRenderingContext2D) RenderingContext;
 
index 7e1a6ce..d054f59 100644 (file)
@@ -62,9 +62,6 @@ public:
 #if ENABLE(WEBGPU)
     virtual bool isWebGPU() const { return false; }
 #endif
-#if ENABLE(WEBMETAL)
-    virtual bool isWebMetal() const { return false; }
-#endif
     virtual bool isGPUBased() const { return false; }
     virtual bool isAccelerated() const { return false; }
     virtual bool isBitmapRenderer() const { return false; }
diff --git a/Source/WebCore/html/canvas/WebMetalBuffer.cpp b/Source/WebCore/html/canvas/WebMetalBuffer.cpp
deleted file mode 100644 (file)
index f65904b..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalBuffer.h"
-
-#if ENABLE(WEBMETAL)
-
-namespace WebCore {
-
-RefPtr<WebMetalBuffer> WebMetalBuffer::create(GPULegacyBuffer&& buffer)
-{
-    // FIXME: Consider returning null rather than a buffer with length 0 and contents null when creation fails.
-    return adoptRef(*new WebMetalBuffer(WTFMove(buffer)));
-}
-
-WebMetalBuffer::WebMetalBuffer(GPULegacyBuffer&& buffer)
-    : m_buffer { WTFMove(buffer) }
-{
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalBuffer.h b/Source/WebCore/html/canvas/WebMetalBuffer.h
deleted file mode 100644 (file)
index e844a17..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyBuffer.h"
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class WebMetalBuffer : public RefCounted<WebMetalBuffer> {
-public:
-    static RefPtr<WebMetalBuffer> create(GPULegacyBuffer&&);
-
-    unsigned length() const { return m_buffer.length(); }
-    JSC::ArrayBuffer& contents() const { return *m_buffer.contents(); }
-
-    const GPULegacyBuffer& buffer() const { return m_buffer; }
-
-private:
-    explicit WebMetalBuffer(GPULegacyBuffer&&);
-
-    GPULegacyBuffer m_buffer;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalBuffer.idl b/Source/WebCore/html/canvas/WebMetalBuffer.idl
deleted file mode 100644 (file)
index a275356..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalBuffer {
-
-    readonly attribute unsigned long length;
-    readonly attribute ArrayBufferView contents;
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalCommandBuffer.cpp b/Source/WebCore/html/canvas/WebMetalCommandBuffer.cpp
deleted file mode 100644 (file)
index 03afc36..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalCommandBuffer.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPULegacyCommandBuffer.h"
-#include "GPULegacyCommandQueue.h"
-#include "Logging.h"
-#include "WebMetalComputeCommandEncoder.h"
-#include "WebMetalDrawable.h"
-#include "WebMetalRenderCommandEncoder.h"
-#include "WebMetalRenderPassDescriptor.h"
-
-namespace WebCore {
-
-Ref<WebMetalCommandBuffer> WebMetalCommandBuffer::create(const GPULegacyCommandQueue& queue)
-{
-    return adoptRef(*new WebMetalCommandBuffer(queue));
-}
-
-WebMetalCommandBuffer::WebMetalCommandBuffer(const GPULegacyCommandQueue& queue)
-    : m_buffer { queue, [this] () { m_completed.resolve(); } }
-{
-    LOG(WebMetal, "WebMetalCommandBuffer::WebMetalCommandBuffer()");
-}
-
-WebMetalCommandBuffer::~WebMetalCommandBuffer()
-{
-    LOG(WebMetal, "WebMetalCommandBuffer::~WebMetalCommandBuffer()");
-}
-
-void WebMetalCommandBuffer::commit()
-{
-    LOG(WebMetal, "WebMetalCommandBuffer::commit()");
-    m_buffer.commit();
-}
-
-void WebMetalCommandBuffer::presentDrawable(WebMetalDrawable& drawable)
-{
-    LOG(WebMetal, "WebMetalCommandBuffer::presentDrawable()");
-    m_buffer.presentDrawable(drawable.drawable());
-}
-
-Ref<WebMetalRenderCommandEncoder> WebMetalCommandBuffer::createRenderCommandEncoderWithDescriptor(WebMetalRenderPassDescriptor& descriptor)
-{
-    return WebMetalRenderCommandEncoder::create(GPULegacyRenderCommandEncoder { m_buffer, descriptor.descriptor() });
-}
-
-Ref<WebMetalComputeCommandEncoder> WebMetalCommandBuffer::createComputeCommandEncoder()
-{
-    return WebMetalComputeCommandEncoder::create(GPULegacyComputeCommandEncoder { m_buffer });
-}
-
-DOMPromiseProxy<IDLVoid>& WebMetalCommandBuffer::completed()
-{
-    return m_completed;
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalCommandBuffer.h b/Source/WebCore/html/canvas/WebMetalCommandBuffer.h
deleted file mode 100644 (file)
index 261fdd6..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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(WEBMETAL)
-
-#include "DOMPromiseProxy.h"
-#include "GPULegacyCommandBuffer.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalComputeCommandEncoder;
-class WebMetalDrawable;
-class WebMetalRenderCommandEncoder;
-class WebMetalRenderPassDescriptor;
-
-class WebMetalCommandBuffer : public RefCounted<WebMetalCommandBuffer> {
-public:
-    ~WebMetalCommandBuffer();
-    static Ref<WebMetalCommandBuffer> create(const GPULegacyCommandQueue&);
-
-    void commit();
-    void presentDrawable(WebMetalDrawable&);
-
-    Ref<WebMetalRenderCommandEncoder> createRenderCommandEncoderWithDescriptor(WebMetalRenderPassDescriptor&);
-    Ref<WebMetalComputeCommandEncoder> createComputeCommandEncoder();
-
-    DOMPromiseProxy<IDLVoid>& completed();
-
-    const GPULegacyCommandBuffer& buffer() const { return m_buffer; }
-
-private:
-    explicit WebMetalCommandBuffer(const GPULegacyCommandQueue&);
-
-    GPULegacyCommandBuffer m_buffer;
-    DOMPromiseProxy<IDLVoid> m_completed;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalCommandBuffer.idl b/Source/WebCore/html/canvas/WebMetalCommandBuffer.idl
deleted file mode 100644 (file)
index cc1a00f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalCommandBuffer {
-    WebMetalRenderCommandEncoder createRenderCommandEncoderWithDescriptor(WebMetalRenderPassDescriptor descriptor);
-    WebMetalComputeCommandEncoder createComputeCommandEncoder();
-    void commit();
-    void presentDrawable(WebMetalDrawable drawable);
-    readonly attribute Promise<void> completed;
-};
diff --git a/Source/WebCore/html/canvas/WebMetalCommandQueue.cpp b/Source/WebCore/html/canvas/WebMetalCommandQueue.cpp
deleted file mode 100644 (file)
index da4d2c2..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalCommandQueue.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "WebMetalCommandBuffer.h"
-
-namespace WebCore {
-
-Ref<WebMetalCommandQueue> WebMetalCommandQueue::create(GPULegacyCommandQueue&& queue)
-{
-    return adoptRef(*new WebMetalCommandQueue(WTFMove(queue)));
-}
-
-WebMetalCommandQueue::WebMetalCommandQueue(GPULegacyCommandQueue&& queue)
-    : m_queue { WTFMove(queue) }
-{
-}
-
-WebMetalCommandQueue::~WebMetalCommandQueue() = default;
-
-Ref<WebMetalCommandBuffer> WebMetalCommandQueue::createCommandBuffer()
-{
-    return WebMetalCommandBuffer::create(m_queue);
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalCommandQueue.h b/Source/WebCore/html/canvas/WebMetalCommandQueue.h
deleted file mode 100644 (file)
index 5cbb872..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyCommandQueue.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalCommandBuffer;
-
-class WebMetalCommandQueue : public RefCounted<WebMetalCommandQueue> {
-public:
-    ~WebMetalCommandQueue();
-    static Ref<WebMetalCommandQueue> create(GPULegacyCommandQueue&&);
-
-    String label() const { return m_queue.label(); }
-    void setLabel(const String& label) { m_queue.setLabel(label); }
-
-    Ref<WebMetalCommandBuffer> createCommandBuffer();
-
-private:
-    explicit WebMetalCommandQueue(GPULegacyCommandQueue&&);
-
-    GPULegacyCommandQueue m_queue;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalCommandQueue.idl b/Source/WebCore/html/canvas/WebMetalCommandQueue.idl
deleted file mode 100644 (file)
index f6b307b..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalCommandQueue {
-
-    attribute DOMString label;
-
-    WebMetalCommandBuffer createCommandBuffer();
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.cpp b/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.cpp
deleted file mode 100644 (file)
index 84401dd..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalComputeCommandEncoder.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPULegacyCommandBuffer.h"
-#include "GPULegacyComputeCommandEncoder.h"
-#include "GPULegacySize.h"
-#include "WebMetalBuffer.h"
-#include "WebMetalCommandBuffer.h"
-#include "WebMetalComputePipelineState.h"
-
-namespace WebCore {
-
-static inline GPULegacySize GPULegacySizeMake(WebMetalSize size)
-{
-    return { size.width, size.height, size.depth };
-}
-
-Ref<WebMetalComputeCommandEncoder> WebMetalComputeCommandEncoder::create(GPULegacyComputeCommandEncoder&& encoder)
-{
-    return adoptRef(*new WebMetalComputeCommandEncoder(WTFMove(encoder)));
-}
-    
-WebMetalComputeCommandEncoder::WebMetalComputeCommandEncoder(GPULegacyComputeCommandEncoder&& encoder)
-    : m_encoder { WTFMove(encoder) }
-{
-}
-
-void WebMetalComputeCommandEncoder::setComputePipelineState(WebMetalComputePipelineState& pipelineState)
-{
-    m_encoder.setComputePipelineState(pipelineState.state());
-}
-
-void WebMetalComputeCommandEncoder::setBuffer(WebMetalBuffer& buffer, unsigned offset, unsigned index)
-{
-    m_encoder.setBuffer(buffer.buffer(), offset, index);
-}
-
-void WebMetalComputeCommandEncoder::dispatch(WebMetalSize threadgroupsPerGrid, WebMetalSize threadsPerThreadgroup)
-{
-    m_encoder.dispatch(GPULegacySizeMake(threadgroupsPerGrid), GPULegacySizeMake(threadsPerThreadgroup));
-}
-
-void WebMetalComputeCommandEncoder::endEncoding()
-{
-    m_encoder.endEncoding();
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.h b/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.h
deleted file mode 100644 (file)
index 6f6ad78..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyComputeCommandEncoder.h"
-#include "WebMetalSize.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalBuffer;
-class WebMetalComputePipelineState;
-
-class WebMetalComputeCommandEncoder : public RefCounted<WebMetalComputeCommandEncoder> {
-public:
-    static Ref<WebMetalComputeCommandEncoder> create(GPULegacyComputeCommandEncoder&&);
-
-    void setComputePipelineState(WebMetalComputePipelineState&);
-    void setBuffer(WebMetalBuffer&, unsigned, unsigned);
-    void dispatch(WebMetalSize, WebMetalSize);
-    void endEncoding();
-
-private:
-    explicit WebMetalComputeCommandEncoder(GPULegacyComputeCommandEncoder&&);
-
-    GPULegacyComputeCommandEncoder m_encoder;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.idl b/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.idl
deleted file mode 100644 (file)
index 205db79..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalComputeCommandEncoder {
-
-    void setComputePipelineState(WebMetalComputePipelineState pipelineState);
-    void setBuffer(WebMetalBuffer buffer, unsigned long offset, unsigned long index);
-    void dispatch(WebMetalSize threadgroupsPerGrid, WebMetalSize threadsPerThreadgroup);
-
-    void endEncoding();
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalComputePipelineState.cpp b/Source/WebCore/html/canvas/WebMetalComputePipelineState.cpp
deleted file mode 100644 (file)
index 853107f..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalComputePipelineState.h"
-
-#if ENABLE(WEBMETAL)
-
-namespace WebCore {
-
-Ref<WebMetalComputePipelineState> WebMetalComputePipelineState::create(GPULegacyComputePipelineState&& state)
-{
-    return adoptRef(*new WebMetalComputePipelineState(WTFMove(state)));
-}
-
-WebMetalComputePipelineState::WebMetalComputePipelineState(GPULegacyComputePipelineState&& state)
-    : m_state { WTFMove(state) }
-{
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalComputePipelineState.h b/Source/WebCore/html/canvas/WebMetalComputePipelineState.h
deleted file mode 100644 (file)
index f04ff5f..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyComputePipelineState.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalFunction;
-
-class WebMetalComputePipelineState : public RefCounted<WebMetalComputePipelineState> {
-public:
-    static Ref<WebMetalComputePipelineState> create(GPULegacyComputePipelineState&&);
-
-    GPULegacyComputePipelineState& state() { return m_state; }
-
-private:
-    explicit WebMetalComputePipelineState(GPULegacyComputePipelineState&&);
-
-    GPULegacyComputePipelineState m_state;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalComputePipelineState.idl b/Source/WebCore/html/canvas/WebMetalComputePipelineState.idl
deleted file mode 100644 (file)
index c311243..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalComputePipelineState {
-};
diff --git a/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.cpp b/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.cpp
deleted file mode 100644 (file)
index 5778063..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalDepthStencilDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-namespace WebCore {
-
-Ref<WebMetalDepthStencilDescriptor> WebMetalDepthStencilDescriptor::create()
-{
-    return adoptRef(*new WebMetalDepthStencilDescriptor);
-}
-
-bool WebMetalDepthStencilDescriptor::depthWriteEnabled() const
-{
-    return m_descriptor.depthWriteEnabled();
-}
-
-void WebMetalDepthStencilDescriptor::setDepthWriteEnabled(bool newDepthWriteEnabled)
-{
-    m_descriptor.setDepthWriteEnabled(newDepthWriteEnabled);
-}
-
-WebMetalCompareFunction WebMetalDepthStencilDescriptor::depthCompareFunction() const
-{
-    return m_depthCompareFunction;
-}
-
-void WebMetalDepthStencilDescriptor::setDepthCompareFunction(CompareFunction newDepthCompareFunction)
-{
-    m_depthCompareFunction = newDepthCompareFunction;
-    m_descriptor.setDepthCompareFunction(toGPULegacyCompareFunction(m_depthCompareFunction));
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.h b/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.h
deleted file mode 100644 (file)
index 809c1ea..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyDepthStencilDescriptor.h"
-#include "WebMetalEnums.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalDepthStencilDescriptor : public RefCounted<WebMetalDepthStencilDescriptor> {
-public:
-    static Ref<WebMetalDepthStencilDescriptor> create();
-
-    bool depthWriteEnabled() const;
-    void setDepthWriteEnabled(bool);
-
-    using CompareFunction = WebMetalCompareFunction;
-    CompareFunction depthCompareFunction() const;
-    void setDepthCompareFunction(CompareFunction);
-
-    GPULegacyDepthStencilDescriptor& descriptor() { return m_descriptor; }
-
-private:
-    WebMetalDepthStencilDescriptor() = default;
-
-    // FIXME: The default value of "Always" is defined both here and in the
-    // GPUDepthStencilDescriptor class's implementation. Might be better to not
-    // store the compare function separately here, translate it instead, and then
-    // there would be no need for a default value here.
-
-    WebMetalCompareFunction m_depthCompareFunction { WebMetalCompareFunction::Always };
-    GPULegacyDepthStencilDescriptor m_descriptor;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.idl b/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.idl
deleted file mode 100644 (file)
index 09ad945..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalCompareFunction {
-    "never",
-    "less",
-    "equal",
-    "lessequal",
-    "greater",
-    "notequal",
-    "greaterequal",
-    "always"
-};
-
-[
-    Constructor,
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalDepthStencilDescriptor {
-
-    attribute WebMetalCompareFunction depthCompareFunction;
-    attribute boolean depthWriteEnabled;
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalDepthStencilState.cpp b/Source/WebCore/html/canvas/WebMetalDepthStencilState.cpp
deleted file mode 100644 (file)
index 0a7c7d2..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalDepthStencilState.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "WebMetalDepthStencilDescriptor.h"
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-Ref<WebMetalDepthStencilState> WebMetalDepthStencilState::create(GPULegacyDepthStencilState&& state)
-{
-    return adoptRef(*new WebMetalDepthStencilState(WTFMove(state)));
-}
-
-WebMetalDepthStencilState::WebMetalDepthStencilState(GPULegacyDepthStencilState&& state)
-    : m_state { WTFMove(state) }
-{
-}
-
-String WebMetalDepthStencilState::label() const
-{
-    return m_state.label();
-}
-
-void WebMetalDepthStencilState::setLabel(const String& label)
-{
-    m_state.setLabel(label);
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalDepthStencilState.h b/Source/WebCore/html/canvas/WebMetalDepthStencilState.h
deleted file mode 100644 (file)
index 1c96f29..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyDepthStencilState.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalDepthStencilState : public RefCounted<WebMetalDepthStencilState> {
-public:
-    static Ref<WebMetalDepthStencilState> create(GPULegacyDepthStencilState&&);
-
-    String label() const;
-    void setLabel(const String&);
-
-    GPULegacyDepthStencilState& state() { return m_state; }
-
-private:
-    explicit WebMetalDepthStencilState(GPULegacyDepthStencilState&&);
-
-    GPULegacyDepthStencilState m_state;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalDepthStencilState.idl b/Source/WebCore/html/canvas/WebMetalDepthStencilState.idl
deleted file mode 100644 (file)
index 0082b42..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalDepthStencilState {
-
-    attribute DOMString label;
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalDrawable.cpp b/Source/WebCore/html/canvas/WebMetalDrawable.cpp
deleted file mode 100644 (file)
index 5ed2e9e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalDrawable.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPULegacyTexture.h"
-#include "WebMetalTexture.h"
-
-namespace WebCore {
-
-Ref<WebMetalDrawable> WebMetalDrawable::create(GPULegacyDrawable&& drawable)
-{
-    return adoptRef(*new WebMetalDrawable(WTFMove(drawable)));
-}
-
-WebMetalDrawable::WebMetalDrawable(GPULegacyDrawable&& drawable)
-    : m_drawable { WTFMove(drawable) }
-    , m_texture { WebMetalTexture::create(GPULegacyTexture { m_drawable }) }
-{
-}
-
-WebMetalDrawable::~WebMetalDrawable() = default;
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalDrawable.h b/Source/WebCore/html/canvas/WebMetalDrawable.h
deleted file mode 100644 (file)
index 649b29f..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyDrawable.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalTexture;
-
-class WebMetalDrawable : public RefCounted<WebMetalDrawable> {
-public:
-    ~WebMetalDrawable();
-    static Ref<WebMetalDrawable> create(GPULegacyDrawable&&);
-
-    GPULegacyDrawable& drawable() { return m_drawable; }
-    WebMetalTexture& texture() { return m_texture.get(); }
-
-private:
-    explicit WebMetalDrawable(GPULegacyDrawable&&);
-
-    GPULegacyDrawable m_drawable;
-    Ref<WebMetalTexture> m_texture;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalDrawable.idl b/Source/WebCore/html/canvas/WebMetalDrawable.idl
deleted file mode 100644 (file)
index a76d691..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalDrawable {
-
-    readonly attribute WebMetalTexture texture; // FIXME: Only the framebuffer should have this.
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalEnums.cpp b/Source/WebCore/html/canvas/WebMetalEnums.cpp
deleted file mode 100644 (file)
index 00089f1..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalEnums.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPULegacyEnums.h"
-#include <wtf/Optional.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-Optional<WebMetalCompareFunction> toWebMetalCompareFunction(const String& name)
-{
-    if (equalLettersIgnoringASCIICase(name, "never"))
-        return WebMetalCompareFunction::Never;
-    if (equalLettersIgnoringASCIICase(name, "less"))
-        return WebMetalCompareFunction::Less;
-    if (equalLettersIgnoringASCIICase(name, "equal"))
-        return WebMetalCompareFunction::Equal;
-    if (equalLettersIgnoringASCIICase(name, "lessequal"))
-        return WebMetalCompareFunction::Lessequal;
-    if (equalLettersIgnoringASCIICase(name, "greater"))
-        return WebMetalCompareFunction::Greater;
-    if (equalLettersIgnoringASCIICase(name, "notequal"))
-        return WebMetalCompareFunction::Notequal;
-    if (equalLettersIgnoringASCIICase(name, "greaterequal"))
-        return WebMetalCompareFunction::Greaterequal;
-    if (equalLettersIgnoringASCIICase(name, "always"))
-        return WebMetalCompareFunction::Always;
-
-    ASSERT_NOT_REACHED();
-    return WTF::nullopt;
-}
-
-String web3DCompareFunctionName(WebMetalCompareFunction value)
-{
-    if (value == WebMetalCompareFunction::Never)
-        return "never"_s;
-    if (value == WebMetalCompareFunction::Less)
-        return "less"_s;
-    if (value == WebMetalCompareFunction::Equal)
-        return "equal"_s;
-    if (value == WebMetalCompareFunction::Lessequal)
-        return "lessequal"_s;
-    if (value == WebMetalCompareFunction::Greater)
-        return "greater"_s;
-    if (value == WebMetalCompareFunction::Notequal)
-        return "notequal"_s;
-    if (value == WebMetalCompareFunction::Greaterequal)
-        return "greaterequal"_s;
-    if (value == WebMetalCompareFunction::Always)
-        return "always"_s;
-    
-    ASSERT_NOT_REACHED();
-    return emptyString();
-}
-
-GPULegacyCompareFunction toGPULegacyCompareFunction(const WebMetalCompareFunction value)
-{
-    if (value == WebMetalCompareFunction::Never)
-        return GPULegacyCompareFunction::Never;
-    if (value == WebMetalCompareFunction::Less)
-        return GPULegacyCompareFunction::Less;
-    if (value == WebMetalCompareFunction::Equal)
-        return GPULegacyCompareFunction::Equal;
-    if (value == WebMetalCompareFunction::Lessequal)
-        return GPULegacyCompareFunction::LessEqual;
-    if (value == WebMetalCompareFunction::Greater)
-        return GPULegacyCompareFunction::Greater;
-    if (value == WebMetalCompareFunction::Notequal)
-        return GPULegacyCompareFunction::NotEqual;
-    if (value == WebMetalCompareFunction::Greaterequal)
-        return GPULegacyCompareFunction::GreaterEqual;
-    if (value == WebMetalCompareFunction::Always)
-        return GPULegacyCompareFunction::Always;
-    
-    ASSERT_NOT_REACHED();
-    return GPULegacyCompareFunction::Never;
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalEnums.h b/Source/WebCore/html/canvas/WebMetalEnums.h
deleted file mode 100644 (file)
index ed34e9a..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-enum class GPULegacyCompareFunction;
-
-enum class WebMetalCompareFunction {
-    Never,
-    Less,
-    Equal,
-    Lessequal,
-    Greater,
-    Notequal,
-    Greaterequal,
-    Always
-};
-
-Optional<WebMetalCompareFunction> toWebMetalCompareFunction(const String&);
-String web3DCompareFunctionName(WebMetalCompareFunction);
-GPULegacyCompareFunction toGPULegacyCompareFunction(WebMetalCompareFunction);
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalEnums.idl b/Source/WebCore/html/canvas/WebMetalEnums.idl
deleted file mode 100644 (file)
index 55ea451..0000000
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalPixelFormat {
-    "BGRA8Unorm"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalLoadAction {
-    "dontcare",
-    "load",
-    "clear"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalStoreAction {
-    "dontcare",
-    "store",
-    "multisampleresolve"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalPrimitiveType {
-    "point",
-    "line",
-    "linestrip",
-    "triangle",
-    "trianglestrip"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalFunctionType {
-    "fragment",
-    "vertex"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalStencilOperation {
-    "keep",
-    "zero",
-    "replace",
-    "incrementclamp",
-    "decrementclamp",
-    "invert",
-    "incrementwrap",
-    "decrementwrap"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalStatus {
-    "notenqueued",
-    "enqueued",
-    "committed",
-    "scheduled",
-    "completed",
-    "error"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalSamplerAddressMode {
-    "clamptoedge",
-    "mirrorclamptoedge",
-    "repeat",
-    "mirrorrepeat",
-    "clamptozero"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalSamplerMinMagFilter {
-    "nearest",
-    "linear"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalSamplerMipFilter {
-    "notmipmapped",
-    "nearest",
-    "linear"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalCullMode {
-    "none",
-    "front",
-    "back"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalIndexType {
-    "uint16",
-    "uint32"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalVisibilityResultMode {
-    "disabled",
-    "boolean",
-    "counting"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalWinding {
-    "clockwise",
-    "counterclockwise"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalDepthClipMode {
-    "clip",
-    "clamp"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalTriangleFillMode {
-    "fill",
-    "lines"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalCPUCacheMode {
-    "defaultcache",
-    "writecombined"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalStorageMode {
-    "shared",
-    "managed",
-    "private"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalResourceOptions {
-    "cpucachemodedefaultcache",
-    "cpucachemodewritecombined",
-    "storagemodeshared",
-    "storagemodemanaged",
-    "storagemodeprivate",
-    "optioncpucachemodedefaultcache",
-    "optioncpucachemodewritecombined"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalTextureUsage {
-    "unknown",
-    "shaderread",
-    "shaderwrite",
-    "rendertarget",
-    "pixelformatview"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalBlendOperation {
-    "add",
-    "subtract",
-    "reversesubtract",
-    "min",
-    "max"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalBlendFactor {
-    "zero",
-    "one",
-    "sourcecolor",
-    "oneminussourcecolor",
-    "sourcealpha",
-    "oneminussourcealpha",
-    "destinationcolor",
-    "oneminusdestinationcolor",
-    "destinationalpha",
-    "oneminusdestinationalpha",
-    "sourcealphasaturated",
-    "blendcolor",
-    "oneminusblendcolor",
-    "blendalpha",
-    "oneminusblendalpha"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalColorWriteMask {
-    "none",
-    "red",
-    "green",
-    "blue",
-    "alpha",
-    "all"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalMultisampleDepthResolveFilter {
-    "sample0",
-    "min",
-    "max"
-};
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] enum WebMetalFeatureSet {
-    "level1",
-    "level2"
-};
diff --git a/Source/WebCore/html/canvas/WebMetalFunction.cpp b/Source/WebCore/html/canvas/WebMetalFunction.cpp
deleted file mode 100644 (file)
index 60727c9..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalFunction.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "WebMetalLibrary.h"
-
-namespace WebCore {
-
-Ref<WebMetalFunction> WebMetalFunction::create(GPULegacyFunction&& function)
-{
-    return adoptRef(*new WebMetalFunction(WTFMove(function)));
-}
-
-WebMetalFunction::WebMetalFunction(GPULegacyFunction&& function)
-    : m_function { WTFMove(function) }
-{
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalFunction.h b/Source/WebCore/html/canvas/WebMetalFunction.h
deleted file mode 100644 (file)
index 70245dc..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyFunction.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class WebMetalFunction : public RefCounted<WebMetalFunction> {
-public:
-    static Ref<WebMetalFunction> create(GPULegacyFunction&&);
-
-    String name() const { return m_function.name(); }
-    const GPULegacyFunction& function() const { return m_function; }
-
-private:
-    explicit WebMetalFunction(GPULegacyFunction&&);
-
-    GPULegacyFunction m_function;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalFunction.idl b/Source/WebCore/html/canvas/WebMetalFunction.idl
deleted file mode 100644 (file)
index 7bca589..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalFunction {
-
-    readonly attribute DOMString name;
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalLibrary.cpp b/Source/WebCore/html/canvas/WebMetalLibrary.cpp
deleted file mode 100644 (file)
index 3672344..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalLibrary.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "WebMetalFunction.h"
-
-namespace WebCore {
-
-Ref<WebMetalLibrary> WebMetalLibrary::create(GPULegacyLibrary&& library, const String& sourceCode)
-{
-    return adoptRef(*new WebMetalLibrary(WTFMove(library), sourceCode));
-}
-
-WebMetalLibrary::WebMetalLibrary(GPULegacyLibrary&& library, const String& sourceCode)
-    : m_sourceCode { sourceCode }
-    , m_library { WTFMove(library) }
-{
-}
-
-Vector<String> WebMetalLibrary::functionNames() const
-{
-    return m_library.functionNames();
-}
-
-RefPtr<WebMetalFunction> WebMetalLibrary::functionWithName(const String& name) const
-{
-    GPULegacyFunction function { m_library, name };
-    if (!function)
-        return nullptr;
-    return WebMetalFunction::create(WTFMove(function));
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalLibrary.h b/Source/WebCore/html/canvas/WebMetalLibrary.h
deleted file mode 100644 (file)
index 9876c20..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyLibrary.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalFunction;
-
-class WebMetalLibrary : public RefCounted<WebMetalLibrary> {
-public:
-    static Ref<WebMetalLibrary> create(GPULegacyLibrary&&, const String& sourceCode);
-
-    const String& sourceCode() const { return m_sourceCode; }
-
-    String label() const { return m_library.label(); }
-    void setLabel(const String& label) { m_library.setLabel(label); }
-
-    Vector<String> functionNames() const;
-
-    RefPtr<WebMetalFunction> functionWithName(const String&) const;
-
-private:
-    WebMetalLibrary(GPULegacyLibrary&&, const String& sourceCode);
-
-    String m_sourceCode;
-    GPULegacyLibrary m_library;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalLibrary.idl b/Source/WebCore/html/canvas/WebMetalLibrary.idl
deleted file mode 100644 (file)
index f1d302b..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalLibrary {
-
-    readonly attribute DOMString sourceCode;
-    attribute DOMString label;
-    readonly attribute sequence<DOMString> functionNames;
-
-    WebMetalFunction? functionWithName(DOMString name);
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.cpp b/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.cpp
deleted file mode 100644 (file)
index cc681a9..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderCommandEncoder.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPULegacyCommandBuffer.h"
-#include "GPULegacyRenderPassDescriptor.h"
-#include "WebMetalBuffer.h"
-#include "WebMetalCommandBuffer.h"
-#include "WebMetalDepthStencilState.h"
-#include "WebMetalRenderPassDescriptor.h"
-#include "WebMetalRenderPipelineState.h"
-
-namespace WebCore {
-
-Ref<WebMetalRenderCommandEncoder> WebMetalRenderCommandEncoder::create(GPULegacyRenderCommandEncoder&& encoder)
-{
-    return adoptRef(*new WebMetalRenderCommandEncoder(WTFMove(encoder)));
-}
-
-WebMetalRenderCommandEncoder::WebMetalRenderCommandEncoder(GPULegacyRenderCommandEncoder&& encoder)
-    : m_encoder { WTFMove(encoder) }
-{
-}
-
-WebMetalRenderCommandEncoder::~WebMetalRenderCommandEncoder() = default;
-
-void WebMetalRenderCommandEncoder::setRenderPipelineState(WebMetalRenderPipelineState& pipelineState)
-{
-    m_encoder.setRenderPipelineState(pipelineState.state());
-}
-
-void WebMetalRenderCommandEncoder::setDepthStencilState(WebMetalDepthStencilState& depthStencilState)
-{
-    m_encoder.setDepthStencilState(depthStencilState.state());
-}
-
-void WebMetalRenderCommandEncoder::setVertexBuffer(WebMetalBuffer& buffer, unsigned offset, unsigned index)
-{
-    m_encoder.setVertexBuffer(buffer.buffer(), offset, index);
-}
-
-void WebMetalRenderCommandEncoder::setFragmentBuffer(WebMetalBuffer& buffer, unsigned offset, unsigned index)
-{
-    m_encoder.setFragmentBuffer(buffer.buffer(), offset, index);
-}
-
-void WebMetalRenderCommandEncoder::drawPrimitives(unsigned type, unsigned start, unsigned count)
-{
-    m_encoder.drawPrimitives(type, start, count);
-}
-
-void WebMetalRenderCommandEncoder::endEncoding()
-{
-    return m_encoder.endEncoding();
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.h b/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.h
deleted file mode 100644 (file)
index cbe66fc..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyRenderCommandEncoder.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalBuffer;
-class WebMetalDepthStencilState;
-class WebMetalRenderPipelineState;
-
-class WebMetalRenderCommandEncoder : public RefCounted<WebMetalRenderCommandEncoder> {
-public:
-    ~WebMetalRenderCommandEncoder();
-    static Ref<WebMetalRenderCommandEncoder> create(GPULegacyRenderCommandEncoder&&);
-
-    void setRenderPipelineState(WebMetalRenderPipelineState&);
-    void setDepthStencilState(WebMetalDepthStencilState&);
-    void setVertexBuffer(WebMetalBuffer&, unsigned offset, unsigned index);
-    void setFragmentBuffer(WebMetalBuffer&, unsigned offset, unsigned index);
-    void drawPrimitives(unsigned type, unsigned start, unsigned count);
-    void endEncoding();
-
-    GPULegacyRenderCommandEncoder& encoder() { return m_encoder; }
-
-private:
-    explicit WebMetalRenderCommandEncoder(GPULegacyRenderCommandEncoder&&);
-
-    GPULegacyRenderCommandEncoder m_encoder;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.idl b/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.idl
deleted file mode 100644 (file)
index bfb3b98..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalRenderCommandEncoder {
-
-    void setRenderPipelineState(WebMetalRenderPipelineState pipelineState);
-    void setDepthStencilState(WebMetalDepthStencilState depthStencilState);
-    void setVertexBuffer(WebMetalBuffer buffer, unsigned long offset, unsigned long index);
-    void setFragmentBuffer(WebMetalBuffer buffer, unsigned long offset, unsigned long index);
-    void drawPrimitives(unsigned long type, unsigned long start, unsigned long count);
-
-    void endEncoding();
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp b/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp
deleted file mode 100644 (file)
index 3eee745..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderPassAttachmentDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPULegacyRenderPassAttachmentDescriptor.h"
-#include "GPULegacyTexture.h"
-#include "WebMetalTexture.h"
-
-namespace WebCore {
-
-WebMetalRenderPassAttachmentDescriptor::WebMetalRenderPassAttachmentDescriptor()
-{
-}
-
-WebMetalRenderPassAttachmentDescriptor::~WebMetalRenderPassAttachmentDescriptor() = default;
-
-unsigned WebMetalRenderPassAttachmentDescriptor::loadAction() const
-{
-    return descriptor().loadAction();
-}
-
-void WebMetalRenderPassAttachmentDescriptor::setLoadAction(unsigned newLoadAction)
-{
-    descriptor().setLoadAction(newLoadAction);
-}
-
-unsigned WebMetalRenderPassAttachmentDescriptor::storeAction() const
-{
-    return descriptor().storeAction();
-}
-
-void WebMetalRenderPassAttachmentDescriptor::setStoreAction(unsigned newStoreAction)
-{
-    descriptor().setStoreAction(newStoreAction);
-}
-
-WebMetalTexture* WebMetalRenderPassAttachmentDescriptor::texture() const
-{
-    return m_texture.get();
-}
-
-void WebMetalRenderPassAttachmentDescriptor::setTexture(RefPtr<WebMetalTexture>&& newTexture)
-{
-    // FIXME: Why can't we set this to null?
-    if (!newTexture)
-        return;
-    
-    m_texture = WTFMove(newTexture);
-
-    descriptor().setTexture(m_texture->texture());
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.h b/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.h
deleted file mode 100644 (file)
index 3959002..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class GPULegacyRenderPassAttachmentDescriptor;
-class WebMetalTexture;
-
-class WebMetalRenderPassAttachmentDescriptor : public RefCounted<WebMetalRenderPassAttachmentDescriptor> {
-public:
-    virtual ~WebMetalRenderPassAttachmentDescriptor();
-
-    unsigned loadAction() const;
-    void setLoadAction(unsigned);
-
-    unsigned storeAction() const;
-    void setStoreAction(unsigned);
-
-    WebMetalTexture* texture() const;
-    void setTexture(RefPtr<WebMetalTexture>&&);
-
-    virtual bool isColorAttachmentDescriptor() const = 0;
-
-protected:
-    WebMetalRenderPassAttachmentDescriptor();
-
-private:
-    virtual const GPULegacyRenderPassAttachmentDescriptor& descriptor() const = 0;
-
-    RefPtr<WebMetalTexture> m_texture;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.idl b/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.idl
deleted file mode 100644 (file)
index a914085..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    CustomToJSObject
-]
-interface WebMetalRenderPassAttachmentDescriptor {
-
-    attribute WebMetalTexture? texture;
-
-    attribute unsigned long loadAction; // should be WebMetalLoadAction
-    attribute unsigned long storeAction; // should be WebMetalStoreAction
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp b/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp
deleted file mode 100644 (file)
index ace43dd..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderPassColorAttachmentDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPULegacyTexture.h"
-#include "WebMetalTexture.h"
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-Ref<WebMetalRenderPassColorAttachmentDescriptor> WebMetalRenderPassColorAttachmentDescriptor::create(GPULegacyRenderPassColorAttachmentDescriptor&& descriptor)
-{
-    return adoptRef(*new WebMetalRenderPassColorAttachmentDescriptor(WTFMove(descriptor)));
-}
-
-WebMetalRenderPassColorAttachmentDescriptor::WebMetalRenderPassColorAttachmentDescriptor(GPULegacyRenderPassColorAttachmentDescriptor&& descriptor)
-    : m_descriptor { WTFMove(descriptor) }
-{
-}
-
-WebMetalRenderPassColorAttachmentDescriptor::~WebMetalRenderPassColorAttachmentDescriptor() = default;
-
-const GPULegacyRenderPassAttachmentDescriptor& WebMetalRenderPassColorAttachmentDescriptor::descriptor() const
-{
-    return m_descriptor;
-}
-
-Vector<float> WebMetalRenderPassColorAttachmentDescriptor::clearColor() const
-{
-    return m_descriptor.clearColor();
-}
-
-void WebMetalRenderPassColorAttachmentDescriptor::setClearColor(const Vector<float>& newClearColor)
-{
-    m_descriptor.setClearColor(newClearColor);
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h b/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h
deleted file mode 100644 (file)
index e5f8baa..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyRenderPassColorAttachmentDescriptor.h"
-#include "WebMetalRenderPassAttachmentDescriptor.h"
-
-namespace WebCore {
-
-class WebMetalRenderPassColorAttachmentDescriptor final : public WebMetalRenderPassAttachmentDescriptor {
-public:
-    virtual ~WebMetalRenderPassColorAttachmentDescriptor();
-    static Ref<WebMetalRenderPassColorAttachmentDescriptor> create(GPULegacyRenderPassColorAttachmentDescriptor&&);
-
-    Vector<float> clearColor() const;
-    void setClearColor(const Vector<float>&);
-
-private:
-    explicit WebMetalRenderPassColorAttachmentDescriptor(GPULegacyRenderPassColorAttachmentDescriptor&&);
-
-    const GPULegacyRenderPassAttachmentDescriptor& descriptor() const final;
-    bool isColorAttachmentDescriptor() const final { return true; }
-
-    GPULegacyRenderPassColorAttachmentDescriptor m_descriptor;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl b/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl
deleted file mode 100644 (file)
index e784a14..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] interface WebMetalRenderPassColorAttachmentDescriptor : WebMetalRenderPassAttachmentDescriptor {
-
-    attribute sequence<float> clearColor;
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp b/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp
deleted file mode 100644 (file)
index 09b2b8e..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderPassDepthAttachmentDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "WebMetalTexture.h"
-
-namespace WebCore {
-
-Ref<WebMetalRenderPassDepthAttachmentDescriptor> WebMetalRenderPassDepthAttachmentDescriptor::create(GPULegacyRenderPassDepthAttachmentDescriptor&& descriptor)
-{
-    return adoptRef(*new WebMetalRenderPassDepthAttachmentDescriptor(WTFMove(descriptor)));
-}
-
-WebMetalRenderPassDepthAttachmentDescriptor::WebMetalRenderPassDepthAttachmentDescriptor(GPULegacyRenderPassDepthAttachmentDescriptor&& descriptor)
-    : m_descriptor { WTFMove(descriptor) }
-{
-}
-
-WebMetalRenderPassDepthAttachmentDescriptor::~WebMetalRenderPassDepthAttachmentDescriptor() = default;
-
-double WebMetalRenderPassDepthAttachmentDescriptor::clearDepth() const
-{
-    return m_descriptor.clearDepth();
-}
-
-void WebMetalRenderPassDepthAttachmentDescriptor::setClearDepth(double newClearDepth)
-{
-    m_descriptor.setClearDepth(newClearDepth);
-}
-
-const GPULegacyRenderPassAttachmentDescriptor& WebMetalRenderPassDepthAttachmentDescriptor::descriptor() const
-{
-    return m_descriptor;
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h b/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h
deleted file mode 100644 (file)
index 2175816..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyRenderPassDepthAttachmentDescriptor.h"
-#include "WebMetalRenderPassAttachmentDescriptor.h"
-
-namespace WebCore {
-
-class WebMetalRenderPassDepthAttachmentDescriptor final : public WebMetalRenderPassAttachmentDescriptor {
-public:
-    virtual ~WebMetalRenderPassDepthAttachmentDescriptor();
-    static Ref<WebMetalRenderPassDepthAttachmentDescriptor> create(GPULegacyRenderPassDepthAttachmentDescriptor&&);
-
-    double clearDepth() const;
-    void setClearDepth(double);
-
-private:
-    explicit WebMetalRenderPassDepthAttachmentDescriptor(GPULegacyRenderPassDepthAttachmentDescriptor&&);
-
-    const GPULegacyRenderPassAttachmentDescriptor& descriptor() const final;
-    bool isColorAttachmentDescriptor() const final { return false; }
-
-    GPULegacyRenderPassDepthAttachmentDescriptor m_descriptor;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl b/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl
deleted file mode 100644 (file)
index f55b094..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] interface WebMetalRenderPassDepthAttachmentDescriptor : WebMetalRenderPassAttachmentDescriptor {
-
-    attribute unrestricted double clearDepth;
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.cpp b/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.cpp
deleted file mode 100644 (file)
index cfda38b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderPassDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-namespace WebCore {
-
-Ref<WebMetalRenderPassDescriptor> WebMetalRenderPassDescriptor::create()
-{
-    return adoptRef(*new WebMetalRenderPassDescriptor);
-}
-
-WebMetalRenderPassDescriptor::WebMetalRenderPassDescriptor() = default;
-
-WebMetalRenderPassDescriptor::~WebMetalRenderPassDescriptor() = default;
-
-WebMetalRenderPassDepthAttachmentDescriptor& WebMetalRenderPassDescriptor::depthAttachment()
-{
-    if (!m_depthAttachment)
-        m_depthAttachment = WebMetalRenderPassDepthAttachmentDescriptor::create(m_descriptor.depthAttachment());
-    return *m_depthAttachment;
-}
-
-const Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>>& WebMetalRenderPassDescriptor::colorAttachments()
-{
-    if (m_colorAttachments.isEmpty()) {
-        auto attachments = m_descriptor.colorAttachments();
-        ASSERT(!attachments.isEmpty());
-        m_colorAttachments.reserveInitialCapacity(attachments.size());
-        for (auto& attachment : attachments)
-            m_colorAttachments.uncheckedAppend(WebMetalRenderPassColorAttachmentDescriptor::create(WTFMove(attachment)));
-    }
-    return m_colorAttachments;
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.h b/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.h
deleted file mode 100644 (file)
index bba494e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyRenderPassDescriptor.h"
-#include "WebMetalRenderPassColorAttachmentDescriptor.h"
-#include "WebMetalRenderPassDepthAttachmentDescriptor.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-class WebMetalRenderPassDescriptor : public RefCounted<WebMetalRenderPassDescriptor> {
-public:
-    ~WebMetalRenderPassDescriptor();
-    static Ref<WebMetalRenderPassDescriptor> create();
-
-    WebMetalRenderPassDepthAttachmentDescriptor& depthAttachment();
-    const Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>>& colorAttachments();
-
-    const GPULegacyRenderPassDescriptor& descriptor() const { return m_descriptor; }
-
-private:
-    WebMetalRenderPassDescriptor();
-
-    Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>> m_colorAttachments;
-    RefPtr<WebMetalRenderPassDepthAttachmentDescriptor> m_depthAttachment;
-
-    GPULegacyRenderPassDescriptor m_descriptor;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.idl b/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.idl
deleted file mode 100644 (file)
index 2f3feec..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Constructor,
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalRenderPassDescriptor {
-
-    readonly attribute sequence<WebMetalRenderPassColorAttachmentDescriptor> colorAttachments;
-    readonly attribute WebMetalRenderPassDepthAttachmentDescriptor depthAttachment;
-    //readonly attribute WebMetalRenderPassStencilAttachmentDescriptor stencilAttachment;
-
-    // renderTargetArrayLength
-    // visibilityResultBuffer
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp b/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp
deleted file mode 100644 (file)
index 0e534c0..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-namespace WebCore {
-
-Ref<WebMetalRenderPipelineColorAttachmentDescriptor> WebMetalRenderPipelineColorAttachmentDescriptor::create(GPULegacyRenderPipelineColorAttachmentDescriptor&& descriptor)
-{
-    return adoptRef(*new WebMetalRenderPipelineColorAttachmentDescriptor(WTFMove(descriptor)));
-}
-
-WebMetalRenderPipelineColorAttachmentDescriptor::WebMetalRenderPipelineColorAttachmentDescriptor(GPULegacyRenderPipelineColorAttachmentDescriptor&& descriptor)
-    : m_descriptor { WTFMove(descriptor) }
-{
-}
-
-unsigned WebMetalRenderPipelineColorAttachmentDescriptor::pixelFormat() const
-{
-    return m_descriptor.pixelFormat();
-}
-
-void WebMetalRenderPipelineColorAttachmentDescriptor::setPixelFormat(unsigned newPixelFormat)
-{
-    m_descriptor.setPixelFormat(newPixelFormat);
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h b/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h
deleted file mode 100644 (file)
index fb85581..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalRenderPipelineColorAttachmentDescriptor : public RefCounted<WebMetalRenderPipelineColorAttachmentDescriptor> {
-public:
-    static Ref<WebMetalRenderPipelineColorAttachmentDescriptor> create(GPULegacyRenderPipelineColorAttachmentDescriptor&&);
-
-    unsigned pixelFormat() const;
-    void setPixelFormat(unsigned);
-
-private:
-    explicit WebMetalRenderPipelineColorAttachmentDescriptor(GPULegacyRenderPipelineColorAttachmentDescriptor&&);
-
-    GPULegacyRenderPipelineColorAttachmentDescriptor m_descriptor;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl b/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl
deleted file mode 100644 (file)
index 698cd5a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalRenderPipelineColorAttachmentDescriptor {
-
-    attribute unsigned long pixelFormat; // should be MTLPixelFormat
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.cpp b/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.cpp
deleted file mode 100644 (file)
index 541d711..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderPipelineDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPULegacyFunction.h"
-#include "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
-#include "WebMetalFunction.h"
-#include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
-
-namespace WebCore {
-
-Ref<WebMetalRenderPipelineDescriptor> WebMetalRenderPipelineDescriptor::create()
-{
-    return adoptRef(*new WebMetalRenderPipelineDescriptor);
-}
-
-WebMetalRenderPipelineDescriptor::WebMetalRenderPipelineDescriptor() = default;
-
-WebMetalRenderPipelineDescriptor::~WebMetalRenderPipelineDescriptor() = default;
-
-WebMetalFunction* WebMetalRenderPipelineDescriptor::vertexFunction() const
-{
-    return m_vertexFunction.get();
-}
-
-void WebMetalRenderPipelineDescriptor::setVertexFunction(RefPtr<WebMetalFunction>&& newVertexFunction)
-{
-    // FIXME: Why can't we set this to null?
-    if (!newVertexFunction)
-        return;
-
-    m_vertexFunction = WTFMove(newVertexFunction);
-
-    m_descriptor.setVertexFunction(m_vertexFunction->function());
-}
-
-WebMetalFunction* WebMetalRenderPipelineDescriptor::fragmentFunction() const
-{
-    return m_fragmentFunction.get();
-}
-
-void WebMetalRenderPipelineDescriptor::setFragmentFunction(RefPtr<WebMetalFunction>&& newFragmentFunction)
-{
-    // FIXME: Why can't we set this to null?
-    if (!newFragmentFunction)
-        return;
-
-    m_fragmentFunction = WTFMove(newFragmentFunction);
-
-    m_descriptor.setFragmentFunction(m_fragmentFunction->function());
-}
-
-const Vector<RefPtr<WebMetalRenderPipelineColorAttachmentDescriptor>>& WebMetalRenderPipelineDescriptor::colorAttachments()
-{
-    if (!m_colorAttachments.size()) {
-        auto attachments = m_descriptor.colorAttachments();
-        m_colorAttachments.reserveInitialCapacity(attachments.size());
-        for (auto& attachment : attachments)
-            m_colorAttachments.uncheckedAppend(WebMetalRenderPipelineColorAttachmentDescriptor::create(WTFMove(attachment)));
-    }
-    return m_colorAttachments;
-}
-
-unsigned WebMetalRenderPipelineDescriptor::depthAttachmentPixelFormat() const
-{
-    return m_descriptor.depthAttachmentPixelFormat();
-}
-
-void WebMetalRenderPipelineDescriptor::setDepthAttachmentPixelFormat(unsigned newPixelFormat)
-{
-    m_descriptor.setDepthAttachmentPixelFormat(newPixelFormat);
-}
-
-void WebMetalRenderPipelineDescriptor::reset()
-{
-    m_vertexFunction = nullptr;
-    m_fragmentFunction = nullptr;
-
-    // FIXME: Why doesn't this clear out the functions on m_descriptor?
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.h b/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.h
deleted file mode 100644 (file)
index 9d70185..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyRenderPipelineDescriptor.h"
-#include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-class GPULegacyFunction;
-class GPULegacyRenderPipelineDescriptor;
-class WebMetalFunction;
-class WebMetalRenderPipelineColorAttachmentDescriptor;
-
-class WebMetalRenderPipelineDescriptor : public RefCounted<WebMetalRenderPipelineDescriptor> {
-public:
-    ~WebMetalRenderPipelineDescriptor();
-    static Ref<WebMetalRenderPipelineDescriptor> create();
-
-    WebMetalFunction* vertexFunction() const;
-    void setVertexFunction(RefPtr<WebMetalFunction>&&);
-
-    WebMetalFunction* fragmentFunction() const;
-    void setFragmentFunction(RefPtr<WebMetalFunction>&&);
-
-    const Vector<RefPtr<WebMetalRenderPipelineColorAttachmentDescriptor>>& colorAttachments();
-
-    unsigned depthAttachmentPixelFormat() const;
-    void setDepthAttachmentPixelFormat(unsigned);
-
-    void reset();
-
-    const GPULegacyRenderPipelineDescriptor& descriptor() { return m_descriptor; }
-
-private:
-    WebMetalRenderPipelineDescriptor();
-
-    RefPtr<WebMetalFunction> m_vertexFunction;
-    RefPtr<WebMetalFunction> m_fragmentFunction;
-
-    Vector<RefPtr<WebMetalRenderPipelineColorAttachmentDescriptor>> m_colorAttachments;
-
-    GPULegacyRenderPipelineDescriptor m_descriptor;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.idl b/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.idl
deleted file mode 100644 (file)
index 256d1be..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Constructor,
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalRenderPipelineDescriptor {
-
-    attribute WebMetalFunction? vertexFunction;
-    attribute WebMetalFunction? fragmentFunction;
-
-    readonly attribute sequence<WebMetalRenderPipelineColorAttachmentDescriptor> colorAttachments;
-
-    attribute unsigned long depthAttachmentPixelFormat;
-
-    void reset();
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineState.cpp b/Source/WebCore/html/canvas/WebMetalRenderPipelineState.cpp
deleted file mode 100644 (file)
index dd0f057..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderPipelineState.h"
-
-#if ENABLE(WEBMETAL)
-
-namespace WebCore {
-
-Ref<WebMetalRenderPipelineState> WebMetalRenderPipelineState::create(GPULegacyRenderPipelineState&& state)
-{
-    return adoptRef(*new WebMetalRenderPipelineState(WTFMove(state)));
-}
-
-WebMetalRenderPipelineState::WebMetalRenderPipelineState(GPULegacyRenderPipelineState&& state)
-    : m_state { WTFMove(state) }
-{
-}
-
-String WebMetalRenderPipelineState::label() const
-{
-    return m_state.label();
-}
-
-void WebMetalRenderPipelineState::setLabel(const String& label)
-{
-    m_state.setLabel(label);
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineState.h b/Source/WebCore/html/canvas/WebMetalRenderPipelineState.h
deleted file mode 100644 (file)
index b17fd3b..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyRenderPipelineState.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalRenderPipelineState : public RefCounted<WebMetalRenderPipelineState> {
-public:
-    static Ref<WebMetalRenderPipelineState> create(GPULegacyRenderPipelineState&&);
-
-    String label() const;
-    void setLabel(const String&);
-
-    const GPULegacyRenderPipelineState& state() const { return m_state; }
-
-private:
-    explicit WebMetalRenderPipelineState(GPULegacyRenderPipelineState&&);
-
-    GPULegacyRenderPipelineState m_state;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderPipelineState.idl b/Source/WebCore/html/canvas/WebMetalRenderPipelineState.idl
deleted file mode 100644 (file)
index 0c1e8ac..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalRenderPipelineState {
-
-    attribute DOMString label;
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalRenderingContext.cpp b/Source/WebCore/html/canvas/WebMetalRenderingContext.cpp
deleted file mode 100644 (file)
index 90413ea..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalRenderingContext.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "Document.h"
-#include "FrameView.h"
-#include "GPULegacyDevice.h"
-#include "InspectorInstrumentation.h"
-#include "WebMetalBuffer.h"
-#include "WebMetalCommandQueue.h"
-#include "WebMetalComputePipelineState.h"
-#include "WebMetalDepthStencilDescriptor.h"
-#include "WebMetalDepthStencilState.h"
-#include "WebMetalDrawable.h"
-#include "WebMetalFunction.h"
-#include "WebMetalLibrary.h"
-#include "WebMetalRenderPassDescriptor.h"
-#include "WebMetalRenderPipelineDescriptor.h"
-#include "WebMetalRenderPipelineState.h"
-#include "WebMetalTexture.h"
-#include "WebMetalTextureDescriptor.h"
-#include <JavaScriptCore/ArrayBuffer.h>
-#include <JavaScriptCore/JSCInlines.h>
-#include <JavaScriptCore/TypedArrayInlines.h>
-#include <JavaScriptCore/Uint32Array.h>
-#include <wtf/StdLibExtras.h>
-#include <wtf/text/CString.h>
-
-namespace {
-
-int clamp(int value, int min, int max)
-{
-    if (value < min)
-        value = min;
-    if (value > max)
-        value = max;
-    return value;
-}
-
-}
-
-namespace WebCore {
-
-static const int kMaxTextureSize = 4096;
-
-std::unique_ptr<WebMetalRenderingContext> WebMetalRenderingContext::create(CanvasBase& canvas)
-{
-    GPULegacyDevice device;
-
-    if (!device) {
-        // FIXME: WebMetal - dispatch an event here for the failure.
-        return nullptr;
-    }
-
-    auto renderingContext = std::unique_ptr<WebMetalRenderingContext>(new WebMetalRenderingContext(canvas, WTFMove(device)));
-    renderingContext->suspendIfNeeded();
-
-    InspectorInstrumentation::didCreateCanvasRenderingContext(*renderingContext);
-
-    return renderingContext;
-}
-
-WebMetalRenderingContext::WebMetalRenderingContext(CanvasBase& canvas, GPULegacyDevice&& device)
-    : GPUBasedCanvasRenderingContext(canvas)
-    , m_device(WTFMove(device))
-{
-    initializeNewContext();
-}
-
-HTMLCanvasElement* WebMetalRenderingContext::canvas() const
-{
-    auto& base = canvasBase();
-    if (!is<HTMLCanvasElement>(base))
-        return nullptr;
-    return &downcast<HTMLCanvasElement>(base);
-}
-
-void WebMetalRenderingContext::initializeNewContext()
-{
-    // FIXME: WebMetal - Maybe we should reset a bunch of stuff here.
-
-    IntSize canvasSize = clampedCanvasSize();
-    m_device.reshape(canvasSize.width(), canvasSize.height());
-}
-
-IntSize WebMetalRenderingContext::clampedCanvasSize() const
-{
-    return IntSize(clamp(canvas()->width(), 1, kMaxTextureSize),
-        clamp(canvas()->height(), 1, kMaxTextureSize));
-}
-
-bool WebMetalRenderingContext::hasPendingActivity() const
-{
-    return false;
-}
-
-void WebMetalRenderingContext::stop()
-{
-}
-
-const char* WebMetalRenderingContext::activeDOMObjectName() const
-{
-    return "WebMetalRenderingContext";
-}
-
-bool WebMetalRenderingContext::canSuspendForDocumentSuspension() const
-{
-    return false;
-}
-
-PlatformLayer* WebMetalRenderingContext::platformLayer() const
-{
-    return m_device.platformLayer();
-}
-
-void WebMetalRenderingContext::markLayerComposited()
-{
-    m_device.markLayerComposited();
-}
-
-void WebMetalRenderingContext::reshape(int width, int height)
-{
-    // FIXME: WebMetal - Do we need to reset stuff here?
-    m_device.reshape(width, height);
-}
-
-Ref<WebMetalLibrary> WebMetalRenderingContext::createLibrary(const String& sourceCode)
-{
-    return WebMetalLibrary::create(GPULegacyLibrary { m_device, sourceCode }, sourceCode);
-}
-
-Ref<WebMetalRenderPipelineState> WebMetalRenderingContext::createRenderPipelineState(WebMetalRenderPipelineDescriptor& descriptor)
-{
-    return WebMetalRenderPipelineState::create(GPULegacyRenderPipelineState { m_device, descriptor.descriptor() });
-}
-
-Ref<WebMetalDepthStencilState> WebMetalRenderingContext::createDepthStencilState(WebMetalDepthStencilDescriptor& descriptor)
-{
-    return WebMetalDepthStencilState::create(GPULegacyDepthStencilState { m_device, descriptor.descriptor() });
-}
-
-Ref<WebMetalComputePipelineState> WebMetalRenderingContext::createComputePipelineState(WebMetalFunction& function)
-{
-    return WebMetalComputePipelineState::create(GPULegacyComputePipelineState { m_device, function.function() });
-}
-
-Ref<WebMetalCommandQueue> WebMetalRenderingContext::createCommandQueue()
-{
-    return WebMetalCommandQueue::create(GPULegacyCommandQueue { m_device });
-}
-
-Ref<WebMetalDrawable> WebMetalRenderingContext::nextDrawable()
-{
-    return WebMetalDrawable::create(GPULegacyDrawable { m_device });
-}
-
-RefPtr<WebMetalBuffer> WebMetalRenderingContext::createBuffer(JSC::ArrayBufferView& data)
-{
-    return WebMetalBuffer::create(GPULegacyBuffer { m_device, data });
-}
-
-Ref<WebMetalTexture> WebMetalRenderingContext::createTexture(WebMetalTextureDescriptor& descriptor)
-{
-    return WebMetalTexture::create(GPULegacyTexture { m_device, descriptor.descriptor() });
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderingContext.h b/Source/WebCore/html/canvas/WebMetalRenderingContext.h
deleted file mode 100644 (file)
index 50ccd46..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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(WEBMETAL)
-
-#include "GPUBasedCanvasRenderingContext.h"
-#include "GPULegacyDevice.h"
-
-namespace JSC {
-class ArrayBufferView;
-}
-
-namespace WebCore {
-
-class WebMetalBuffer;
-class WebMetalCommandQueue;
-class WebMetalComputePipelineState;
-class WebMetalDepthStencilDescriptor;
-class WebMetalDepthStencilState;
-class WebMetalDrawable;
-class WebMetalFunction;
-class WebMetalLibrary;
-class WebMetalRenderPipelineDescriptor;
-class WebMetalRenderPipelineState;
-class WebMetalTexture;
-class WebMetalTextureDescriptor;
-
-class WebMetalRenderingContext final : public GPUBasedCanvasRenderingContext {
-public:
-    static std::unique_ptr<WebMetalRenderingContext> create(CanvasBase&);
-
-    // FIXME: IDL file says this is not nullable, but this function can return null.
-    HTMLCanvasElement* canvas() const;
-
-    Ref<WebMetalLibrary> createLibrary(const String&);
-    Ref<WebMetalRenderPipelineState> createRenderPipelineState(WebMetalRenderPipelineDescriptor&);
-    Ref<WebMetalDepthStencilState> createDepthStencilState(WebMetalDepthStencilDescriptor&);
-    Ref<WebMetalComputePipelineState> createComputePipelineState(WebMetalFunction&);
-    Ref<WebMetalCommandQueue> createCommandQueue();
-    Ref<WebMetalDrawable> nextDrawable();
-    RefPtr<WebMetalBuffer> createBuffer(JSC::ArrayBufferView&);
-    Ref<WebMetalTexture> createTexture(WebMetalTextureDescriptor&);
-
-    const GPULegacyDevice& device() const { return m_device; }
-
-private:
-    WebMetalRenderingContext(CanvasBase&, GPULegacyDevice&&);
-
-    bool hasPendingActivity() const final;
-    void stop() final;
-    const char* activeDOMObjectName() const final;
-    bool canSuspendForDocumentSuspension() const final;
-
-    IntSize clampedCanvasSize() const;
-    void initializeNewContext();
-
-    bool isWebMetal() const final { return true; }
-
-    void reshape(int width, int height) final;
-    void markLayerComposited() final;
-    PlatformLayer* platformLayer() const final;
-
-    GPULegacyDevice m_device;
-};
-
-} // namespace WebCore
-
-SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(WebCore::WebMetalRenderingContext, isWebMetal())
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalRenderingContext.idl b/Source/WebCore/html/canvas/WebMetalRenderingContext.idl
deleted file mode 100644 (file)
index 66b8b09..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    JSCustomMarkFunction,
-    DoNotCheckConstants
-] interface WebMetalRenderingContext {
-    // back-reference to the canvas
-    readonly attribute HTMLCanvasElement canvas;
-
-    // Pixel formats
-
-    const unsigned int PixelFormatBGRA8Unorm = 80;
-    const unsigned int PixelFormatDepth32Float = 252;
-    const unsigned int PixelFormatStencil8 = 253;
-    const unsigned int PixelFormatInvalid = 0;
-
-    // Load actions
-
-    const unsigned int LoadActionDontCare = 0;
-    const unsigned int LoadActionLoad = 1;
-    const unsigned int LoadActionClear = 2;
-
-    // Store actions
-
-    const unsigned int StoreActionDontCare = 0;
-    const unsigned int StoreActionStore = 1;
-    const unsigned int StoreActionMultisampleResolve = 2;
-
-    // Primitive types
-
-    const unsigned int PrimitiveTypePoint = 0;
-    const unsigned int PrimitiveTypeLine = 1;
-    const unsigned int PrimitiveTypeLineStrip = 2;
-    const unsigned int PrimitiveTypeTriangle = 3;
-    const unsigned int PrimitiveTypeTriangleStrip = 4;
-
-    // Comparison functions
-
-    const unsigned int CompareFunctionNever = 0;
-    const unsigned int CompareFunctionLess = 1;
-    const unsigned int CompareFunctionEqual = 2;
-    const unsigned int CompareFunctionLessEqual = 3;
-    const unsigned int CompareFunctionGreater = 4;
-    const unsigned int CompareFunctionNotEqual = 5;
-    const unsigned int CompareFunctionGreaterEqual = 6;
-    const unsigned int CompareFunctionAlways = 7;
-
-    // Texture Types
-
-    const unsigned int TextureType1D = 0;
-    const unsigned int TextureType1DArray = 1;
-    const unsigned int TextureType2D = 2;
-    const unsigned int TextureType2DArray = 3;
-    const unsigned int TextureType2DMultisample = 4;
-    const unsigned int TextureTypeCube = 5;
-    const unsigned int TextureTypeCubeArray = 6;
-    const unsigned int TextureType3D = 7;
-
-    // Storage modes
-
-    const unsigned int StorageModeShared  = 0;
-    const unsigned int StorageModeManaged = 1;
-    const unsigned int StorageModePrivate = 2;
-
-    // Usage
-
-    const unsigned int TextureUsageUnknown = 0x0000;
-    const unsigned int TextureUsageShaderRead = 0x0001;
-    const unsigned int TextureUsageShaderWrite = 0x0002;
-    const unsigned int TextureUsageRenderTarget = 0x0004;
-    const unsigned int TextureUsagePixelFormatView = 0x0010;
-
-    // Entry points
-
-    WebMetalLibrary createLibrary(DOMString sourceCode);
-
-    WebMetalRenderPipelineState createRenderPipelineState(WebMetalRenderPipelineDescriptor descriptor);
-    WebMetalDepthStencilState createDepthStencilState(WebMetalDepthStencilDescriptor descriptor);
-    WebMetalComputePipelineState createComputePipelineState(WebMetalFunction function);
-
-    WebMetalCommandQueue createCommandQueue();
-
-    WebMetalDrawable nextDrawable();
-
-    WebMetalBuffer? createBuffer(ArrayBufferView data);
-
-    WebMetalTexture createTexture(WebMetalTextureDescriptor descriptor);
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalSize.h b/Source/WebCore/html/canvas/WebMetalSize.h
deleted file mode 100644 (file)
index 4e425ad..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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(WEBMETAL)
-
-namespace WebCore {
-    
-struct WebMetalSize {
-    unsigned width;
-    unsigned height;
-    unsigned depth;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalSize.idl b/Source/WebCore/html/canvas/WebMetalSize.idl
deleted file mode 100644 (file)
index fae8c7d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
- *
- * 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. ``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
- * 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.
- */
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal
-] dictionary WebMetalSize {
-    unsigned long width;
-    unsigned long height;
-    unsigned long depth;
-};
diff --git a/Source/WebCore/html/canvas/WebMetalTexture.cpp b/Source/WebCore/html/canvas/WebMetalTexture.cpp
deleted file mode 100644 (file)
index e709998..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalTexture.h"
-
-#if ENABLE(WEBMETAL)
-
-namespace WebCore {
-
-Ref<WebMetalTexture> WebMetalTexture::create(GPULegacyTexture&& texture)
-{
-    return adoptRef(*new WebMetalTexture(WTFMove(texture)));
-}
-
-WebMetalTexture::WebMetalTexture(GPULegacyTexture&& texture)
-    : m_texture { WTFMove(texture) }
-{
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalTexture.h b/Source/WebCore/html/canvas/WebMetalTexture.h
deleted file mode 100644 (file)
index 30b7f6c..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyTexture.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class GPULegacyTextureDescriptor;
-
-class WebMetalTexture : public RefCounted<WebMetalTexture> {
-public:
-    static Ref<WebMetalTexture> create(GPULegacyTexture&&);
-
-    unsigned width() const { return m_texture.width(); }
-    unsigned height() const { return m_texture.height(); }
-
-    const GPULegacyTexture& texture() const { return m_texture; }
-
-private:
-    explicit WebMetalTexture(GPULegacyTexture&&);
-
-    GPULegacyTexture m_texture;
-};
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalTexture.idl b/Source/WebCore/html/canvas/WebMetalTexture.idl
deleted file mode 100644 (file)
index 79cf4d5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalTexture {
-
-    readonly attribute unsigned long width;
-    readonly attribute unsigned long height;
-
-};
diff --git a/Source/WebCore/html/canvas/WebMetalTextureDescriptor.cpp b/Source/WebCore/html/canvas/WebMetalTextureDescriptor.cpp
deleted file mode 100644 (file)
index 6207bde..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "WebMetalTextureDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-namespace WebCore {
-
-Ref<WebMetalTextureDescriptor> WebMetalTextureDescriptor::create(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
-{
-    return adoptRef(*new WebMetalTextureDescriptor(pixelFormat, width, height, mipmapped));
-}
-
-WebMetalTextureDescriptor::WebMetalTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
-    : m_descriptor { pixelFormat, width, height, mipmapped }
-{
-}
-
-unsigned WebMetalTextureDescriptor::width() const
-{
-    return m_descriptor.width();
-}
-
-void WebMetalTextureDescriptor::setWidth(unsigned width)
-{
-    m_descriptor.setWidth(width);
-}
-
-unsigned WebMetalTextureDescriptor::height() const
-{
-    return m_descriptor.height();
-}
-
-void WebMetalTextureDescriptor::setHeight(unsigned height)
-{
-    m_descriptor.setHeight(height);
-}
-
-unsigned WebMetalTextureDescriptor::sampleCount() const
-{
-    return m_descriptor.sampleCount();
-}
-
-void WebMetalTextureDescriptor::setSampleCount(unsigned sampleCount)
-{
-    m_descriptor.setSampleCount(sampleCount);
-}
-
-unsigned WebMetalTextureDescriptor::textureType() const
-{
-    return m_descriptor.textureType();
-}
-
-void WebMetalTextureDescriptor::setTextureType(unsigned textureType)
-{
-    m_descriptor.setTextureType(textureType);
-}
-
-unsigned WebMetalTextureDescriptor::storageMode() const
-{
-    return m_descriptor.storageMode();
-}
-
-void WebMetalTextureDescriptor::setStorageMode(unsigned storageMode)
-{
-    m_descriptor.setStorageMode(storageMode);
-}
-
-unsigned WebMetalTextureDescriptor::usage() const
-{
-    return m_descriptor.usage();
-}
-
-void WebMetalTextureDescriptor::setUsage(unsigned usage)
-{
-    m_descriptor.setUsage(usage);
-}
-    
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalTextureDescriptor.h b/Source/WebCore/html/canvas/WebMetalTextureDescriptor.h
deleted file mode 100644 (file)
index c8328da..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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(WEBMETAL)
-
-#include "GPULegacyTextureDescriptor.h"
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class WebMetalTextureDescriptor : public RefCounted<WebMetalTextureDescriptor> {
-public:
-    static Ref<WebMetalTextureDescriptor> create(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
-
-    unsigned width() const;
-    void setWidth(unsigned);
-
-    unsigned height() const;
-    void setHeight(unsigned);
-
-    unsigned sampleCount() const;
-    void setSampleCount(unsigned);
-
-    unsigned textureType() const;
-    void setTextureType(unsigned);
-
-    unsigned storageMode() const;
-    void setStorageMode(unsigned);
-
-    unsigned usage() const;
-    void setUsage(unsigned);
-
-    const GPULegacyTextureDescriptor& descriptor() { return m_descriptor; }
-
-private:
-    WebMetalTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
-
-    GPULegacyTextureDescriptor m_descriptor;
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/html/canvas/WebMetalTextureDescriptor.idl b/Source/WebCore/html/canvas/WebMetalTextureDescriptor.idl
deleted file mode 100644 (file)
index 1a5f7f1..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2017 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. ``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
- * 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.
- */
-
-[
-    Constructor(unsigned long pixelFormat, unsigned long width, unsigned long height, boolean mipmapped),
-    Conditional=WEBMETAL,
-    EnabledAtRuntime=WebMetal,
-    ImplementationLacksVTable
-] interface WebMetalTextureDescriptor {
-
-    attribute unsigned long textureType;
-
-    attribute unsigned long width;
-    attribute unsigned long height;
-    attribute unsigned long sampleCount;
-
-    attribute unsigned long storageMode;
-
-    attribute unsigned long usage;
-
-};