⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 236954 in webkit


Ignore:
Timestamp:
Oct 8, 2018, 6:37:30 PM (8 years ago)
Author:
Justin Fan
Message:

WebGPU: Rename old WebGPU prototype to WebMetal
​https://bugs.webkit.org/show_bug.cgi?id=190325
.:

Reviewed by Dean Jackson.

  • Source/cmake/WebKitFeatures.cmake:

Source/JavaScriptCore:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.

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

Source/WebCore:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Existing WebGPU tests also renamed to reflect WebGPU -> WebMetal change.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.

  • CMakeLists.txt:
  • Configurations/FeatureDefines.xcconfig:
  • DerivedSources.make:
  • Sources.txt:
  • SourcesCocoa.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp: Renamed from Source/WebCore/bindings/js/JSWebGPURenderPassAttachmentDescriptorCustom.cpp.

(WebCore::toJSNewlyCreated):
(WebCore::toJS):

  • bindings/js/JSWebMetalRenderingContextCustom.cpp: Renamed from Source/WebCore/bindings/js/JSWebGPURenderingContextCustom.cpp.

(WebCore::JSWebMetalRenderingContext::visitAdditionalChildren):

  • 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):
(WebCore::HTMLCanvasElement::createContextWebMetal):
(WebCore::HTMLCanvasElement::getContextWebMetal):
(WebCore::HTMLCanvasElement::isWebGPUType): Deleted.
(WebCore::HTMLCanvasElement::createContextWebGPU): Deleted.
(WebCore::HTMLCanvasElement::getContextWebGPU): Deleted.

  • html/HTMLCanvasElement.h:
  • html/HTMLCanvasElement.idl:
  • html/canvas/CanvasRenderingContext.h:

(WebCore::CanvasRenderingContext::isWebMetal const):
(WebCore::CanvasRenderingContext::isWebGPU const): Deleted.

  • html/canvas/WebGPURenderingContext.cpp: Removed.
  • html/canvas/WebMetalBuffer.cpp: Renamed from Source/WebCore/html/canvas/WebGPUBuffer.cpp.

(WebCore::WebMetalBuffer::create):
(WebCore::WebMetalBuffer::WebMetalBuffer):

  • html/canvas/WebMetalBuffer.h: Renamed from Source/WebCore/html/canvas/WebGPUBuffer.h.
  • html/canvas/WebMetalBuffer.idl: Renamed from Source/WebCore/html/canvas/WebGPUBuffer.idl.
  • html/canvas/WebMetalCommandBuffer.cpp: Renamed from Source/WebCore/html/canvas/WebGPUCommandBuffer.cpp.

(WebCore::WebMetalCommandBuffer::create):
(WebCore::WebMetalCommandBuffer::WebMetalCommandBuffer):
(WebCore::WebMetalCommandBuffer::~WebMetalCommandBuffer):
(WebCore::WebMetalCommandBuffer::commit):
(WebCore::WebMetalCommandBuffer::presentDrawable):
(WebCore::WebMetalCommandBuffer::createRenderCommandEncoderWithDescriptor):
(WebCore::WebMetalCommandBuffer::createComputeCommandEncoder):
(WebCore::WebMetalCommandBuffer::completed):

  • html/canvas/WebMetalCommandBuffer.h: Renamed from Source/WebCore/html/canvas/WebGPUCommandBuffer.h.
  • html/canvas/WebMetalCommandBuffer.idl: Renamed from Source/WebCore/html/canvas/WebGPUCommandBuffer.idl.
  • html/canvas/WebMetalCommandQueue.cpp: Renamed from Source/WebCore/html/canvas/WebGPUCommandQueue.cpp.

(WebCore::WebMetalCommandQueue::create):
(WebCore::WebMetalCommandQueue::WebMetalCommandQueue):
(WebCore::WebMetalCommandQueue::createCommandBuffer):

  • html/canvas/WebMetalCommandQueue.h: Renamed from Source/WebCore/html/canvas/WebGPUCommandQueue.h.
  • html/canvas/WebMetalCommandQueue.idl: Renamed from Source/WebCore/html/canvas/WebGPUCommandQueue.idl.
  • html/canvas/WebMetalComputeCommandEncoder.cpp: Renamed from Source/WebCore/html/canvas/WebGPUComputeCommandEncoder.cpp.

(WebCore::GPUSizeMake):
(WebCore::WebMetalComputeCommandEncoder::create):
(WebCore::WebMetalComputeCommandEncoder::WebMetalComputeCommandEncoder):
(WebCore::WebMetalComputeCommandEncoder::setComputePipelineState):
(WebCore::WebMetalComputeCommandEncoder::setBuffer):
(WebCore::WebMetalComputeCommandEncoder::dispatch):
(WebCore::WebMetalComputeCommandEncoder::endEncoding):

  • html/canvas/WebMetalComputeCommandEncoder.h: Renamed from Source/WebCore/html/canvas/WebGPUComputeCommandEncoder.h.
  • html/canvas/WebMetalComputeCommandEncoder.idl: Renamed from Source/WebCore/html/canvas/WebGPUComputeCommandEncoder.idl.
  • html/canvas/WebMetalComputePipelineState.cpp: Renamed from Source/WebCore/html/canvas/WebGPUComputePipelineState.cpp.

(WebCore::WebMetalComputePipelineState::create):
(WebCore::WebMetalComputePipelineState::WebMetalComputePipelineState):

  • html/canvas/WebMetalComputePipelineState.h: Renamed from Source/WebCore/html/canvas/WebGPUComputePipelineState.h.
  • html/canvas/WebMetalComputePipelineState.idl: Renamed from Source/WebCore/html/canvas/WebGPUComputePipelineState.idl.
  • html/canvas/WebMetalDepthStencilDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.cpp.

(WebCore::WebMetalDepthStencilDescriptor::create):
(WebCore::WebMetalDepthStencilDescriptor::depthWriteEnabled const):
(WebCore::WebMetalDepthStencilDescriptor::setDepthWriteEnabled):
(WebCore::WebMetalDepthStencilDescriptor::depthCompareFunction const):
(WebCore::WebMetalDepthStencilDescriptor::setDepthCompareFunction):

  • html/canvas/WebMetalDepthStencilDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.h.
  • html/canvas/WebMetalDepthStencilDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.idl.
  • html/canvas/WebMetalDepthStencilState.cpp: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilState.cpp.

(WebCore::WebMetalDepthStencilState::create):
(WebCore::WebMetalDepthStencilState::WebMetalDepthStencilState):
(WebCore::WebMetalDepthStencilState::label const):
(WebCore::WebMetalDepthStencilState::setLabel):

  • html/canvas/WebMetalDepthStencilState.h: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilState.h.
  • html/canvas/WebMetalDepthStencilState.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineState.idl.
  • html/canvas/WebMetalDrawable.cpp: Renamed from Source/WebCore/html/canvas/WebGPUDrawable.cpp.

(WebCore::WebMetalDrawable::create):
(WebCore::WebMetalDrawable::WebMetalDrawable):

  • html/canvas/WebMetalDrawable.h: Renamed from Source/WebCore/html/canvas/WebGPUDrawable.h.

(WebCore::WebMetalDrawable::texture):

  • html/canvas/WebMetalDrawable.idl: Renamed from Source/WebCore/html/canvas/WebGPUDrawable.idl.
  • html/canvas/WebMetalEnums.cpp: Renamed from Source/WebCore/html/canvas/WebGPUEnums.cpp.

(WebCore::toWebMetalCompareFunction):
(WebCore::web3DCompareFunctionName):
(WebCore::toGPUCompareFunction):

  • html/canvas/WebMetalEnums.h: Renamed from Source/WebCore/html/canvas/WebGPUEnums.h.
  • html/canvas/WebMetalEnums.idl: Renamed from Source/WebCore/html/canvas/WebGPUEnums.idl.
  • html/canvas/WebMetalFunction.cpp: Renamed from Source/WebCore/html/canvas/WebGPUFunction.cpp.

(WebCore::WebMetalFunction::create):
(WebCore::WebMetalFunction::WebMetalFunction):

  • html/canvas/WebMetalFunction.h: Renamed from Source/WebCore/html/canvas/WebGPUFunction.h.
  • html/canvas/WebMetalFunction.idl: Renamed from Source/WebCore/html/canvas/WebGPUFunction.idl.
  • html/canvas/WebMetalLibrary.cpp: Renamed from Source/WebCore/html/canvas/WebGPULibrary.cpp.

(WebCore::WebMetalLibrary::create):
(WebCore::WebMetalLibrary::WebMetalLibrary):
(WebCore::WebMetalLibrary::functionNames const):
(WebCore::WebMetalLibrary::functionWithName const):

  • html/canvas/WebMetalLibrary.h: Renamed from Source/WebCore/html/canvas/WebGPULibrary.h.
  • html/canvas/WebMetalLibrary.idl: Renamed from Source/WebCore/html/canvas/WebGPULibrary.idl.
  • html/canvas/WebMetalRenderCommandEncoder.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderCommandEncoder.cpp.

(WebCore::WebMetalRenderCommandEncoder::create):
(WebCore::WebMetalRenderCommandEncoder::WebMetalRenderCommandEncoder):
(WebCore::WebMetalRenderCommandEncoder::setRenderPipelineState):
(WebCore::WebMetalRenderCommandEncoder::setDepthStencilState):
(WebCore::WebMetalRenderCommandEncoder::setVertexBuffer):
(WebCore::WebMetalRenderCommandEncoder::setFragmentBuffer):
(WebCore::WebMetalRenderCommandEncoder::drawPrimitives):
(WebCore::WebMetalRenderCommandEncoder::endEncoding):

  • html/canvas/WebMetalRenderCommandEncoder.h: Renamed from Source/WebCore/html/canvas/WebGPURenderCommandEncoder.h.
  • html/canvas/WebMetalRenderCommandEncoder.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderCommandEncoder.idl.
  • html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.cpp.

(WebCore::WebMetalRenderPassAttachmentDescriptor::WebMetalRenderPassAttachmentDescriptor):
(WebCore::WebMetalRenderPassAttachmentDescriptor::loadAction const):
(WebCore::WebMetalRenderPassAttachmentDescriptor::setLoadAction):
(WebCore::WebMetalRenderPassAttachmentDescriptor::storeAction const):
(WebCore::WebMetalRenderPassAttachmentDescriptor::setStoreAction):
(WebCore::WebMetalRenderPassAttachmentDescriptor::texture const):
(WebCore::WebMetalRenderPassAttachmentDescriptor::setTexture):

  • html/canvas/WebMetalRenderPassAttachmentDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.h.
  • html/canvas/WebMetalRenderPassAttachmentDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.idl.
  • html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp.

(WebCore::WebMetalRenderPassColorAttachmentDescriptor::create):
(WebCore::WebMetalRenderPassColorAttachmentDescriptor::WebMetalRenderPassColorAttachmentDescriptor):
(WebCore::WebMetalRenderPassColorAttachmentDescriptor::descriptor const):
(WebCore::WebMetalRenderPassColorAttachmentDescriptor::clearColor const):
(WebCore::WebMetalRenderPassColorAttachmentDescriptor::setClearColor):

  • html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.h.
  • html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.idl.
  • html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp.

(WebCore::WebMetalRenderPassDepthAttachmentDescriptor::create):
(WebCore::WebMetalRenderPassDepthAttachmentDescriptor::WebMetalRenderPassDepthAttachmentDescriptor):
(WebCore::WebMetalRenderPassDepthAttachmentDescriptor::clearDepth const):
(WebCore::WebMetalRenderPassDepthAttachmentDescriptor::setClearDepth):
(WebCore::WebMetalRenderPassDepthAttachmentDescriptor::descriptor const):

  • html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h.
  • html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.idl.
  • html/canvas/WebMetalRenderPassDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDescriptor.cpp.

(WebCore::WebMetalRenderPassDescriptor::create):
(WebCore::WebMetalRenderPassDescriptor::depthAttachment):
(WebCore::WebMetalRenderPassDescriptor::colorAttachments):

  • html/canvas/WebMetalRenderPassDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDescriptor.h.
  • html/canvas/WebMetalRenderPassDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDescriptor.idl.
  • html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp.

(WebCore::WebMetalRenderPipelineColorAttachmentDescriptor::create):
(WebCore::WebMetalRenderPipelineColorAttachmentDescriptor::WebMetalRenderPipelineColorAttachmentDescriptor):
(WebCore::WebMetalRenderPipelineColorAttachmentDescriptor::pixelFormat const):
(WebCore::WebMetalRenderPipelineColorAttachmentDescriptor::setPixelFormat):

  • html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h.
  • html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.idl.
  • html/canvas/WebMetalRenderPipelineDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.cpp.

(WebCore::WebMetalRenderPipelineDescriptor::create):
(WebCore::WebMetalRenderPipelineDescriptor::vertexFunction const):
(WebCore::WebMetalRenderPipelineDescriptor::setVertexFunction):
(WebCore::WebMetalRenderPipelineDescriptor::fragmentFunction const):
(WebCore::WebMetalRenderPipelineDescriptor::setFragmentFunction):
(WebCore::WebMetalRenderPipelineDescriptor::colorAttachments):
(WebCore::WebMetalRenderPipelineDescriptor::depthAttachmentPixelFormat const):
(WebCore::WebMetalRenderPipelineDescriptor::setDepthAttachmentPixelFormat):
(WebCore::WebMetalRenderPipelineDescriptor::reset):

  • html/canvas/WebMetalRenderPipelineDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.h.
  • html/canvas/WebMetalRenderPipelineDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.idl.
  • html/canvas/WebMetalRenderPipelineState.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineState.cpp.

(WebCore::WebMetalRenderPipelineState::create):
(WebCore::WebMetalRenderPipelineState::WebMetalRenderPipelineState):
(WebCore::WebMetalRenderPipelineState::label const):
(WebCore::WebMetalRenderPipelineState::setLabel):

  • html/canvas/WebMetalRenderPipelineState.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineState.h.
  • html/canvas/WebMetalRenderPipelineState.idl: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilState.idl.
  • html/canvas/WebMetalRenderingContext.cpp: Added.

(WebCore::WebMetalRenderingContext::create):
(WebCore::WebMetalRenderingContext::WebMetalRenderingContext):
(WebCore::WebMetalRenderingContext::canvas const):
(WebCore::WebMetalRenderingContext::initializeNewContext):
(WebCore::WebMetalRenderingContext::clampedCanvasSize const):
(WebCore::WebMetalRenderingContext::hasPendingActivity const):
(WebCore::WebMetalRenderingContext::stop):
(WebCore::WebMetalRenderingContext::activeDOMObjectName const):
(WebCore::WebMetalRenderingContext::canSuspendForDocumentSuspension const):
(WebCore::WebMetalRenderingContext::platformLayer const):
(WebCore::WebMetalRenderingContext::markLayerComposited):
(WebCore::WebMetalRenderingContext::reshape):
(WebCore::WebMetalRenderingContext::createLibrary):
(WebCore::WebMetalRenderingContext::createRenderPipelineState):
(WebCore::WebMetalRenderingContext::createDepthStencilState):
(WebCore::WebMetalRenderingContext::createComputePipelineState):
(WebCore::WebMetalRenderingContext::createCommandQueue):
(WebCore::WebMetalRenderingContext::nextDrawable):
(WebCore::WebMetalRenderingContext::createBuffer):
(WebCore::WebMetalRenderingContext::createTexture):

  • html/canvas/WebMetalRenderingContext.h: Renamed from Source/WebCore/html/canvas/WebGPURenderingContext.h.
  • html/canvas/WebMetalRenderingContext.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderingContext.idl.
  • html/canvas/WebMetalSize.h: Renamed from Source/WebCore/html/canvas/WebGPUSize.h.
  • html/canvas/WebMetalSize.idl: Renamed from Source/WebCore/html/canvas/WebGPUSize.idl.
  • html/canvas/WebMetalTexture.cpp: Renamed from Source/WebCore/html/canvas/WebGPUTexture.cpp.

(WebCore::WebMetalTexture::create):
(WebCore::WebMetalTexture::WebMetalTexture):

  • html/canvas/WebMetalTexture.h: Renamed from Source/WebCore/html/canvas/WebGPUTexture.h.
  • html/canvas/WebMetalTexture.idl: Renamed from Source/WebCore/html/canvas/WebGPUTexture.idl.
  • html/canvas/WebMetalTextureDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPUTextureDescriptor.cpp.

(WebCore::WebMetalTextureDescriptor::create):
(WebCore::WebMetalTextureDescriptor::WebMetalTextureDescriptor):
(WebCore::WebMetalTextureDescriptor::width const):
(WebCore::WebMetalTextureDescriptor::setWidth):
(WebCore::WebMetalTextureDescriptor::height const):
(WebCore::WebMetalTextureDescriptor::setHeight):
(WebCore::WebMetalTextureDescriptor::sampleCount const):
(WebCore::WebMetalTextureDescriptor::setSampleCount):
(WebCore::WebMetalTextureDescriptor::textureType const):
(WebCore::WebMetalTextureDescriptor::setTextureType):
(WebCore::WebMetalTextureDescriptor::storageMode const):
(WebCore::WebMetalTextureDescriptor::setStorageMode):
(WebCore::WebMetalTextureDescriptor::usage const):
(WebCore::WebMetalTextureDescriptor::setUsage):

  • html/canvas/WebMetalTextureDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPUTextureDescriptor.h.
  • html/canvas/WebMetalTextureDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPUTextureDescriptor.idl.
  • inspector/InspectorCanvas.cpp:

(WebCore::InspectorCanvas::buildObjectForCanvas):

  • inspector/agents/InspectorCanvasAgent.cpp:

(WebCore::InspectorCanvasAgent::requestContent):
(WebCore::contextAsScriptValue):

  • page/RuntimeEnabledFeatures.h:

(WebCore::RuntimeEnabledFeatures::setWebMetalEnabled):
(WebCore::RuntimeEnabledFeatures::webMetalEnabled const):
(WebCore::RuntimeEnabledFeatures::setWebGPUEnabled): Deleted.
(WebCore::RuntimeEnabledFeatures::webGPUEnabled const): Deleted.

  • platform/Logging.h:
  • platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:

(WebCore::PlatformCALayerCocoa::layerTypeForPlatformLayer):
(WebCore::PlatformCALayerCocoa::PlatformCALayerCocoa):

  • platform/graphics/cocoa/WebMetalLayer.h: Renamed from Source/WebCore/platform/graphics/cocoa/WebGPULayer.h.
  • platform/graphics/cocoa/WebMetalLayer.mm: Renamed from Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm.

(-[WebMetalLayer initWithGPUDevice:]):

  • platform/graphics/gpu/GPUBuffer.cpp:

(WebCore::GPUBuffer::~GPUBuffer):

  • platform/graphics/gpu/GPUBuffer.h:
  • platform/graphics/gpu/GPUCommandBuffer.cpp:

(WebCore::GPUCommandBuffer::~GPUCommandBuffer):

  • platform/graphics/gpu/GPUCommandBuffer.h:
  • platform/graphics/gpu/GPUCommandQueue.cpp:

(WebCore::GPUCommandQueue::~GPUCommandQueue):

  • platform/graphics/gpu/GPUCommandQueue.h:
  • platform/graphics/gpu/GPUComputeCommandEncoder.cpp:

(WebCore::GPUComputeCommandEncoder::~GPUComputeCommandEncoder):

  • platform/graphics/gpu/GPUComputeCommandEncoder.h:
  • platform/graphics/gpu/GPUComputePipelineState.cpp:

(WebCore::GPUComputePipelineState::~GPUComputePipelineState):

  • platform/graphics/gpu/GPUComputePipelineState.h:
  • platform/graphics/gpu/GPUDepthStencilDescriptor.cpp:

(WebCore::GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor):

  • platform/graphics/gpu/GPUDepthStencilDescriptor.h:
  • platform/graphics/gpu/GPUDepthStencilState.cpp:

(WebCore::GPUDepthStencilState::~GPUDepthStencilState):

  • platform/graphics/gpu/GPUDepthStencilState.h:
  • platform/graphics/gpu/GPUDevice.cpp:

(WebCore::GPUDevice::~GPUDevice):

  • platform/graphics/gpu/GPUDevice.h:

(WebCore::GPUDevice::layer const):

  • platform/graphics/gpu/GPUDrawable.cpp:

(WebCore::GPUDrawable::~GPUDrawable):

  • platform/graphics/gpu/GPUDrawable.h:
  • platform/graphics/gpu/GPUEnums.h:
  • platform/graphics/gpu/GPUFunction.cpp:

(WebCore::GPUFunction::~GPUFunction):

  • platform/graphics/gpu/GPUFunction.h:
  • platform/graphics/gpu/GPULibrary.cpp:

(WebCore::GPULibrary::~GPULibrary):

  • platform/graphics/gpu/GPULibrary.h:
  • platform/graphics/gpu/GPURenderCommandEncoder.cpp:

(WebCore::GPURenderCommandEncoder::~GPURenderCommandEncoder):

  • platform/graphics/gpu/GPURenderCommandEncoder.h:
  • platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp:

(WebCore::GPURenderPassAttachmentDescriptor::~GPURenderPassAttachmentDescriptor):

  • platform/graphics/gpu/GPURenderPassAttachmentDescriptor.h:
  • platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp:

(WebCore::GPURenderPassColorAttachmentDescriptor::~GPURenderPassColorAttachmentDescriptor):

  • platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.h:
  • platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.cpp:

(WebCore::GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor):

  • platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.h:
  • platform/graphics/gpu/GPURenderPassDescriptor.cpp:

(WebCore::GPURenderPassDescriptor::~GPURenderPassDescriptor):

  • platform/graphics/gpu/GPURenderPassDescriptor.h:
  • platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp:

(WebCore::GPURenderPipelineColorAttachmentDescriptor::~GPURenderPipelineColorAttachmentDescriptor):

  • platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.h:
  • platform/graphics/gpu/GPURenderPipelineDescriptor.cpp:

(WebCore::GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor):

  • platform/graphics/gpu/GPURenderPipelineDescriptor.h:
  • platform/graphics/gpu/GPURenderPipelineState.cpp:

(WebCore::GPURenderPipelineState::~GPURenderPipelineState):

  • platform/graphics/gpu/GPURenderPipelineState.h:
  • platform/graphics/gpu/GPUSize.h:
  • platform/graphics/gpu/GPUTexture.cpp:

(WebCore::GPUTexture::~GPUTexture):

  • platform/graphics/gpu/GPUTexture.h:
  • platform/graphics/gpu/GPUTextureDescriptor.cpp:

(WebCore::GPUTextureDescriptor::~GPUTextureDescriptor):

  • platform/graphics/gpu/GPUTextureDescriptor.h:
  • platform/graphics/metal/GPUBufferMetal.mm:

(WebCore::GPUBuffer::GPUBuffer):

  • platform/graphics/metal/GPUCommandBufferMetal.mm:
  • platform/graphics/metal/GPUCommandQueueMetal.mm:
  • platform/graphics/metal/GPUComputeCommandEncoderMetal.mm:
  • platform/graphics/metal/GPUComputePipelineStateMetal.mm:

(WebCore::GPUComputePipelineState::GPUComputePipelineState):

  • platform/graphics/metal/GPUDepthStencilDescriptorMetal.mm:
  • platform/graphics/metal/GPUDepthStencilStateMetal.mm:

(WebCore::GPUDepthStencilState::setLabel const):

  • platform/graphics/metal/GPUDeviceMetal.mm:

(WebCore::GPUDevice::reshape const):

  • platform/graphics/metal/GPUDrawableMetal.mm:

(WebCore::GPUDrawable::release):

  • platform/graphics/metal/GPUFunctionMetal.mm:
  • platform/graphics/metal/GPULibraryMetal.mm:

(WebCore::GPULibrary::GPULibrary):

  • platform/graphics/metal/GPURenderCommandEncoderMetal.mm:

(WebCore::GPURenderCommandEncoder::GPURenderCommandEncoder):

  • platform/graphics/metal/GPURenderPassAttachmentDescriptorMetal.mm:
  • platform/graphics/metal/GPURenderPassColorAttachmentDescriptorMetal.mm:
  • platform/graphics/metal/GPURenderPassDepthAttachmentDescriptorMetal.mm:
  • platform/graphics/metal/GPURenderPassDescriptorMetal.mm:
  • platform/graphics/metal/GPURenderPipelineColorAttachmentDescriptorMetal.mm:
  • platform/graphics/metal/GPURenderPipelineDescriptorMetal.mm:
  • platform/graphics/metal/GPURenderPipelineStateMetal.mm:

(WebCore::GPURenderPipelineState::setLabel const):

  • platform/graphics/metal/GPUTextureDescriptorMetal.mm:
  • platform/graphics/metal/GPUTextureMetal.mm:

(WebCore::GPUTexture::GPUTexture):

  • testing/InternalSettings.cpp:

(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setWebMetalEnabled):
(WebCore::InternalSettings::setWebGPUEnabled): Deleted.

  • testing/InternalSettings.h:
  • testing/InternalSettings.idl:

Source/WebCore/PAL:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.

  • Configurations/FeatureDefines.xcconfig:

Source/WebInspectorUI:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
For WebInspector, add WebMetal to valid enums for canvas types.

  • UserInterface/Models/Canvas.js:

(WI.Canvas.fromPayload):
(WI.Canvas.displayNameForContextType):

Source/WebKit:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.

  • Configurations/FeatureDefines.xcconfig:
  • Shared/WebPreferences.yaml:
  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):

Source/WebKitLegacy/mac:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.

  • Configurations/FeatureDefines.xcconfig:
  • WebView/WebPreferenceKeysPrivate.h:
  • WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
(-[WebPreferences webMetalEnabled]):
(-[WebPreferences setWebMetalEnabled:]):
(-[WebPreferences webGPUEnabled]): Deleted.
(-[WebPreferences setWebGPUEnabled:]): Deleted.

  • WebView/WebPreferencesPrivate.h:
  • WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Tools:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.

  • DumpRenderTree/mac/DumpRenderTree.mm:

(enableExperimentalFeatures):
(resetWebPreferencesToConsistentValues):

  • TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
  • TestWebKitAPI/Tests/WebCore/mac/GPUBuffer.mm:
  • TestWebKitAPI/Tests/WebCore/mac/GPUCommandQueue.mm:
  • TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm:
  • TestWebKitAPI/Tests/WebCore/mac/GPUFunction.mm:
  • TestWebKitAPI/Tests/WebCore/mac/GPULibrary.mm:
  • WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::beginTesting):

  • WebKitTestRunner/InjectedBundle/TestRunner.cpp:

(WTR::TestRunner::setWebMetalEnabled):
(WTR::TestRunner::setWebGPUEnabled): Deleted.

  • WebKitTestRunner/InjectedBundle/TestRunner.h:

Websites/webkit.org:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.

  • demos/webgpu/shared.js: Removed.
  • demos/webmetal/2d.html: Renamed from Websites/webkit.org/demos/webgpu/2d.html.
  • demos/webmetal/2d.jpg: Renamed from Websites/webkit.org/demos/webgpu/2d.jpg.
  • demos/webmetal/2d.js: Renamed from Websites/webkit.org/demos/webgpu/2d.js.

(init):

  • demos/webmetal/circle.svg: Renamed from Websites/webkit.org/demos/webgpu/circle.svg.
  • demos/webmetal/cubes.html: Renamed from Websites/webkit.org/demos/webgpu/cubes.html.
  • demos/webmetal/cubes.jpg: Renamed from Websites/webkit.org/demos/webgpu/cubes.jpg.
  • demos/webmetal/cubes.js: Renamed from Websites/webkit.org/demos/webgpu/cubes.js.

(init):

  • demos/webmetal/gl-matrix-min.js: Renamed from Websites/webkit.org/demos/webgpu/gl-matrix-min.js.
  • demos/webmetal/hello.html: Renamed from Websites/webkit.org/demos/webgpu/hello.html.
  • demos/webmetal/hello.jpg: Renamed from Websites/webkit.org/demos/webgpu/hello.jpg.
  • demos/webmetal/hello.js: Renamed from Websites/webkit.org/demos/webgpu/hello.js.

(init):

  • demos/webmetal/index.html: Renamed from Websites/webkit.org/demos/webgpu/index.html.
  • demos/webmetal/shared.css: Renamed from Websites/webkit.org/demos/webgpu/shared.css.
  • demos/webmetal/shared.js: Added.

(const.hasWebMetal):
(const.checkForWebMetal):

  • demos/webmetal/simple.html: Renamed from Websites/webkit.org/demos/webgpu/simple.html.
  • demos/webmetal/simple.jpg: Renamed from Websites/webkit.org/demos/webgpu/simple.jpg.
  • demos/webmetal/simple.js: Renamed from Websites/webkit.org/demos/webgpu/simple.js.

(init):

  • experimental-features.html:

LayoutTests:

<rdar://problem/44990443>

Reviewed by Dean Jackson.

Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.

  • fast/canvas/webgpu/webgpu-runtime-flag-expected.txt: Removed.
  • fast/canvas/webmetal/webmetal-dispatch-expected.txt: Renamed from LayoutTests/fast/canvas/webgpu/webgpu-dispatch-expected.txt.
  • fast/canvas/webmetal/webmetal-dispatch.html: Renamed from LayoutTests/fast/canvas/webgpu/webgpu-dispatch.html.
  • fast/canvas/webmetal/webmetal-runtime-flag-expected.txt: Added.
  • fast/canvas/webmetal/webmetal-runtime-flag.html: Renamed from LayoutTests/fast/canvas/webgpu/webgpu-runtime-flag.html.
  • inspector/canvas/create-context-webmetal-expected.txt: Renamed from LayoutTests/inspector/canvas/create-context-webgpu-expected.txt.
  • inspector/canvas/create-context-webmetal.html: Renamed from LayoutTests/inspector/canvas/create-context-webgpu.html.
  • inspector/canvas/resolveCanvasContext-webgpu-expected.txt: Removed.
  • inspector/canvas/resolveCanvasContext-webmetal-expected.txt: Added.
  • inspector/canvas/resolveCanvasContext-webmetal.html: Renamed from LayoutTests/inspector/canvas/resolveCanvasContext-webgpu.html.
  • platform/gtk/TestExpectations:
  • platform/ios/TestExpectations:
  • platform/mac/TestExpectations:
  • platform/win/TestExpectations:
Location:
trunk
Files:
6 added
4 deleted
126 edited
19 copied
74 moved

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r236716 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5
     6        Reviewed by Dean Jackson.
     7
     8        * Source/cmake/WebKitFeatures.cmake:
     9
    1102018-10-02  Philippe Normand  <pnormand@igalia.com>
    211

  • trunk/LayoutTests/ChangeLog

    r236952 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     10
     11        * fast/canvas/webgpu/webgpu-runtime-flag-expected.txt: Removed.
     12        * fast/canvas/webmetal/webmetal-dispatch-expected.txt: Renamed from LayoutTests/fast/canvas/webgpu/webgpu-dispatch-expected.txt.
     13        * fast/canvas/webmetal/webmetal-dispatch.html: Renamed from LayoutTests/fast/canvas/webgpu/webgpu-dispatch.html.
     14        * fast/canvas/webmetal/webmetal-runtime-flag-expected.txt: Added.
     15        * fast/canvas/webmetal/webmetal-runtime-flag.html: Renamed from LayoutTests/fast/canvas/webgpu/webgpu-runtime-flag.html.
     16        * inspector/canvas/create-context-webmetal-expected.txt: Renamed from LayoutTests/inspector/canvas/create-context-webgpu-expected.txt.
     17        * inspector/canvas/create-context-webmetal.html: Renamed from LayoutTests/inspector/canvas/create-context-webgpu.html.
     18        * inspector/canvas/resolveCanvasContext-webgpu-expected.txt: Removed.
     19        * inspector/canvas/resolveCanvasContext-webmetal-expected.txt: Added.
     20        * inspector/canvas/resolveCanvasContext-webmetal.html: Renamed from LayoutTests/inspector/canvas/resolveCanvasContext-webgpu.html.
     21        * platform/gtk/TestExpectations:
     22        * platform/ios/TestExpectations:
     23        * platform/mac/TestExpectations:
     24        * platform/win/TestExpectations:
     25
    1262018-10-08  Devin Rousso  <drousso@apple.com>
    227

  • trunk/LayoutTests/fast/canvas/webmetal/webmetal-dispatch.html

    r236953 r236954  
    3939    }
    4040
    41     window.internals.settings.setWebGPUEnabled(true);
    42     let gpu = document.createElement("canvas").getContext("webgpu");
     41    window.internals.settings.setWebMetalEnabled(true);
     42    let gpu = document.createElement("canvas").getContext("webmetal");
    4343    let commandQueue = gpu.createCommandQueue();
    4444

  • trunk/LayoutTests/fast/canvas/webmetal/webmetal-runtime-flag.html

    r236953 r236954  
    1919    }
    2020
    21     window.internals.settings.setWebGPUEnabled(true);
    22     var ctx = getContext("webgpu");
     21    window.internals.settings.setWebMetalEnabled(true);
     22    var ctx = getContext("webmetal");
    2323    if (ctx)
    24         output.textContent = "PASS: WebGPU was available when enabled.";
     24        output.textContent = "PASS: WebMetal was available when enabled.";
    2525    else
    26         output.textContent = "FAIL: WebGPU was not available when enabled.";
     26        output.textContent = "FAIL: WebMetal was not available when enabled.";
    2727
    2828    output = document.getElementById("output2");
    2929
    30     window.internals.settings.setWebGPUEnabled(false);
    31     var ctx = getContext("webgpu");
     30    window.internals.settings.setWebMetalEnabled(false);
     31    var ctx = getContext("webmetal");
    3232    if (ctx)
    33         output.textContent = "FAIL: WebGPU was available when disabled.";
     33        output.textContent = "FAIL: WebMetal was available when disabled.";
    3434    else
    35         output.textContent = "PASS: WebGPU was not available when disabled.";
     35        output.textContent = "PASS: WebMetal was not available when disabled.";
    3636}
    3737

  • trunk/LayoutTests/inspector/canvas/create-context-webmetal-expected.txt

    r236953 r236954  
    1 Test that CanvasManager tracks creation and destruction of WebGPU canvases.
     1Test that CanvasManager tracks creation and destruction of WebMetal canvases.
    22
    33
    4 == Running test suite: Canvas.CreateContextWebGPU
    5 -- Running test case: Canvas.CreateContextWebGPU.NoCanvases
     4== Running test suite: Canvas.CreateContextWebMetal
     5-- Running test case: Canvas.CreateContextWebMetal.NoCanvases
    66PASS: CanvasManager should have no canvases.
    77
    8 -- Running test case: Canvas.CreateContextWebGPU.Attached
    9 PASS: Canvas context should be WebGPU.
     8-- Running test case: Canvas.CreateContextWebMetal.Attached
     9PASS: Canvas context should be WebMetal.
    1010  0: getContext - [native code]
    1111  1: createAttachedCanvas - inspector/canvas/resources/create-context-utilities.js:4:36
    … …  
    1717PASS: Removed canvas has expected ID.
    1818
    19 -- Running test case: Canvas.CreateContextWebGPU.Detached
    20 PASS: Canvas context should be WebGPU.
     19-- Running test case: Canvas.CreateContextWebMetal.Detached
     20PASS: Canvas context should be WebMetal.
    2121  0: getContext - [native code]
    2222  1: createDetachedCanvas - inspector/canvas/resources/create-context-utilities.js:8:62
    … …  
    2828PASS: Removed canvas has expected ID.
    2929
    30 -- Running test case: Canvas.CreateContextWebGPU.CSSCanvas
     30-- Running test case: Canvas.CreateContextWebMetal.CSSCanvas
    3131Create CSS canvas from -webkit-canvas(css-canvas).
    32 PASS: Canvas context should be WebGPU.
     32PASS: Canvas context should be WebMetal.
    3333  0: getCSSCanvasContext - [native code]
    3434  1: createCSSCanvas - inspector/canvas/resources/create-context-utilities.js:12:47

  • trunk/LayoutTests/inspector/canvas/create-context-webmetal.html

    r236953 r236954  
    77<script>
    88if (window.internals)
    9     window.internals.settings.setWebGPUEnabled(true);
     9    window.internals.settings.setWebMetalEnabled(true);
    1010
    1111function test() {
    12     let suite = initializeTestSuite("Canvas.CreateContextWebGPU");
     12    let suite = initializeTestSuite("Canvas.CreateContextWebMetal");
    1313
    1414    addSimpleTestCase({
    1515        name: "Attached",
    16         expression: `createAttachedCanvas("webgpu")`,
    17         contextType: WI.Canvas.ContextType.WebGPU,
     16        expression: `createAttachedCanvas("webmetal")`,
     17        contextType: WI.Canvas.ContextType.WebMetal,
    1818    });
    1919
    2020    addSimpleTestCase({
    2121        name: "Detached",
    22         expression: `createDetachedCanvas("webgpu")`,
    23         contextType: WI.Canvas.ContextType.WebGPU,
     22        expression: `createDetachedCanvas("webmetal")`,
     23        contextType: WI.Canvas.ContextType.WebMetal,
    2424    });
    2525
    26     addCSSCanvasTestCase(WI.Canvas.ContextType.WebGPU);
     26    addCSSCanvasTestCase(WI.Canvas.ContextType.WebMetal;
    2727
    2828    suite.runTestCasesAndFinish();
    … …  
    3131</head>
    3232<body onload="runTest()">
    33     <p>Test that CanvasManager tracks creation and destruction of WebGPU canvases.</p>
     33    <p>Test that CanvasManager tracks creation and destruction of WebMetal canvases.</p>
    3434</body>
    3535</html>

  • trunk/LayoutTests/inspector/canvas/resolveCanvasContext-webmetal.html

    r236953 r236954  
    55<script>
    66if (window.internals)
    7     window.internals.settings.setWebGPUEnabled(true);
     7    window.internals.settings.setWebMetalEnabled(true);
    88
    99function load() {
    10     window.contextWebGPU = document.body.appendChild(document.createElement("canvas")).getContext("webgpu");
     10    window.contextWebMetal = document.body.appendChild(document.createElement("canvas")).getContext("webmetal");
    1111
    1212    runTest();
    … …  
    1515function test()
    1616{
    17     let suite = InspectorTest.createAsyncSuite("Canvas.resolveCanvasContextWebGPU");
     17    let suite = InspectorTest.createAsyncSuite("Canvas.resolveCanvasContextWebMetal");
    1818
    1919    suite.addTestCase({
    20         name: `Canvas.resolveCanvasContextWebGPU.validIdentifier`,
     20        name: `Canvas.resolveCanvasContextWebMetal.validIdentifier`,
    2121        description: "Should return a valid object for the given canvas identifier.",
    2222        test(resolve, reject) {
    23             let canvas = WI.canvasManager.canvases.find((canvas) => canvas.contextType === WI.Canvas.ContextType.WebGPU);
     23            let canvas = WI.canvasManager.canvases.find((canvas) => canvas.contextType === WI.Canvas.ContextType.WebMetal);
    2424            if (!canvas) {
    2525                reject(`Missing Canvas.`);
    … …  
    3131            .then(({object}) => {
    3232                InspectorTest.expectEqual(object.type, "object", `Payload should have type "object".`);
    33                 InspectorTest.expectEqual(object.className, "WebGPURenderingContext", `Payload should have className "WebGPURenderingContext".`);
     33                InspectorTest.expectEqual(object.className, "WebMetalRenderingContext", `Payload should have className "WebMetalRenderingContext".`);
    3434            })
    3535            .then(resolve, reject);
    … …  
    4242</head>
    4343<body onload="load()">
    44     <p>Tests for the Canvas.resolveCanvasContext command for WebGPU contexts.</p>
     44    <p>Tests for the Canvas.resolveCanvasContext command for WebMetal contexts.</p>
    4545</body>
    4646</html>

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r236752 r236954  
    11151115http/tests/local/fileapi/upload-zip-bundle-as-blob-using-open-panel.html [ Skip ]
    11161116
    1117 # WebGPU is not enabled on GTK+.
    1118 fast/canvas/webgpu [ Skip ]
    1119 inspector/canvas/create-context-webgpu.html [ Skip ]
    1120 inspector/canvas/resolveCanvasContext-webgpu.html [ Skip ]
     1117# WebMetal is not enabled on GTK+.
     1118fast/canvas/webmetal [ Skip ]
     1119inspector/canvas/create-context-webmetal.html [ Skip ]
     1120inspector/canvas/resolveCanvasContext-webmetal.html [ Skip ]
    11211121
    11221122# We don't support APPLE_PAY.

  • trunk/LayoutTests/platform/ios/TestExpectations

    r236937 r236954  
    3737
    3838# WebGPU is not enabled on iOS Simulator.
    39 fast/canvas/webgpu
    40 inspector/canvas/create-context-webgpu.html [ Skip ]
    41 inspector/canvas/resolveCanvasContext-webgpu.html [ Skip ]
     39fast/canvas/webmetal
     40inspector/canvas/create-context-webmetal.html [ Skip ]
     41inspector/canvas/resolveCanvasContext-webmetal.html [ Skip ]
    4242
    4343# Encrypted Media Extensions are not enabled

  • trunk/LayoutTests/platform/mac/TestExpectations

    r236919 r236954  
    10431043webkit.org/b/178028 inspector/canvas/create-context-2d.html [ Pass Timeout ]
    10441044webkit.org/b/174066 inspector/canvas/create-context-webgl2.html [ Pass Timeout ]
    1045 webkit.org/b/174066 inspector/canvas/create-context-webgpu.html [ Pass Timeout ]
     1045webkit.org/b/174066 inspector/canvas/create-context-webmetal.html [ Pass Timeout ]
    10461046webkit.org/b/174272 inspector/canvas/css-canvas-clients.html [ Pass Timeout ]
    10471047webkit.org/b/174066 inspector/canvas/shaderProgram-add-remove-webgl2.html [ Pass Failure Timeout ]

  • trunk/LayoutTests/platform/win/TestExpectations

    r236840 r236954  
    24422442# inspector/debugger/searchInContent-linebreaks.html [ Pass Crash ] # Flaky
    24432443
    2444 inspector/canvas/create-context-webgpu.html [ Skip ]
    2445 inspector/canvas/resolveCanvasContext-webgpu.html [ Skip ]
     2444inspector/canvas/create-context-webmetal.html [ Skip ]
     2445inspector/canvas/resolveCanvasContext-webmetal.html [ Skip ]
    24462446
    24472447################################################################################
    … …  
    35283528fast/block/positioning/025.html [ Failure ]
    35293529fast/block/positioning/fixed-position-stacking-context.html [ Failure ]
    3530 fast/canvas/webgpu/webgpu-runtime-flag.html [ Failure ]
     3530fast/canvas/webmetal/webmetal-runtime-flag.html [ Failure ]
    35313531fast/css/getComputedStyle/computed-style-font-family.html [ Failure ]
    35323532fast/css/getComputedStyle/computed-style-without-renderer.html [ Failure ]
    … …  
    36433643editing/selection/character-granularity-select-text-with-click-handler.html [ Skip ]
    36443644editing/selection/character-granularity-selected-range-after-dismissing-selection.html [ Skip ]
    3645 fast/canvas/webgpu/webgpu-dispatch.html [ Skip ]
     3645fast/canvas/webmetal/webmetal-dispatch.html [ Skip ]
    36463646fast/dom/FileList-iterator-using-open-panel.html [ Skip ]
    36473647fast/forms/file/file-input-reset-using-open-panel.html [ Skip ]

  • trunk/Source/JavaScriptCore/ChangeLog

    r236942 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     10
     11        * Configurations/FeatureDefines.xcconfig:
     12        * inspector/protocol/Canvas.json:
     13        * inspector/scripts/codegen/generator.py:
     14
    1152018-10-08  Aditya Keerthi  <akeerthi@apple.com>
    216

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r236942 r236954  
    351351ENABLE_WEBGL2 = ENABLE_WEBGL2;
    352352
    353 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
    354 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
    355 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
    356 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
    357 ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
     353ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
     354ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
     355ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
     356ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
     357ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
    358358
    359359ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
    … …  
    373373ENABLE_XSLT = ENABLE_XSLT;
    374374
    375 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_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);
     375FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);

  • trunk/Source/JavaScriptCore/inspector/protocol/Canvas.json

    r230127 r236954  
    1717            "id": "ContextType",
    1818            "type": "string",
    19             "enum": ["canvas-2d", "bitmaprenderer", "webgl", "webgl2", "webgpu"],
     19            "enum": ["canvas-2d", "bitmaprenderer", "webgl", "webgl2", "webmetal"],
    2020            "description": "The type of rendering context backing the canvas element."
    2121        },

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py

    r236321 r236954  
    5151    'webgl': 'WebGL',  # Canvas.ContextType.webgl
    5252    'webgl2': 'WebGL2',  # Canvas.ContextType.webgl2
    53     'webgpu': 'WebGPU',  # Canvas.ContextType.webgpu
     53    'webmetal': 'WebMetal',  # Canvas.ContextType.webmetal
    5454    'bitmaprenderer': 'BitmapRenderer',  # Canvas.ContextType.bitmaprenderer
    5555    'webrtc': 'WebRTC',  # Console.ChannelSource.webrtc

  • trunk/Source/WebCore/CMakeLists.txt

    r236840 r236954  
    791791    html/canvas/OffscreenCanvasRenderingContext2D.idl
    792792    html/canvas/Path2D.idl
    793     html/canvas/WebGPUBuffer.idl
    794     html/canvas/WebGPUCommandBuffer.idl
    795     html/canvas/WebGPUCommandQueue.idl
    796     html/canvas/WebGPUComputeCommandEncoder.idl
    797     html/canvas/WebGPUComputePipelineState.idl
    798     html/canvas/WebGPUDepthStencilDescriptor.idl
    799     html/canvas/WebGPUDepthStencilState.idl
    800     html/canvas/WebGPUDrawable.idl
    801     html/canvas/WebGPUFunction.idl
    802     html/canvas/WebGPULibrary.idl
    803     html/canvas/WebGPURenderCommandEncoder.idl
    804     html/canvas/WebGPURenderPassAttachmentDescriptor.idl
    805     html/canvas/WebGPURenderPassColorAttachmentDescriptor.idl
    806     html/canvas/WebGPURenderPassDepthAttachmentDescriptor.idl
    807     html/canvas/WebGPURenderPassDescriptor.idl
    808     html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.idl
    809     html/canvas/WebGPURenderPipelineDescriptor.idl
    810     html/canvas/WebGPURenderPipelineState.idl
    811     html/canvas/WebGPURenderingContext.idl
    812     html/canvas/WebGPUSize.idl
    813     html/canvas/WebGPUTexture.idl
    814     html/canvas/WebGPUTextureDescriptor.idl
     793    html/canvas/WebMetalBuffer.idl
     794    html/canvas/WebMetalCommandBuffer.idl
     795    html/canvas/WebMetalCommandQueue.idl
     796    html/canvas/WebMetalComputeCommandEncoder.idl
     797    html/canvas/WebMetalComputePipelineState.idl
     798    html/canvas/WebMetalDepthStencilDescriptor.idl
     799    html/canvas/WebMetalDepthStencilState.idl
     800    html/canvas/WebMetalDrawable.idl
     801    html/canvas/WebMetalFunction.idl
     802    html/canvas/WebMetalLibrary.idl
     803    html/canvas/WebMetalRenderCommandEncoder.idl
     804    html/canvas/WebMetalRenderPassAttachmentDescriptor.idl
     805    html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl
     806    html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl
     807    html/canvas/WebMetalRenderPassDescriptor.idl
     808    html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl
     809    html/canvas/WebMetalRenderPipelineDescriptor.idl
     810    html/canvas/WebMetalRenderPipelineState.idl
     811    html/canvas/WebMetalRenderingContext.idl
     812    html/canvas/WebMetalSize.idl
     813    html/canvas/WebMetalTexture.idl
     814    html/canvas/WebMetalTextureDescriptor.idl
    815815
    816816    inspector/CommandLineAPIHost.idl

  • trunk/Source/WebCore/ChangeLog

    r236945 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Existing WebGPU tests also renamed to reflect WebGPU -> WebMetal change.
     10
     11        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     12
     13        * CMakeLists.txt:
     14        * Configurations/FeatureDefines.xcconfig:
     15        * DerivedSources.make:
     16        * Sources.txt:
     17        * SourcesCocoa.txt:
     18        * WebCore.xcodeproj/project.pbxproj:
     19        * bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp: Renamed from Source/WebCore/bindings/js/JSWebGPURenderPassAttachmentDescriptorCustom.cpp.
     20        (WebCore::toJSNewlyCreated):
     21        (WebCore::toJS):
     22        * bindings/js/JSWebMetalRenderingContextCustom.cpp: Renamed from Source/WebCore/bindings/js/JSWebGPURenderingContextCustom.cpp.
     23        (WebCore::JSWebMetalRenderingContext::visitAdditionalChildren):
     24        * bindings/js/WebCoreBuiltinNames.h:
     25        * dom/Document.cpp:
     26        (WebCore::Document::getCSSCanvasContext):
     27        * dom/Document.h:
     28        * dom/Document.idl:
     29        * html/HTMLCanvasElement.cpp:
     30        (WebCore::HTMLCanvasElement::getContext):
     31        (WebCore::HTMLCanvasElement::isWebMetalType):
     32        (WebCore::HTMLCanvasElement::createContextWebMetal):
     33        (WebCore::HTMLCanvasElement::getContextWebMetal):
     34        (WebCore::HTMLCanvasElement::isWebGPUType): Deleted.
     35        (WebCore::HTMLCanvasElement::createContextWebGPU): Deleted.
     36        (WebCore::HTMLCanvasElement::getContextWebGPU): Deleted.
     37        * html/HTMLCanvasElement.h:
     38        * html/HTMLCanvasElement.idl:
     39        * html/canvas/CanvasRenderingContext.h:
     40        (WebCore::CanvasRenderingContext::isWebMetal const):
     41        (WebCore::CanvasRenderingContext::isWebGPU const): Deleted.
     42        * html/canvas/WebGPURenderingContext.cpp: Removed.
     43        * html/canvas/WebMetalBuffer.cpp: Renamed from Source/WebCore/html/canvas/WebGPUBuffer.cpp.
     44        (WebCore::WebMetalBuffer::create):
     45        (WebCore::WebMetalBuffer::WebMetalBuffer):
     46        * html/canvas/WebMetalBuffer.h: Renamed from Source/WebCore/html/canvas/WebGPUBuffer.h.
     47        * html/canvas/WebMetalBuffer.idl: Renamed from Source/WebCore/html/canvas/WebGPUBuffer.idl.
     48        * html/canvas/WebMetalCommandBuffer.cpp: Renamed from Source/WebCore/html/canvas/WebGPUCommandBuffer.cpp.
     49        (WebCore::WebMetalCommandBuffer::create):
     50        (WebCore::WebMetalCommandBuffer::WebMetalCommandBuffer):
     51        (WebCore::WebMetalCommandBuffer::~WebMetalCommandBuffer):
     52        (WebCore::WebMetalCommandBuffer::commit):
     53        (WebCore::WebMetalCommandBuffer::presentDrawable):
     54        (WebCore::WebMetalCommandBuffer::createRenderCommandEncoderWithDescriptor):
     55        (WebCore::WebMetalCommandBuffer::createComputeCommandEncoder):
     56        (WebCore::WebMetalCommandBuffer::completed):
     57        * html/canvas/WebMetalCommandBuffer.h: Renamed from Source/WebCore/html/canvas/WebGPUCommandBuffer.h.
     58        * html/canvas/WebMetalCommandBuffer.idl: Renamed from Source/WebCore/html/canvas/WebGPUCommandBuffer.idl.
     59        * html/canvas/WebMetalCommandQueue.cpp: Renamed from Source/WebCore/html/canvas/WebGPUCommandQueue.cpp.
     60        (WebCore::WebMetalCommandQueue::create):
     61        (WebCore::WebMetalCommandQueue::WebMetalCommandQueue):
     62        (WebCore::WebMetalCommandQueue::createCommandBuffer):
     63        * html/canvas/WebMetalCommandQueue.h: Renamed from Source/WebCore/html/canvas/WebGPUCommandQueue.h.
     64        * html/canvas/WebMetalCommandQueue.idl: Renamed from Source/WebCore/html/canvas/WebGPUCommandQueue.idl.
     65        * html/canvas/WebMetalComputeCommandEncoder.cpp: Renamed from Source/WebCore/html/canvas/WebGPUComputeCommandEncoder.cpp.
     66        (WebCore::GPUSizeMake):
     67        (WebCore::WebMetalComputeCommandEncoder::create):
     68        (WebCore::WebMetalComputeCommandEncoder::WebMetalComputeCommandEncoder):
     69        (WebCore::WebMetalComputeCommandEncoder::setComputePipelineState):
     70        (WebCore::WebMetalComputeCommandEncoder::setBuffer):
     71        (WebCore::WebMetalComputeCommandEncoder::dispatch):
     72        (WebCore::WebMetalComputeCommandEncoder::endEncoding):
     73        * html/canvas/WebMetalComputeCommandEncoder.h: Renamed from Source/WebCore/html/canvas/WebGPUComputeCommandEncoder.h.
     74        * html/canvas/WebMetalComputeCommandEncoder.idl: Renamed from Source/WebCore/html/canvas/WebGPUComputeCommandEncoder.idl.
     75        * html/canvas/WebMetalComputePipelineState.cpp: Renamed from Source/WebCore/html/canvas/WebGPUComputePipelineState.cpp.
     76        (WebCore::WebMetalComputePipelineState::create):
     77        (WebCore::WebMetalComputePipelineState::WebMetalComputePipelineState):
     78        * html/canvas/WebMetalComputePipelineState.h: Renamed from Source/WebCore/html/canvas/WebGPUComputePipelineState.h.
     79        * html/canvas/WebMetalComputePipelineState.idl: Renamed from Source/WebCore/html/canvas/WebGPUComputePipelineState.idl.
     80        * html/canvas/WebMetalDepthStencilDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.cpp.
     81        (WebCore::WebMetalDepthStencilDescriptor::create):
     82        (WebCore::WebMetalDepthStencilDescriptor::depthWriteEnabled const):
     83        (WebCore::WebMetalDepthStencilDescriptor::setDepthWriteEnabled):
     84        (WebCore::WebMetalDepthStencilDescriptor::depthCompareFunction const):
     85        (WebCore::WebMetalDepthStencilDescriptor::setDepthCompareFunction):
     86        * html/canvas/WebMetalDepthStencilDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.h.
     87        * html/canvas/WebMetalDepthStencilDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilDescriptor.idl.
     88        * html/canvas/WebMetalDepthStencilState.cpp: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilState.cpp.
     89        (WebCore::WebMetalDepthStencilState::create):
     90        (WebCore::WebMetalDepthStencilState::WebMetalDepthStencilState):
     91        (WebCore::WebMetalDepthStencilState::label const):
     92        (WebCore::WebMetalDepthStencilState::setLabel):
     93        * html/canvas/WebMetalDepthStencilState.h: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilState.h.
     94        * html/canvas/WebMetalDepthStencilState.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineState.idl.
     95        * html/canvas/WebMetalDrawable.cpp: Renamed from Source/WebCore/html/canvas/WebGPUDrawable.cpp.
     96        (WebCore::WebMetalDrawable::create):
     97        (WebCore::WebMetalDrawable::WebMetalDrawable):
     98        * html/canvas/WebMetalDrawable.h: Renamed from Source/WebCore/html/canvas/WebGPUDrawable.h.
     99        (WebCore::WebMetalDrawable::texture):
     100        * html/canvas/WebMetalDrawable.idl: Renamed from Source/WebCore/html/canvas/WebGPUDrawable.idl.
     101        * html/canvas/WebMetalEnums.cpp: Renamed from Source/WebCore/html/canvas/WebGPUEnums.cpp.
     102        (WebCore::toWebMetalCompareFunction):
     103        (WebCore::web3DCompareFunctionName):
     104        (WebCore::toGPUCompareFunction):
     105        * html/canvas/WebMetalEnums.h: Renamed from Source/WebCore/html/canvas/WebGPUEnums.h.
     106        * html/canvas/WebMetalEnums.idl: Renamed from Source/WebCore/html/canvas/WebGPUEnums.idl.
     107        * html/canvas/WebMetalFunction.cpp: Renamed from Source/WebCore/html/canvas/WebGPUFunction.cpp.
     108        (WebCore::WebMetalFunction::create):
     109        (WebCore::WebMetalFunction::WebMetalFunction):
     110        * html/canvas/WebMetalFunction.h: Renamed from Source/WebCore/html/canvas/WebGPUFunction.h.
     111        * html/canvas/WebMetalFunction.idl: Renamed from Source/WebCore/html/canvas/WebGPUFunction.idl.
     112        * html/canvas/WebMetalLibrary.cpp: Renamed from Source/WebCore/html/canvas/WebGPULibrary.cpp.
     113        (WebCore::WebMetalLibrary::create):
     114        (WebCore::WebMetalLibrary::WebMetalLibrary):
     115        (WebCore::WebMetalLibrary::functionNames const):
     116        (WebCore::WebMetalLibrary::functionWithName const):
     117        * html/canvas/WebMetalLibrary.h: Renamed from Source/WebCore/html/canvas/WebGPULibrary.h.
     118        * html/canvas/WebMetalLibrary.idl: Renamed from Source/WebCore/html/canvas/WebGPULibrary.idl.
     119        * html/canvas/WebMetalRenderCommandEncoder.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderCommandEncoder.cpp.
     120        (WebCore::WebMetalRenderCommandEncoder::create):
     121        (WebCore::WebMetalRenderCommandEncoder::WebMetalRenderCommandEncoder):
     122        (WebCore::WebMetalRenderCommandEncoder::setRenderPipelineState):
     123        (WebCore::WebMetalRenderCommandEncoder::setDepthStencilState):
     124        (WebCore::WebMetalRenderCommandEncoder::setVertexBuffer):
     125        (WebCore::WebMetalRenderCommandEncoder::setFragmentBuffer):
     126        (WebCore::WebMetalRenderCommandEncoder::drawPrimitives):
     127        (WebCore::WebMetalRenderCommandEncoder::endEncoding):
     128        * html/canvas/WebMetalRenderCommandEncoder.h: Renamed from Source/WebCore/html/canvas/WebGPURenderCommandEncoder.h.
     129        * html/canvas/WebMetalRenderCommandEncoder.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderCommandEncoder.idl.
     130        * html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.cpp.
     131        (WebCore::WebMetalRenderPassAttachmentDescriptor::WebMetalRenderPassAttachmentDescriptor):
     132        (WebCore::WebMetalRenderPassAttachmentDescriptor::loadAction const):
     133        (WebCore::WebMetalRenderPassAttachmentDescriptor::setLoadAction):
     134        (WebCore::WebMetalRenderPassAttachmentDescriptor::storeAction const):
     135        (WebCore::WebMetalRenderPassAttachmentDescriptor::setStoreAction):
     136        (WebCore::WebMetalRenderPassAttachmentDescriptor::texture const):
     137        (WebCore::WebMetalRenderPassAttachmentDescriptor::setTexture):
     138        * html/canvas/WebMetalRenderPassAttachmentDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.h.
     139        * html/canvas/WebMetalRenderPassAttachmentDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPassAttachmentDescriptor.idl.
     140        * html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp.
     141        (WebCore::WebMetalRenderPassColorAttachmentDescriptor::create):
     142        (WebCore::WebMetalRenderPassColorAttachmentDescriptor::WebMetalRenderPassColorAttachmentDescriptor):
     143        (WebCore::WebMetalRenderPassColorAttachmentDescriptor::descriptor const):
     144        (WebCore::WebMetalRenderPassColorAttachmentDescriptor::clearColor const):
     145        (WebCore::WebMetalRenderPassColorAttachmentDescriptor::setClearColor):
     146        * html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.h.
     147        * html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPassColorAttachmentDescriptor.idl.
     148        * html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp.
     149        (WebCore::WebMetalRenderPassDepthAttachmentDescriptor::create):
     150        (WebCore::WebMetalRenderPassDepthAttachmentDescriptor::WebMetalRenderPassDepthAttachmentDescriptor):
     151        (WebCore::WebMetalRenderPassDepthAttachmentDescriptor::clearDepth const):
     152        (WebCore::WebMetalRenderPassDepthAttachmentDescriptor::setClearDepth):
     153        (WebCore::WebMetalRenderPassDepthAttachmentDescriptor::descriptor const):
     154        * html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.h.
     155        * html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.idl.
     156        * html/canvas/WebMetalRenderPassDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDescriptor.cpp.
     157        (WebCore::WebMetalRenderPassDescriptor::create):
     158        (WebCore::WebMetalRenderPassDescriptor::depthAttachment):
     159        (WebCore::WebMetalRenderPassDescriptor::colorAttachments):
     160        * html/canvas/WebMetalRenderPassDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDescriptor.h.
     161        * html/canvas/WebMetalRenderPassDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPassDescriptor.idl.
     162        * html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp.
     163        (WebCore::WebMetalRenderPipelineColorAttachmentDescriptor::create):
     164        (WebCore::WebMetalRenderPipelineColorAttachmentDescriptor::WebMetalRenderPipelineColorAttachmentDescriptor):
     165        (WebCore::WebMetalRenderPipelineColorAttachmentDescriptor::pixelFormat const):
     166        (WebCore::WebMetalRenderPipelineColorAttachmentDescriptor::setPixelFormat):
     167        * html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.h.
     168        * html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.idl.
     169        * html/canvas/WebMetalRenderPipelineDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.cpp.
     170        (WebCore::WebMetalRenderPipelineDescriptor::create):
     171        (WebCore::WebMetalRenderPipelineDescriptor::vertexFunction const):
     172        (WebCore::WebMetalRenderPipelineDescriptor::setVertexFunction):
     173        (WebCore::WebMetalRenderPipelineDescriptor::fragmentFunction const):
     174        (WebCore::WebMetalRenderPipelineDescriptor::setFragmentFunction):
     175        (WebCore::WebMetalRenderPipelineDescriptor::colorAttachments):
     176        (WebCore::WebMetalRenderPipelineDescriptor::depthAttachmentPixelFormat const):
     177        (WebCore::WebMetalRenderPipelineDescriptor::setDepthAttachmentPixelFormat):
     178        (WebCore::WebMetalRenderPipelineDescriptor::reset):
     179        * html/canvas/WebMetalRenderPipelineDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.h.
     180        * html/canvas/WebMetalRenderPipelineDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineDescriptor.idl.
     181        * html/canvas/WebMetalRenderPipelineState.cpp: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineState.cpp.
     182        (WebCore::WebMetalRenderPipelineState::create):
     183        (WebCore::WebMetalRenderPipelineState::WebMetalRenderPipelineState):
     184        (WebCore::WebMetalRenderPipelineState::label const):
     185        (WebCore::WebMetalRenderPipelineState::setLabel):
     186        * html/canvas/WebMetalRenderPipelineState.h: Renamed from Source/WebCore/html/canvas/WebGPURenderPipelineState.h.
     187        * html/canvas/WebMetalRenderPipelineState.idl: Renamed from Source/WebCore/html/canvas/WebGPUDepthStencilState.idl.
     188        * html/canvas/WebMetalRenderingContext.cpp: Added.
     189        (WebCore::WebMetalRenderingContext::create):
     190        (WebCore::WebMetalRenderingContext::WebMetalRenderingContext):
     191        (WebCore::WebMetalRenderingContext::canvas const):
     192        (WebCore::WebMetalRenderingContext::initializeNewContext):
     193        (WebCore::WebMetalRenderingContext::clampedCanvasSize const):
     194        (WebCore::WebMetalRenderingContext::hasPendingActivity const):
     195        (WebCore::WebMetalRenderingContext::stop):
     196        (WebCore::WebMetalRenderingContext::activeDOMObjectName const):
     197        (WebCore::WebMetalRenderingContext::canSuspendForDocumentSuspension const):
     198        (WebCore::WebMetalRenderingContext::platformLayer const):
     199        (WebCore::WebMetalRenderingContext::markLayerComposited):
     200        (WebCore::WebMetalRenderingContext::reshape):
     201        (WebCore::WebMetalRenderingContext::createLibrary):
     202        (WebCore::WebMetalRenderingContext::createRenderPipelineState):
     203        (WebCore::WebMetalRenderingContext::createDepthStencilState):
     204        (WebCore::WebMetalRenderingContext::createComputePipelineState):
     205        (WebCore::WebMetalRenderingContext::createCommandQueue):
     206        (WebCore::WebMetalRenderingContext::nextDrawable):
     207        (WebCore::WebMetalRenderingContext::createBuffer):
     208        (WebCore::WebMetalRenderingContext::createTexture):
     209        * html/canvas/WebMetalRenderingContext.h: Renamed from Source/WebCore/html/canvas/WebGPURenderingContext.h.
     210        * html/canvas/WebMetalRenderingContext.idl: Renamed from Source/WebCore/html/canvas/WebGPURenderingContext.idl.
     211        * html/canvas/WebMetalSize.h: Renamed from Source/WebCore/html/canvas/WebGPUSize.h.
     212        * html/canvas/WebMetalSize.idl: Renamed from Source/WebCore/html/canvas/WebGPUSize.idl.
     213        * html/canvas/WebMetalTexture.cpp: Renamed from Source/WebCore/html/canvas/WebGPUTexture.cpp.
     214        (WebCore::WebMetalTexture::create):
     215        (WebCore::WebMetalTexture::WebMetalTexture):
     216        * html/canvas/WebMetalTexture.h: Renamed from Source/WebCore/html/canvas/WebGPUTexture.h.
     217        * html/canvas/WebMetalTexture.idl: Renamed from Source/WebCore/html/canvas/WebGPUTexture.idl.
     218        * html/canvas/WebMetalTextureDescriptor.cpp: Renamed from Source/WebCore/html/canvas/WebGPUTextureDescriptor.cpp.
     219        (WebCore::WebMetalTextureDescriptor::create):
     220        (WebCore::WebMetalTextureDescriptor::WebMetalTextureDescriptor):
     221        (WebCore::WebMetalTextureDescriptor::width const):
     222        (WebCore::WebMetalTextureDescriptor::setWidth):
     223        (WebCore::WebMetalTextureDescriptor::height const):
     224        (WebCore::WebMetalTextureDescriptor::setHeight):
     225        (WebCore::WebMetalTextureDescriptor::sampleCount const):
     226        (WebCore::WebMetalTextureDescriptor::setSampleCount):
     227        (WebCore::WebMetalTextureDescriptor::textureType const):
     228        (WebCore::WebMetalTextureDescriptor::setTextureType):
     229        (WebCore::WebMetalTextureDescriptor::storageMode const):
     230        (WebCore::WebMetalTextureDescriptor::setStorageMode):
     231        (WebCore::WebMetalTextureDescriptor::usage const):
     232        (WebCore::WebMetalTextureDescriptor::setUsage):
     233        * html/canvas/WebMetalTextureDescriptor.h: Renamed from Source/WebCore/html/canvas/WebGPUTextureDescriptor.h.
     234        * html/canvas/WebMetalTextureDescriptor.idl: Renamed from Source/WebCore/html/canvas/WebGPUTextureDescriptor.idl.
     235        * inspector/InspectorCanvas.cpp:
     236        (WebCore::InspectorCanvas::buildObjectForCanvas):
     237        * inspector/agents/InspectorCanvasAgent.cpp:
     238        (WebCore::InspectorCanvasAgent::requestContent):
     239        (WebCore::contextAsScriptValue):
     240        * page/RuntimeEnabledFeatures.h:
     241        (WebCore::RuntimeEnabledFeatures::setWebMetalEnabled):
     242        (WebCore::RuntimeEnabledFeatures::webMetalEnabled const):
     243        (WebCore::RuntimeEnabledFeatures::setWebGPUEnabled): Deleted.
     244        (WebCore::RuntimeEnabledFeatures::webGPUEnabled const): Deleted.
     245        * platform/Logging.h:
     246        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
     247        (WebCore::PlatformCALayerCocoa::layerTypeForPlatformLayer):
     248        (WebCore::PlatformCALayerCocoa::PlatformCALayerCocoa):
     249        * platform/graphics/cocoa/WebMetalLayer.h: Renamed from Source/WebCore/platform/graphics/cocoa/WebGPULayer.h.
     250        * platform/graphics/cocoa/WebMetalLayer.mm: Renamed from Source/WebCore/platform/graphics/cocoa/WebGPULayer.mm.
     251        (-[WebMetalLayer initWithGPUDevice:]):
     252        * platform/graphics/gpu/GPUBuffer.cpp:
     253        (WebCore::GPUBuffer::~GPUBuffer):
     254        * platform/graphics/gpu/GPUBuffer.h:
     255        * platform/graphics/gpu/GPUCommandBuffer.cpp:
     256        (WebCore::GPUCommandBuffer::~GPUCommandBuffer):
     257        * platform/graphics/gpu/GPUCommandBuffer.h:
     258        * platform/graphics/gpu/GPUCommandQueue.cpp:
     259        (WebCore::GPUCommandQueue::~GPUCommandQueue):
     260        * platform/graphics/gpu/GPUCommandQueue.h:
     261        * platform/graphics/gpu/GPUComputeCommandEncoder.cpp:
     262        (WebCore::GPUComputeCommandEncoder::~GPUComputeCommandEncoder):
     263        * platform/graphics/gpu/GPUComputeCommandEncoder.h:
     264        * platform/graphics/gpu/GPUComputePipelineState.cpp:
     265        (WebCore::GPUComputePipelineState::~GPUComputePipelineState):
     266        * platform/graphics/gpu/GPUComputePipelineState.h:
     267        * platform/graphics/gpu/GPUDepthStencilDescriptor.cpp:
     268        (WebCore::GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor):
     269        * platform/graphics/gpu/GPUDepthStencilDescriptor.h:
     270        * platform/graphics/gpu/GPUDepthStencilState.cpp:
     271        (WebCore::GPUDepthStencilState::~GPUDepthStencilState):
     272        * platform/graphics/gpu/GPUDepthStencilState.h:
     273        * platform/graphics/gpu/GPUDevice.cpp:
     274        (WebCore::GPUDevice::~GPUDevice):
     275        * platform/graphics/gpu/GPUDevice.h:
     276        (WebCore::GPUDevice::layer const):
     277        * platform/graphics/gpu/GPUDrawable.cpp:
     278        (WebCore::GPUDrawable::~GPUDrawable):
     279        * platform/graphics/gpu/GPUDrawable.h:
     280        * platform/graphics/gpu/GPUEnums.h:
     281        * platform/graphics/gpu/GPUFunction.cpp:
     282        (WebCore::GPUFunction::~GPUFunction):
     283        * platform/graphics/gpu/GPUFunction.h:
     284        * platform/graphics/gpu/GPULibrary.cpp:
     285        (WebCore::GPULibrary::~GPULibrary):
     286        * platform/graphics/gpu/GPULibrary.h:
     287        * platform/graphics/gpu/GPURenderCommandEncoder.cpp:
     288        (WebCore::GPURenderCommandEncoder::~GPURenderCommandEncoder):
     289        * platform/graphics/gpu/GPURenderCommandEncoder.h:
     290        * platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp:
     291        (WebCore::GPURenderPassAttachmentDescriptor::~GPURenderPassAttachmentDescriptor):
     292        * platform/graphics/gpu/GPURenderPassAttachmentDescriptor.h:
     293        * platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp:
     294        (WebCore::GPURenderPassColorAttachmentDescriptor::~GPURenderPassColorAttachmentDescriptor):
     295        * platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.h:
     296        * platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.cpp:
     297        (WebCore::GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor):
     298        * platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.h:
     299        * platform/graphics/gpu/GPURenderPassDescriptor.cpp:
     300        (WebCore::GPURenderPassDescriptor::~GPURenderPassDescriptor):
     301        * platform/graphics/gpu/GPURenderPassDescriptor.h:
     302        * platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp:
     303        (WebCore::GPURenderPipelineColorAttachmentDescriptor::~GPURenderPipelineColorAttachmentDescriptor):
     304        * platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.h:
     305        * platform/graphics/gpu/GPURenderPipelineDescriptor.cpp:
     306        (WebCore::GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor):
     307        * platform/graphics/gpu/GPURenderPipelineDescriptor.h:
     308        * platform/graphics/gpu/GPURenderPipelineState.cpp:
     309        (WebCore::GPURenderPipelineState::~GPURenderPipelineState):
     310        * platform/graphics/gpu/GPURenderPipelineState.h:
     311        * platform/graphics/gpu/GPUSize.h:
     312        * platform/graphics/gpu/GPUTexture.cpp:
     313        (WebCore::GPUTexture::~GPUTexture):
     314        * platform/graphics/gpu/GPUTexture.h:
     315        * platform/graphics/gpu/GPUTextureDescriptor.cpp:
     316        (WebCore::GPUTextureDescriptor::~GPUTextureDescriptor):
     317        * platform/graphics/gpu/GPUTextureDescriptor.h:
     318        * platform/graphics/metal/GPUBufferMetal.mm:
     319        (WebCore::GPUBuffer::GPUBuffer):
     320        * platform/graphics/metal/GPUCommandBufferMetal.mm:
     321        * platform/graphics/metal/GPUCommandQueueMetal.mm:
     322        * platform/graphics/metal/GPUComputeCommandEncoderMetal.mm:
     323        * platform/graphics/metal/GPUComputePipelineStateMetal.mm:
     324        (WebCore::GPUComputePipelineState::GPUComputePipelineState):
     325        * platform/graphics/metal/GPUDepthStencilDescriptorMetal.mm:
     326        * platform/graphics/metal/GPUDepthStencilStateMetal.mm:
     327        (WebCore::GPUDepthStencilState::setLabel const):
     328        * platform/graphics/metal/GPUDeviceMetal.mm:
     329        (WebCore::GPUDevice::reshape const):
     330        * platform/graphics/metal/GPUDrawableMetal.mm:
     331        (WebCore::GPUDrawable::release):
     332        * platform/graphics/metal/GPUFunctionMetal.mm:
     333        * platform/graphics/metal/GPULibraryMetal.mm:
     334        (WebCore::GPULibrary::GPULibrary):
     335        * platform/graphics/metal/GPURenderCommandEncoderMetal.mm:
     336        (WebCore::GPURenderCommandEncoder::GPURenderCommandEncoder):
     337        * platform/graphics/metal/GPURenderPassAttachmentDescriptorMetal.mm:
     338        * platform/graphics/metal/GPURenderPassColorAttachmentDescriptorMetal.mm:
     339        * platform/graphics/metal/GPURenderPassDepthAttachmentDescriptorMetal.mm:
     340        * platform/graphics/metal/GPURenderPassDescriptorMetal.mm:
     341        * platform/graphics/metal/GPURenderPipelineColorAttachmentDescriptorMetal.mm:
     342        * platform/graphics/metal/GPURenderPipelineDescriptorMetal.mm:
     343        * platform/graphics/metal/GPURenderPipelineStateMetal.mm:
     344        (WebCore::GPURenderPipelineState::setLabel const):
     345        * platform/graphics/metal/GPUTextureDescriptorMetal.mm:
     346        * platform/graphics/metal/GPUTextureMetal.mm:
     347        (WebCore::GPUTexture::GPUTexture):
     348        * testing/InternalSettings.cpp:
     349        (WebCore::InternalSettings::Backup::Backup):
     350        (WebCore::InternalSettings::Backup::restoreTo):
     351        (WebCore::InternalSettings::setWebMetalEnabled):
     352        (WebCore::InternalSettings::setWebGPUEnabled): Deleted.
     353        * testing/InternalSettings.h:
     354        * testing/InternalSettings.idl:
     355
    13562018-10-08  Dean Jackson  <dino@apple.com>
    2357

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r236942 r236954  
    351351ENABLE_WEBGL2 = ENABLE_WEBGL2;
    352352
    353 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
    354 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
    355 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
    356 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
    357 ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
     353ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
     354ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
     355ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
     356ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
     357ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
    358358
    359359ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
    … …  
    373373ENABLE_XSLT = ENABLE_XSLT;
    374374
    375 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_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);
     375FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);

  • trunk/Source/WebCore/DerivedSources.make

    r236840 r236954  
    745745    $(WebCore)/html/canvas/WebGLVertexArrayObject.idl \
    746746    $(WebCore)/html/canvas/WebGLVertexArrayObjectOES.idl \
    747     $(WebCore)/html/canvas/WebGPUBuffer.idl \
    748     $(WebCore)/html/canvas/WebGPUCommandBuffer.idl \
    749     $(WebCore)/html/canvas/WebGPUCommandQueue.idl \
    750         $(WebCore)/html/canvas/WebGPUComputeCommandEncoder.idl \
    751         $(WebCore)/html/canvas/WebGPUComputePipelineState.idl \
    752     $(WebCore)/html/canvas/WebGPUDepthStencilDescriptor.idl \
    753     $(WebCore)/html/canvas/WebGPUDepthStencilState.idl \
    754     $(WebCore)/html/canvas/WebGPUDrawable.idl \
    755     $(WebCore)/html/canvas/WebGPUFunction.idl \
    756     $(WebCore)/html/canvas/WebGPULibrary.idl \
    757     $(WebCore)/html/canvas/WebGPURenderCommandEncoder.idl \
    758     $(WebCore)/html/canvas/WebGPURenderingContext.idl \
    759     $(WebCore)/html/canvas/WebGPURenderPassAttachmentDescriptor.idl \
    760     $(WebCore)/html/canvas/WebGPURenderPassColorAttachmentDescriptor.idl \
    761     $(WebCore)/html/canvas/WebGPURenderPassDepthAttachmentDescriptor.idl \
    762     $(WebCore)/html/canvas/WebGPURenderPassDescriptor.idl \
    763     $(WebCore)/html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.idl \
    764     $(WebCore)/html/canvas/WebGPURenderPipelineDescriptor.idl \
    765     $(WebCore)/html/canvas/WebGPURenderPipelineState.idl \
    766         $(WebCore)/html/canvas/WebGPUSize.idl \
    767     $(WebCore)/html/canvas/WebGPUTexture.idl \
    768     $(WebCore)/html/canvas/WebGPUTextureDescriptor.idl \
     747    $(WebCore)/html/canvas/WebMetalBuffer.idl \
     748    $(WebCore)/html/canvas/WebMetalCommandBuffer.idl \
     749    $(WebCore)/html/canvas/WebMetalCommandQueue.idl \
     750        $(WebCore)/html/canvas/WebMetalComputeCommandEncoder.idl \
     751        $(WebCore)/html/canvas/WebMetalComputePipelineState.idl \
     752    $(WebCore)/html/canvas/WebMetalDepthStencilDescriptor.idl \
     753    $(WebCore)/html/canvas/WebMetalDepthStencilState.idl \
     754    $(WebCore)/html/canvas/WebMetalDrawable.idl \
     755    $(WebCore)/html/canvas/WebMetalFunction.idl \
     756    $(WebCore)/html/canvas/WebMetalLibrary.idl \
     757    $(WebCore)/html/canvas/WebMetalRenderCommandEncoder.idl \
     758    $(WebCore)/html/canvas/WebMetalRenderingContext.idl \
     759    $(WebCore)/html/canvas/WebMetalRenderPassAttachmentDescriptor.idl \
     760    $(WebCore)/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl \
     761    $(WebCore)/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl \
     762    $(WebCore)/html/canvas/WebMetalRenderPassDescriptor.idl \
     763    $(WebCore)/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl \
     764    $(WebCore)/html/canvas/WebMetalRenderPipelineDescriptor.idl \
     765    $(WebCore)/html/canvas/WebMetalRenderPipelineState.idl \
     766        $(WebCore)/html/canvas/WebMetalSize.idl \
     767    $(WebCore)/html/canvas/WebMetalTexture.idl \
     768    $(WebCore)/html/canvas/WebMetalTextureDescriptor.idl \
    769769    $(WebCore)/html/track/AudioTrack.idl \
    770770    $(WebCore)/html/track/AudioTrackList.idl \

  • trunk/Source/WebCore/PAL/ChangeLog

    r236942 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     10
     11        * Configurations/FeatureDefines.xcconfig:
     12
    1132018-10-08  Aditya Keerthi  <akeerthi@apple.com>
    214

  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r236942 r236954  
    351351ENABLE_WEBGL2 = ENABLE_WEBGL2;
    352352
    353 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
    354 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
    355 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
    356 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
    357 ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
     353ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
     354ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
     355ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
     356ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
     357ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
    358358
    359359ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
    … …  
    373373ENABLE_XSLT = ENABLE_XSLT;
    374374
    375 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_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);
     375FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);

  • trunk/Source/WebCore/Sources.txt

    r236914 r236954  
    456456bindings/js/JSWebGL2RenderingContextCustom.cpp
    457457bindings/js/JSWebGLRenderingContextCustom.cpp
    458 bindings/js/JSWebGPURenderPassAttachmentDescriptorCustom.cpp
    459 bindings/js/JSWebGPURenderingContextCustom.cpp
     458bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp
     459bindings/js/JSWebMetalRenderingContextCustom.cpp
    460460bindings/js/JSWindowProxy.cpp
    461461bindings/js/JSWorkerGlobalScopeBase.cpp
    … …  
    11121112html/canvas/Path2D.cpp
    11131113html/canvas/PlaceholderRenderingContext.cpp
    1114 html/canvas/WebGPUBuffer.cpp
    1115 html/canvas/WebGPUCommandBuffer.cpp
    1116 html/canvas/WebGPUCommandQueue.cpp
    1117 html/canvas/WebGPUComputeCommandEncoder.cpp
    1118 html/canvas/WebGPUComputePipelineState.cpp
    1119 html/canvas/WebGPUDepthStencilDescriptor.cpp
    1120 html/canvas/WebGPUDepthStencilState.cpp
    1121 html/canvas/WebGPUDrawable.cpp
    1122 html/canvas/WebGPUEnums.cpp
    1123 html/canvas/WebGPUFunction.cpp
    1124 html/canvas/WebGPULibrary.cpp
    1125 html/canvas/WebGPURenderCommandEncoder.cpp
    1126 html/canvas/WebGPURenderPassAttachmentDescriptor.cpp
    1127 html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp
    1128 html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp
    1129 html/canvas/WebGPURenderPassDescriptor.cpp
    1130 html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp
    1131 html/canvas/WebGPURenderPipelineDescriptor.cpp
    1132 html/canvas/WebGPURenderPipelineState.cpp
    1133 html/canvas/WebGPURenderingContext.cpp
    1134 html/canvas/WebGPUTexture.cpp
    1135 html/canvas/WebGPUTextureDescriptor.cpp
     1114html/canvas/WebMetalBuffer.cpp
     1115html/canvas/WebMetalCommandBuffer.cpp
     1116html/canvas/WebMetalCommandQueue.cpp
     1117html/canvas/WebMetalComputeCommandEncoder.cpp
     1118html/canvas/WebMetalComputePipelineState.cpp
     1119html/canvas/WebMetalDepthStencilDescriptor.cpp
     1120html/canvas/WebMetalDepthStencilState.cpp
     1121html/canvas/WebMetalDrawable.cpp
     1122html/canvas/WebMetalEnums.cpp
     1123html/canvas/WebMetalFunction.cpp
     1124html/canvas/WebMetalLibrary.cpp
     1125html/canvas/WebMetalRenderCommandEncoder.cpp
     1126html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp
     1127html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp
     1128html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp
     1129html/canvas/WebMetalRenderPassDescriptor.cpp
     1130html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp
     1131html/canvas/WebMetalRenderPipelineDescriptor.cpp
     1132html/canvas/WebMetalRenderPipelineState.cpp
     1133html/canvas/WebMetalRenderingContext.cpp
     1134html/canvas/WebMetalTexture.cpp
     1135html/canvas/WebMetalTextureDescriptor.cpp
    11361136
    11371137html/forms/FileIconLoader.cpp
    … …  
    31453145JSWaveShaperNode.cpp
    31463146JSWebAnimation.cpp
    3147 JSWebGPUBuffer.cpp
    3148 JSWebGPUCommandBuffer.cpp
    3149 JSWebGPUCommandQueue.cpp
    3150 JSWebGPUComputeCommandEncoder.cpp
    3151 JSWebGPUComputePipelineState.cpp
    3152 JSWebGPUDepthStencilDescriptor.cpp
    3153 JSWebGPUDepthStencilState.cpp
    3154 JSWebGPUDrawable.cpp
    3155 JSWebGPUFunction.cpp
    3156 JSWebGPULibrary.cpp
    3157 JSWebGPURenderCommandEncoder.cpp
    3158 JSWebGPURenderPassAttachmentDescriptor.cpp
    3159 JSWebGPURenderPassColorAttachmentDescriptor.cpp
    3160 JSWebGPURenderPassDepthAttachmentDescriptor.cpp
    3161 JSWebGPURenderPassDescriptor.cpp
    3162 JSWebGPURenderPipelineColorAttachmentDescriptor.cpp
    3163 JSWebGPURenderPipelineDescriptor.cpp
    3164 JSWebGPURenderPipelineState.cpp
    3165 JSWebGPURenderingContext.cpp
    3166 JSWebGPUSize.cpp
    3167 JSWebGPUTexture.cpp
    3168 JSWebGPUTextureDescriptor.cpp
     3147JSWebMetalBuffer.cpp
     3148JSWebMetalCommandBuffer.cpp
     3149JSWebMetalCommandQueue.cpp
     3150JSWebMetalComputeCommandEncoder.cpp
     3151JSWebMetalComputePipelineState.cpp
     3152JSWebMetalDepthStencilDescriptor.cpp
     3153JSWebMetalDepthStencilState.cpp
     3154JSWebMetalDrawable.cpp
     3155JSWebMetalFunction.cpp
     3156JSWebMetalLibrary.cpp
     3157JSWebMetalRenderCommandEncoder.cpp
     3158JSWebMetalRenderPassAttachmentDescriptor.cpp
     3159JSWebMetalRenderPassColorAttachmentDescriptor.cpp
     3160JSWebMetalRenderPassDepthAttachmentDescriptor.cpp
     3161JSWebMetalRenderPassDescriptor.cpp
     3162JSWebMetalRenderPipelineColorAttachmentDescriptor.cpp
     3163JSWebMetalRenderPipelineDescriptor.cpp
     3164JSWebMetalRenderPipelineState.cpp
     3165JSWebMetalRenderingContext.cpp
     3166JSWebMetalSize.cpp
     3167JSWebMetalTexture.cpp
     3168JSWebMetalTextureDescriptor.cpp
    31693169JSWebKitAnimationEvent.cpp
    31703170JSWebKitCSSMatrix.cpp

  • trunk/Source/WebCore/SourcesCocoa.txt

    r236938 r236954  
    312312platform/graphics/cocoa/WebCoreDecompressionSession.mm
    313313platform/graphics/cocoa/WebGLLayer.mm
    314 platform/graphics/cocoa/WebGPULayer.mm
     314platform/graphics/cocoa/WebMetalLayer.mm
    315315platform/graphics/cocoa/TextTrackRepresentationCocoa.mm
    316316

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

    r236943 r236954  
    909909                314BE3A71B3103FB00141982 /* NamedImageGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */; };
    910910                316BDB861E6E0A2700DE0D5A /* GPUDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB851E6E0A2100DE0D5A /* GPUDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
    911                 316BDB8C1E6E153000DE0D5A /* WebGPULayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB8A1E6E153000DE0D5A /* WebGPULayer.h */; };
     911                316BDB8C1E6E153000DE0D5A /* WebMetalLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */; };
    912912                316BDB951E70C89700DE0D5A /* GPUFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB931E70C89700DE0D5A /* GPUFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
    913913                316BDB9B1E70CBBF00DE0D5A /* GPULibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB991E70CBBF00DE0D5A /* GPULibrary.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    68326832                316BDB851E6E0A2100DE0D5A /* GPUDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDevice.h; sourceTree = "<group>"; };
    68336833                316BDB881E6E141C00DE0D5A /* GPUDeviceMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDeviceMetal.mm; sourceTree = "<group>"; };
    6834                 316BDB891E6E153000DE0D5A /* WebGPULayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGPULayer.mm; sourceTree = "<group>"; };
    6835                 316BDB8A1E6E153000DE0D5A /* WebGPULayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGPULayer.h; sourceTree = "<group>"; };
     6834                316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMetalLayer.h; sourceTree = "<group>"; };
    68366835                316BDB921E70C89700DE0D5A /* GPUFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUFunction.cpp; sourceTree = "<group>"; };
    68376836                316BDB931E70C89700DE0D5A /* GPUFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUFunction.h; sourceTree = "<group>"; };
    … …  
    1359713596                D01A27AB10C9BFD800026A42 /* SpaceSplitString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpaceSplitString.cpp; sourceTree = "<group>"; };
    1359813597                D01A27AC10C9BFD800026A42 /* SpaceSplitString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpaceSplitString.h; sourceTree = "<group>"; };
     13598                D02F854E21682A4A0088EE74 /* WebMetalCommandQueue.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalCommandQueue.idl; sourceTree = "<group>"; };
     13599                D02F855021682A560088EE74 /* WebMetalComputeCommandEncoder.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebMetalComputeCommandEncoder.idl; sourceTree = "<group>"; };
     13600                D02F855121682A560088EE74 /* WebMetalComputePipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMetalComputePipelineState.h; sourceTree = "<group>"; };
     13601                D02F855221682A910088EE74 /* WebMetalRenderPipelineState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPipelineState.h; sourceTree = "<group>"; };
     13602                D02F855321682A910088EE74 /* WebMetalRenderPassDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPassDescriptor.cpp; sourceTree = "<group>"; };
     13603                D02F855421682A910088EE74 /* WebMetalRenderingContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderingContext.h; sourceTree = "<group>"; };
     13604                D02F855521682A920088EE74 /* WebMetalDepthStencilDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalDepthStencilDescriptor.h; sourceTree = "<group>"; };
     13605                D02F855621682A920088EE74 /* WebMetalSize.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalSize.idl; sourceTree = "<group>"; };
     13606                D02F855721682A930088EE74 /* WebMetalRenderPassAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPassAttachmentDescriptor.h; sourceTree = "<group>"; };
     13607                D02F855821682A930088EE74 /* WebMetalTexture.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalTexture.idl; sourceTree = "<group>"; };
     13608                D02F855921682A940088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPassColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
     13609                D02F855A21682A940088EE74 /* WebMetalRenderingContext.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderingContext.idl; sourceTree = "<group>"; };
     13610                D02F855B21682A940088EE74 /* WebMetalComputePipelineState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalComputePipelineState.cpp; sourceTree = "<group>"; };
     13611                D02F855C21682A950088EE74 /* WebMetalTextureDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalTextureDescriptor.idl; sourceTree = "<group>"; };
     13612                D02F855D21682A950088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPassColorAttachmentDescriptor.h; sourceTree = "<group>"; };
     13613                D02F855E21682A960088EE74 /* WebMetalRenderPipelineDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPipelineDescriptor.cpp; sourceTree = "<group>"; };
     13614                D02F855F21682A960088EE74 /* WebMetalRenderPipelineState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPipelineState.cpp; sourceTree = "<group>"; };
     13615                D02F856021682A970088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPassColorAttachmentDescriptor.idl; sourceTree = "<group>"; };
     13616                D02F856121682A970088EE74 /* WebMetalRenderPassAttachmentDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPassAttachmentDescriptor.idl; sourceTree = "<group>"; };
     13617                D02F856221682A980088EE74 /* WebMetalRenderCommandEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderCommandEncoder.cpp; sourceTree = "<group>"; };
     13618                D02F856321682A980088EE74 /* WebMetalRenderCommandEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderCommandEncoder.h; sourceTree = "<group>"; };
     13619                D02F856421682A980088EE74 /* WebMetalDepthStencilState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalDepthStencilState.h; sourceTree = "<group>"; };
     13620                D02F856521682A990088EE74 /* WebMetalDepthStencilState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalDepthStencilState.cpp; sourceTree = "<group>"; };
     13621                D02F856621682A990088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPipelineColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
     13622                D02F856721682A9A0088EE74 /* WebMetalRenderPipelineState.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPipelineState.idl; sourceTree = "<group>"; };
     13623                D02F856821682A9A0088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPassDepthAttachmentDescriptor.idl; sourceTree = "<group>"; };
     13624                D02F856921682A9B0088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPassDepthAttachmentDescriptor.cpp; sourceTree = "<group>"; };
     13625                D02F856A21682A9B0088EE74 /* WebMetalTextureDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalTextureDescriptor.h; sourceTree = "<group>"; };
     13626                D02F856B21682A9C0088EE74 /* WebMetalRenderPassDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPassDescriptor.h; sourceTree = "<group>"; };
     13627                D02F856C21682A9C0088EE74 /* WebMetalLibrary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalLibrary.h; sourceTree = "<group>"; };
     13628                D02F856D21682A9C0088EE74 /* WebMetalSize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalSize.h; sourceTree = "<group>"; };
     13629                D02F856E21682A9D0088EE74 /* WebMetalTextureDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalTextureDescriptor.cpp; sourceTree = "<group>"; };
     13630                D02F856F21682A9D0088EE74 /* WebMetalDrawable.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalDrawable.idl; sourceTree = "<group>"; };
     13631                D02F857021682A9E0088EE74 /* WebMetalEnums.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalEnums.cpp; sourceTree = "<group>"; };
     13632                D02F857121682A9E0088EE74 /* WebMetalRenderPassAttachmentDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderPassAttachmentDescriptor.cpp; sourceTree = "<group>"; };
     13633                D02F857221682A9E0088EE74 /* WebMetalLibrary.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalLibrary.idl; sourceTree = "<group>"; };
     13634                D02F857321682A9F0088EE74 /* WebMetalTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalTexture.h; sourceTree = "<group>"; };
     13635                D02F857421682A9F0088EE74 /* WebMetalEnums.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalEnums.idl; sourceTree = "<group>"; };
     13636                D02F857521682AA00088EE74 /* WebMetalEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalEnums.h; sourceTree = "<group>"; };
     13637                D02F857621682AA00088EE74 /* WebMetalDrawable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalDrawable.h; sourceTree = "<group>"; };
     13638                D02F857721682AA10088EE74 /* WebMetalDepthStencilState.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalDepthStencilState.idl; sourceTree = "<group>"; };
     13639                D02F857821682AA10088EE74 /* WebMetalDepthStencilDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalDepthStencilDescriptor.idl; sourceTree = "<group>"; };
     13640                D02F857921682AA20088EE74 /* WebMetalFunction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalFunction.cpp; sourceTree = "<group>"; };
     13641                D02F857A21682AA20088EE74 /* WebMetalFunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalFunction.h; sourceTree = "<group>"; };
     13642                D02F857B21682AA20088EE74 /* WebMetalLibrary.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalLibrary.cpp; sourceTree = "<group>"; };
     13643                D02F857C21682AA30088EE74 /* WebMetalRenderPipelineDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPipelineDescriptor.h; sourceTree = "<group>"; };
     13644                D02F857D21682AA30088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPassDepthAttachmentDescriptor.h; sourceTree = "<group>"; };
     13645                D02F857E21682AA40088EE74 /* WebMetalRenderPassDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPassDescriptor.idl; sourceTree = "<group>"; };
     13646                D02F857F21682AA40088EE74 /* WebMetalDrawable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalDrawable.cpp; sourceTree = "<group>"; };
     13647                D02F858021682AA40088EE74 /* WebMetalRenderPipelineDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPipelineDescriptor.idl; sourceTree = "<group>"; };
     13648                D02F858121682AA50088EE74 /* WebMetalRenderCommandEncoder.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderCommandEncoder.idl; sourceTree = "<group>"; };
     13649                D02F858221682AA50088EE74 /* WebMetalTexture.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalTexture.cpp; sourceTree = "<group>"; };
     13650                D02F858321682AA60088EE74 /* WebMetalComputePipelineState.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalComputePipelineState.idl; sourceTree = "<group>"; };
     13651                D02F858421682AA60088EE74 /* WebMetalDepthStencilDescriptor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalDepthStencilDescriptor.cpp; sourceTree = "<group>"; };
     13652                D02F858521682AA70088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalRenderPipelineColorAttachmentDescriptor.h; sourceTree = "<group>"; };
     13653                D02F858621682AA70088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalRenderPipelineColorAttachmentDescriptor.idl; sourceTree = "<group>"; };
     13654                D02F858721682AA70088EE74 /* WebMetalRenderingContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalRenderingContext.cpp; sourceTree = "<group>"; };
     13655                D02F858821682AA80088EE74 /* WebMetalFunction.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalFunction.idl; sourceTree = "<group>"; };
    1359913656                D036DD8D208FFC0C00F9F4B2 /* WebGLCompressedTextureASTC.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebGLCompressedTextureASTC.idl; sourceTree = "<group>"; };
     13657                D045AD1D2168230B000A6E9B /* WebMetalLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMetalLayer.mm; sourceTree = "<group>"; };
     13658                D045AD1E21682449000A6E9B /* JSWebMetalRenderPassAttachmentDescriptorCustom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebMetalRenderPassAttachmentDescriptorCustom.cpp; sourceTree = "<group>"; };
     13659                D045AD1F21682449000A6E9B /* JSWebMetalRenderingContextCustom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebMetalRenderingContextCustom.cpp; sourceTree = "<group>"; };
     13660                D045AD2021682474000A6E9B /* WebMetalComputeCommandEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalComputeCommandEncoder.h; sourceTree = "<group>"; };
     13661                D045AD2121682474000A6E9B /* WebMetalBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalBuffer.cpp; sourceTree = "<group>"; };
     13662                D045AD2221682474000A6E9B /* WebMetalCommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalCommandBuffer.h; sourceTree = "<group>"; };
     13663                D045AD2321682475000A6E9B /* WebMetalCommandQueue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalCommandQueue.cpp; sourceTree = "<group>"; };
    1360013664                D05CED270A40BB2C00C5AF38 /* FormatBlockCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FormatBlockCommand.cpp; sourceTree = "<group>"; };
    1360113665                D05CED280A40BB2C00C5AF38 /* FormatBlockCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FormatBlockCommand.h; sourceTree = "<group>"; };
    … …  
    1361613680                D0BD4F5A1408850F006839B6 /* DictationCommandIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationCommandIOS.cpp; sourceTree = "<group>"; };
    1361713681                D0BD4F5B1408850F006839B6 /* DictationCommandIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictationCommandIOS.h; sourceTree = "<group>"; };
     13682                D0CAAE98216824A6001C91C7 /* WebMetalBuffer.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalBuffer.idl; sourceTree = "<group>"; };
     13683                D0CAAE9A216824A6001C91C7 /* WebMetalCommandBuffer.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebMetalCommandBuffer.idl; sourceTree = "<group>"; };
     13684                D0CAAE9B216824A7001C91C7 /* WebMetalCommandQueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalCommandQueue.h; sourceTree = "<group>"; };
     13685                D0CAAE9C216824A7001C91C7 /* WebMetalComputeCommandEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalComputeCommandEncoder.cpp; sourceTree = "<group>"; };
     13686                D0CAAE9D216824A7001C91C7 /* WebMetalBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalBuffer.h; sourceTree = "<group>"; };
     13687                D0CAAE9E216824A8001C91C7 /* WebMetalCommandBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalCommandBuffer.cpp; sourceTree = "<group>"; };
    1361813688                D0EDA772143E303C0028E383 /* CachedRawResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedRawResource.cpp; sourceTree = "<group>"; };
    1361913689                D0EDA773143E303C0028E383 /* CachedRawResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedRawResource.h; sourceTree = "<group>"; };
    … …  
    1763217702                                31A089021E737B4D003B6609 /* WebGPUTextureDescriptor.h */,
    1763317703                                31A089031E737B4D003B6609 /* WebGPUTextureDescriptor.idl */,
     17704                                D045AD2121682474000A6E9B /* WebMetalBuffer.cpp */,
     17705                                D0CAAE9D216824A7001C91C7 /* WebMetalBuffer.h */,
     17706                                D0CAAE98216824A6001C91C7 /* WebMetalBuffer.idl */,
     17707                                D0CAAE9E216824A8001C91C7 /* WebMetalCommandBuffer.cpp */,
     17708                                D045AD2221682474000A6E9B /* WebMetalCommandBuffer.h */,
     17709                                D0CAAE9A216824A6001C91C7 /* WebMetalCommandBuffer.idl */,
     17710                                D045AD2321682475000A6E9B /* WebMetalCommandQueue.cpp */,
     17711                                D0CAAE9B216824A7001C91C7 /* WebMetalCommandQueue.h */,
     17712                                D02F854E21682A4A0088EE74 /* WebMetalCommandQueue.idl */,
     17713                                D0CAAE9C216824A7001C91C7 /* WebMetalComputeCommandEncoder.cpp */,
     17714                                D045AD2021682474000A6E9B /* WebMetalComputeCommandEncoder.h */,
     17715                                D02F855021682A560088EE74 /* WebMetalComputeCommandEncoder.idl */,
     17716                                D02F855B21682A940088EE74 /* WebMetalComputePipelineState.cpp */,
     17717                                D02F855121682A560088EE74 /* WebMetalComputePipelineState.h */,
     17718                                D02F858321682AA60088EE74 /* WebMetalComputePipelineState.idl */,
     17719                                D02F858421682AA60088EE74 /* WebMetalDepthStencilDescriptor.cpp */,
     17720                                D02F855521682A920088EE74 /* WebMetalDepthStencilDescriptor.h */,
     17721                                D02F857821682AA10088EE74 /* WebMetalDepthStencilDescriptor.idl */,
     17722                                D02F856521682A990088EE74 /* WebMetalDepthStencilState.cpp */,
     17723                                D02F856421682A980088EE74 /* WebMetalDepthStencilState.h */,
     17724                                D02F857721682AA10088EE74 /* WebMetalDepthStencilState.idl */,
     17725                                D02F857F21682AA40088EE74 /* WebMetalDrawable.cpp */,
     17726                                D02F857621682AA00088EE74 /* WebMetalDrawable.h */,
     17727                                D02F856F21682A9D0088EE74 /* WebMetalDrawable.idl */,
     17728                                D02F857021682A9E0088EE74 /* WebMetalEnums.cpp */,
     17729                                D02F857521682AA00088EE74 /* WebMetalEnums.h */,
     17730                                D02F857421682A9F0088EE74 /* WebMetalEnums.idl */,
     17731                                D02F857921682AA20088EE74 /* WebMetalFunction.cpp */,
     17732                                D02F857A21682AA20088EE74 /* WebMetalFunction.h */,
     17733                                D02F858821682AA80088EE74 /* WebMetalFunction.idl */,
     17734                                D02F857B21682AA20088EE74 /* WebMetalLibrary.cpp */,
     17735                                D02F856C21682A9C0088EE74 /* WebMetalLibrary.h */,
     17736                                D02F857221682A9E0088EE74 /* WebMetalLibrary.idl */,
     17737                                D02F856221682A980088EE74 /* WebMetalRenderCommandEncoder.cpp */,
     17738                                D02F856321682A980088EE74 /* WebMetalRenderCommandEncoder.h */,
     17739                                D02F858121682AA50088EE74 /* WebMetalRenderCommandEncoder.idl */,
     17740                                D02F858721682AA70088EE74 /* WebMetalRenderingContext.cpp */,
     17741                                D02F855421682A910088EE74 /* WebMetalRenderingContext.h */,
     17742                                D02F855A21682A940088EE74 /* WebMetalRenderingContext.idl */,
     17743                                D02F857121682A9E0088EE74 /* WebMetalRenderPassAttachmentDescriptor.cpp */,
     17744                                D02F855721682A930088EE74 /* WebMetalRenderPassAttachmentDescriptor.h */,
     17745                                D02F856121682A970088EE74 /* WebMetalRenderPassAttachmentDescriptor.idl */,
     17746                                D02F855921682A940088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.cpp */,
     17747                                D02F855D21682A950088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.h */,
     17748                                D02F856021682A970088EE74 /* WebMetalRenderPassColorAttachmentDescriptor.idl */,
     17749                                D02F856921682A9B0088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.cpp */,
     17750                                D02F857D21682AA30088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.h */,
     17751                                D02F856821682A9A0088EE74 /* WebMetalRenderPassDepthAttachmentDescriptor.idl */,
     17752                                D02F855321682A910088EE74 /* WebMetalRenderPassDescriptor.cpp */,
     17753                                D02F856B21682A9C0088EE74 /* WebMetalRenderPassDescriptor.h */,
     17754                                D02F857E21682AA40088EE74 /* WebMetalRenderPassDescriptor.idl */,
     17755                                D02F856621682A990088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.cpp */,
     17756                                D02F858521682AA70088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.h */,
     17757                                D02F858621682AA70088EE74 /* WebMetalRenderPipelineColorAttachmentDescriptor.idl */,
     17758                                D02F855E21682A960088EE74 /* WebMetalRenderPipelineDescriptor.cpp */,
     17759                                D02F857C21682AA30088EE74 /* WebMetalRenderPipelineDescriptor.h */,
     17760                                D02F858021682AA40088EE74 /* WebMetalRenderPipelineDescriptor.idl */,
     17761                                D02F855F21682A960088EE74 /* WebMetalRenderPipelineState.cpp */,
     17762                                D02F855221682A910088EE74 /* WebMetalRenderPipelineState.h */,
     17763                                D02F856721682A9A0088EE74 /* WebMetalRenderPipelineState.idl */,
     17764                                D02F856D21682A9C0088EE74 /* WebMetalSize.h */,
     17765                                D02F855621682A920088EE74 /* WebMetalSize.idl */,
     17766                                D02F858221682AA50088EE74 /* WebMetalTexture.cpp */,
     17767                                D02F857321682A9F0088EE74 /* WebMetalTexture.h */,
     17768                                D02F855821682A930088EE74 /* WebMetalTexture.idl */,
     17769                                D02F856E21682A9D0088EE74 /* WebMetalTextureDescriptor.cpp */,
     17770                                D02F856A21682A9B0088EE74 /* WebMetalTextureDescriptor.h */,
     17771                                D02F855C21682A950088EE74 /* WebMetalTextureDescriptor.idl */,
    1763417772                        );
    1763517773                        path = canvas;
    … …  
    2404124179                                49FFBF3D11C93EE3006A7118 /* WebGLLayer.h */,
    2404224180                                49FFBF3E11C93EE3006A7118 /* WebGLLayer.mm */,
    24043                                 316BDB8A1E6E153000DE0D5A /* WebGPULayer.h */,
    24044                                 316BDB891E6E153000DE0D5A /* WebGPULayer.mm */,
     24181                                316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */,
     24182                                D045AD1D2168230B000A6E9B /* WebMetalLayer.mm */,
    2404524183                        );
    2404624184                        path = cocoa;
    … …  
    2413424272                                46BCBBC02085007F00710638 /* JSRemoteDOMWindowBase.h */,
    2413524273                                931AE3B81FB80EAE00F5EFB2 /* JSValueInWrappedObject.h */,
     24274                                D045AD1F21682449000A6E9B /* JSWebMetalRenderingContextCustom.cpp */,
     24275                                D045AD1E21682449000A6E9B /* JSWebMetalRenderPassAttachmentDescriptorCustom.cpp */,
    2413624276                                BCBFB53A0DCD29CF0019B3E5 /* JSWindowProxy.cpp */,
    2413724277                                BCBFB53B0DCD29CF0019B3E5 /* JSWindowProxy.h */,
    … …  
    3111531255                                6F995A261A7078B100A735F4 /* WebGLVertexArrayObject.h in Headers */,
    3111631256                                77A17A7812F28642004E02F6 /* WebGLVertexArrayObjectOES.h in Headers */,
    31117                                 316BDB8C1E6E153000DE0D5A /* WebGPULayer.h in Headers */,
    3111831257                                A5B81CB71FAA44620037D1E6 /* WebHeapAgent.h in Headers */,
    3111931258                                A5840E25187B8AC200843B10 /* WebInjectedScriptHost.h in Headers */,
    … …  
    3113731276                                0709D7951AE55A29004E42F8 /* WebMediaSessionManagerClient.h in Headers */,
    3113831277                                0709D7931AE5557E004E42F8 /* WebMediaSessionManagerMac.h in Headers */,
     31278                                316BDB8C1E6E153000DE0D5A /* WebMetalLayer.h in Headers */,
    3113931279                                E1A3162D134BC32D007C9A4F /* WebNSAttributedStringExtras.h in Headers */,
    3114031280                                CD5896E21CD2B15100B3BCC8 /* WebPlaybackControlsManager.h in Headers */,

  • trunk/Source/WebCore/bindings/js/JSWebMetalRenderPassAttachmentDescriptorCustom.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "JSWebGPURenderPassAttachmentDescriptor.h"
     27#include "JSWebMetalRenderPassAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "JSDOMBinding.h"
    32 #include "JSWebGPURenderPassColorAttachmentDescriptor.h"
    33 #include "JSWebGPURenderPassDepthAttachmentDescriptor.h"
    34 #include "WebGPURenderPassColorAttachmentDescriptor.h"
    35 #include "WebGPURenderPassDepthAttachmentDescriptor.h"
     32#include "JSWebMetalRenderPassColorAttachmentDescriptor.h"
     33#include "JSWebMetalRenderPassDepthAttachmentDescriptor.h"
     34#include "WebMetalRenderPassColorAttachmentDescriptor.h"
     35#include "WebMetalRenderPassDepthAttachmentDescriptor.h"
    3636
    3737namespace WebCore {
    3838
    39 JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject* globalObject, Ref<WebGPURenderPassAttachmentDescriptor>&& object)
     39JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject* globalObject, Ref<WebMetalRenderPassAttachmentDescriptor>&& object)
    4040{
    4141    if (object->isColorAttachmentDescriptor())
    42         return createWrapper<WebGPURenderPassColorAttachmentDescriptor>(globalObject, WTFMove(object));
    43     return createWrapper<WebGPURenderPassDepthAttachmentDescriptor>(globalObject, WTFMove(object));
     42        return createWrapper<WebMetalRenderPassColorAttachmentDescriptor>(globalObject, WTFMove(object));
     43    return createWrapper<WebMetalRenderPassDepthAttachmentDescriptor>(globalObject, WTFMove(object));
    4444}
    4545
    46 JSValue toJS(ExecState* state, JSDOMGlobalObject* globalObject, WebGPURenderPassAttachmentDescriptor& object)
     46JSValue toJS(ExecState* state, JSDOMGlobalObject* globalObject, WebMetalRenderPassAttachmentDescriptor& object)
    4747{
    4848    return wrap(state, globalObject, object);

  • trunk/Source/WebCore/bindings/js/JSWebMetalRenderingContextCustom.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "JSWebGPURenderingContext.h"
     27#include "JSWebMetalRenderingContext.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131
    … …  
    3333using namespace JSC;
    3434
    35 void JSWebGPURenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
     35void JSWebMetalRenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
    3636{
    3737    visitor.addOpaqueRoot(&wrapped());

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

    r236840 r236954  
    165165    macro(WebGL2RenderingContext) \
    166166    macro(WebGLVertexArrayObject) \
    167     macro(WebGPUBuffer) \
    168     macro(WebGPUCommandBuffer) \
    169     macro(WebGPUCommandQueue) \
    170     macro(WebGPUComputeCommandEncoder) \
    171     macro(WebGPUComputePipelineState) \
    172     macro(WebGPUDepthStencilDescriptor) \
    173     macro(WebGPUDepthStencilState) \
    174     macro(WebGPUDrawable) \
    175     macro(WebGPUFunction) \
    176     macro(WebGPULibrary) \
    177     macro(WebGPURenderCommandEncoder) \
    178     macro(WebGPURenderPassAttachmentDescriptor) \
    179     macro(WebGPURenderPassColorAttachmentDescriptor) \
    180     macro(WebGPURenderPassDepthAttachmentDescriptor) \
    181     macro(WebGPURenderPassDescriptor) \
    182     macro(WebGPURenderPipelineColorAttachmentDescriptor) \
    183     macro(WebGPURenderPipelineDescriptor) \
    184     macro(WebGPURenderPipelineState) \
    185     macro(WebGPURenderingContext) \
    186     macro(WebGPUSize) \
    187     macro(WebGPUTexture) \
    188     macro(WebGPUTextureDescriptor) \
     167    macro(WebMetalBuffer) \
     168    macro(WebMetalCommandBuffer) \
     169    macro(WebMetalCommandQueue) \
     170    macro(WebMetalComputeCommandEncoder) \
     171    macro(WebMetalComputePipelineState) \
     172    macro(WebMetalDepthStencilDescriptor) \
     173    macro(WebMetalDepthStencilState) \
     174    macro(WebMetalDrawable) \
     175    macro(WebMetalFunction) \
     176    macro(WebMetalLibrary) \
     177    macro(WebMetalRenderCommandEncoder) \
     178    macro(WebMetalRenderPassAttachmentDescriptor) \
     179    macro(WebMetalRenderPassColorAttachmentDescriptor) \
     180    macro(WebMetalRenderPassDepthAttachmentDescriptor) \
     181    macro(WebMetalRenderPassDescriptor) \
     182    macro(WebMetalRenderPipelineColorAttachmentDescriptor) \
     183    macro(WebMetalRenderPipelineDescriptor) \
     184    macro(WebMetalRenderPipelineState) \
     185    macro(WebMetalRenderingContext) \
     186    macro(WebMetalSize) \
     187    macro(WebMetalTexture) \
     188    macro(WebMetalTextureDescriptor) \
    189189    macro(WebKitMediaKeyError) \
    190190    macro(WebKitMediaKeyMessageEvent) \

  • trunk/Source/WebCore/dom/Document.cpp

    r236888 r236954  
    310310#include "WebGL2RenderingContext.h"
    311311#endif
    312 #if ENABLE(WEBGPU)
    313 #include "WebGPURenderingContext.h"
     312#if ENABLE(WEBMETAL)
     313#include "WebMetalRenderingContext.h"
    314314#endif
    315315
    … …  
    58305830        return RenderingContext { RefPtr<WebGL2RenderingContext> { &downcast<WebGL2RenderingContext>(*context) } };
    58315831#endif
    5832 #if ENABLE(WEBGPU)
    5833     if (is<WebGPURenderingContext>(*context))
    5834         return RenderingContext { RefPtr<WebGPURenderingContext> { &downcast<WebGPURenderingContext>(*context) } };
     5832#if ENABLE(WEBMETAL)
     5833    if (is<WebMetalRenderingContext>(*context))
     5834        return RenderingContext { RefPtr<WebMetalRenderingContext> { &downcast<WebMetalRenderingContext>(*context) } };
    58355835#endif
    58365836

  • trunk/Source/WebCore/dom/Document.h

    r236888 r236954  
    191191class WebGL2RenderingContext;
    192192class WebGLRenderingContext;
    193 class WebGPURenderingContext;
     193class WebMetalRenderingContext;
    194194class WindowProxy;
    195195class XPathEvaluator;
    … …  
    318318    RefPtr<WebGL2RenderingContext>,
    319319#endif
    320 #if ENABLE(WEBGPU)
    321     RefPtr<WebGPURenderingContext>,
     320#if ENABLE(WEBMETAL)
     321    RefPtr<WebMetalRenderingContext>,
    322322#endif
    323323    RefPtr<ImageBitmapRenderingContext>,

  • trunk/Source/WebCore/dom/Document.idl

    r236550 r236954  
    2626    WebGL2RenderingContext or
    2727#endif
    28 #if defined(ENABLE_WEBGPU) && ENABLE_WEBGPU
    29     WebGPURenderingContext or
     28#if defined(ENABLE_WEBMETAL) && ENABLE_WEBMETAL
     29    WebMetalRenderingContext or
    3030#endif
    3131    ImageBitmapRenderingContext or

  • trunk/Source/WebCore/html/HTMLCanvasElement.cpp

    r236074 r236954  
    7676#endif
    7777
    78 #if ENABLE(WEBGPU)
    79 #include "WebGPURenderingContext.h"
     78#if ENABLE(WEBMETAL)
     79#include "WebMetalRenderingContext.h"
    8080#endif
    8181
    … …  
    239239#endif
    240240
    241 #if ENABLE(WEBGPU)
    242         if (m_context->isWebGPU()) {
    243             if (!isWebGPUType(contextId))
     241#if ENABLE(WEBMETAL)
     242        if (m_context->isWebMetal()) {
     243            if (!isWebMetalType(contextId))
    244244                return std::optional<RenderingContext> { std::nullopt };
    245             return std::optional<RenderingContext> { RefPtr<WebGPURenderingContext> { &downcast<WebGPURenderingContext>(*m_context) } };
     245            return std::optional<RenderingContext> { RefPtr<WebMetalRenderingContext> { &downcast<WebMetalRenderingContext>(*m_context) } };
    246246        }
    247247#endif
    … …  
    288288#endif
    289289
    290 #if ENABLE(WEBGPU)
    291     if (isWebGPUType(contextId)) {
    292         auto context = createContextWebGPU(contextId);
     290#if ENABLE(WEBMETAL)
     291    if (isWebMetalType(contextId)) {
     292        auto context = createContextWebMetal(contextId);
    293293        if (!context)
    294294            return std::optional<RenderingContext> { std::nullopt };
    295         return std::optional<RenderingContext> { RefPtr<WebGPURenderingContext> { context } };
     295        return std::optional<RenderingContext> { RefPtr<WebMetalRenderingContext> { context } };
    296296    }
    297297#endif
    … …  
    308308        return getContextBitmapRenderer(type);
    309309
    310 #if ENABLE(WEBGPU)
    311     if (HTMLCanvasElement::isWebGPUType(type) && RuntimeEnabledFeatures::sharedFeatures().webGPUEnabled())
    312         return getContextWebGPU(type);
     310#if ENABLE(WEBMETAL)
     311    if (HTMLCanvasElement::isWebMetalType(type) && RuntimeEnabledFeatures::sharedFeatures().webMetalEnabled())
     312        return getContextWebMetal(type);
    313313#endif
    314314
    … …  
    438438#endif // ENABLE(WEBGL)
    439439
    440 #if ENABLE(WEBGPU)
    441 
    442 bool HTMLCanvasElement::isWebGPUType(const String& type)
    443 {
    444     return type == "webgpu";
    445 }
    446 
    447 WebGPURenderingContext* HTMLCanvasElement::createContextWebGPU(const String& type)
    448 {
    449     ASSERT_UNUSED(type, HTMLCanvasElement::isWebGPUType(type));
     440#if ENABLE(WEBMETAL)
     441
     442bool HTMLCanvasElement::isWebMetalType(const String& type)
     443{
     444    return type == "webmetal";
     445}
     446
     447WebMetalRenderingContext* HTMLCanvasElement::createContextWebMetal(const String& type)
     448{
     449    ASSERT_UNUSED(type, HTMLCanvasElement::isWebMetalType(type));
    450450    ASSERT(!m_context);
    451451
    452     if (!RuntimeEnabledFeatures::sharedFeatures().webGPUEnabled())
     452    if (!RuntimeEnabledFeatures::sharedFeatures().webMetalEnabled())
    453453        return nullptr;
    454454
    455     m_context = WebGPURenderingContext::create(*this);
     455    m_context = WebMetalRenderingContext::create(*this);
    456456    if (m_context) {
    457457        // Need to make sure a RenderLayer and compositing layer get created for the Canvas.
    … …  
    459459    }
    460460
    461     return static_cast<WebGPURenderingContext*>(m_context.get());
    462 }
    463 
    464 WebGPURenderingContext* HTMLCanvasElement::getContextWebGPU(const String& type)
    465 {
    466     ASSERT_UNUSED(type, HTMLCanvasElement::isWebGPUType(type));
    467 
    468     if (!RuntimeEnabledFeatures::sharedFeatures().webGPUEnabled())
     461    return static_cast<WebMetalRenderingContext*>(m_context.get());
     462}
     463
     464WebMetalRenderingContext* HTMLCanvasElement::getContextWebMetal(const String& type)
     465{
     466    ASSERT_UNUSED(type, HTMLCanvasElement::isWebMetalType(type));
     467
     468    if (!RuntimeEnabledFeatures::sharedFeatures().webMetalEnabled())
    469469        return nullptr;
    470470
    471     if (m_context && !m_context->isWebGPU())
     471    if (m_context && !m_context->isWebMetal())
    472472        return nullptr;
    473473
    474474    if (!m_context)
    475         return createContextWebGPU(type);
    476     return static_cast<WebGPURenderingContext*>(m_context.get());
     475        return createContextWebMetal(type);
     476    return static_cast<WebMetalRenderingContext*>(m_context.get());
    477477}
    478478#endif

  • trunk/Source/WebCore/html/HTMLCanvasElement.h

    r229694 r236954  
    5252class MediaStream;
    5353class WebGLRenderingContextBase;
    54 class WebGPURenderingContext;
     54class WebMetalRenderingContext;
    5555struct UncachedString;
    5656
    … …  
    9898    WebGLRenderingContextBase* getContextWebGL(const String&, WebGLContextAttributes&& = { });
    9999#endif
    100 #if ENABLE(WEBGPU)
    101     static bool isWebGPUType(const String&);
    102     WebGPURenderingContext* createContextWebGPU(const String&);
    103     WebGPURenderingContext* getContextWebGPU(const String&);
     100#if ENABLE(WEBMETAL)
     101    static bool isWebMetalType(const String&);
     102    WebMetalRenderingContext* createContextWebMetal(const String&);
     103    WebMetalRenderingContext* getContextWebMetal(const String&);
    104104#endif
    105105

  • trunk/Source/WebCore/html/HTMLCanvasElement.idl

    r222997 r236954  
    3232    WebGL2RenderingContext or
    3333#endif
    34 #if defined(ENABLE_WEBGPU) && ENABLE_WEBGPU
    35     WebGPURenderingContext or
     34#if defined(ENABLE_WEBMETAL) && ENABLE_WEBMETAL
     35    WebMetalRenderingContext or
    3636#endif
    3737    ImageBitmapRenderingContext or

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext.h

    r230229 r236954  
    5656    virtual bool isWebGL2() const { return false; }
    5757    bool isWebGL() const { return isWebGL1() || isWebGL2(); }
    58 #if ENABLE(WEBGPU)
    59     virtual bool isWebGPU() const { return false; }
     58#if ENABLE(WEBMETAL)
     59    virtual bool isWebMetal() const { return false; }
    6060#endif
    6161    virtual bool isGPUBased() const { return false; }

  • trunk/Source/WebCore/html/canvas/WebMetalBuffer.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUBuffer.h"
     27#include "WebMetalBuffer.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131namespace WebCore {
    3232
    33 RefPtr<WebGPUBuffer> WebGPUBuffer::create(GPUBuffer&& buffer)
     33RefPtr<WebMetalBuffer> WebMetalBuffer::create(GPUBuffer&& buffer)
    3434{
    3535    // FIXME: Consider returning null rather than a buffer with length 0 and contents null when creation fails.
    36     return adoptRef(*new WebGPUBuffer(WTFMove(buffer)));
     36    return adoptRef(*new WebMetalBuffer(WTFMove(buffer)));
    3737}
    3838
    39 WebGPUBuffer::WebGPUBuffer(GPUBuffer&& buffer)
     39WebMetalBuffer::WebMetalBuffer(GPUBuffer&& buffer)
    4040    : m_buffer { WTFMove(buffer) }
    4141{

  • trunk/Source/WebCore/html/canvas/WebMetalBuffer.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUBuffer.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPUBuffer : public RefCounted<WebGPUBuffer> {
     36class WebMetalBuffer : public RefCounted<WebMetalBuffer> {
    3737public:
    38     static RefPtr<WebGPUBuffer> create(GPUBuffer&&);
     38    static RefPtr<WebMetalBuffer> create(GPUBuffer&&);
    3939
    4040    unsigned length() const { return m_buffer.length(); }
    … …  
    4444
    4545private:
    46     explicit WebGPUBuffer(GPUBuffer&&);
     46    explicit WebMetalBuffer(GPUBuffer&&);
    4747
    4848    GPUBuffer m_buffer;

  • trunk/Source/WebCore/html/canvas/WebMetalBuffer.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPUBuffer {
     30] interface WebMetalBuffer {
    3131
    3232    readonly attribute unsigned long length;

  • trunk/Source/WebCore/html/canvas/WebMetalCommandBuffer.cpp

    r236953 r236954  
    2626
    2727#include "config.h"
    28 #include "WebGPUCommandBuffer.h"
     28#include "WebMetalCommandBuffer.h"
    2929
    30 #if ENABLE(WEBGPU)
     30#if ENABLE(WEBMETAL)
    3131
    3232#include "GPUCommandBuffer.h"
    3333#include "GPUCommandQueue.h"
    3434#include "Logging.h"
    35 #include "WebGPUComputeCommandEncoder.h"
    36 #include "WebGPUDrawable.h"
    37 #include "WebGPURenderCommandEncoder.h"
    38 #include "WebGPURenderPassDescriptor.h"
     35#include "WebMetalComputeCommandEncoder.h"
     36#include "WebMetalDrawable.h"
     37#include "WebMetalRenderCommandEncoder.h"
     38#include "WebMetalRenderPassDescriptor.h"
    3939
    4040namespace WebCore {
    4141
    42 Ref<WebGPUCommandBuffer> WebGPUCommandBuffer::create(const GPUCommandQueue& queue)
     42Ref<WebMetalCommandBuffer> WebMetalCommandBuffer::create(const GPUCommandQueue& queue)
    4343{
    44     return adoptRef(*new WebGPUCommandBuffer(queue));
     44    return adoptRef(*new WebMetalCommandBuffer(queue));
    4545}
    4646
    47 WebGPUCommandBuffer::WebGPUCommandBuffer(const GPUCommandQueue& queue)
     47WebMetalCommandBuffer::WebMetalCommandBuffer(const GPUCommandQueue& queue)
    4848    : m_buffer { queue, [this] () { m_completed.resolve(); } }
    4949{
    50     LOG(WebGPU, "WebGPUCommandBuffer::WebGPUCommandBuffer()");
     50    LOG(WebMetal, "WebMetalCommandBuffer::WebMetalCommandBuffer()");
    5151}
    5252
    53 WebGPUCommandBuffer::~WebGPUCommandBuffer()
     53WebMetalCommandBuffer::~WebMetalCommandBuffer()
    5454{
    55     LOG(WebGPU, "WebGPUCommandBuffer::~WebGPUCommandBuffer()");
     55    LOG(WebMetal, "WebMetalCommandBuffer::~WebMetalCommandBuffer()");
    5656}
    5757
    58 void WebGPUCommandBuffer::commit()
     58void WebMetalCommandBuffer::commit()
    5959{
    60     LOG(WebGPU, "WebGPUCommandBuffer::commit()");
     60    LOG(WebMetal, "WebMetalCommandBuffer::commit()");
    6161    m_buffer.commit();
    6262}
    6363
    64 void WebGPUCommandBuffer::presentDrawable(WebGPUDrawable& drawable)
     64void WebMetalCommandBuffer::presentDrawable(WebMetalDrawable& drawable)
    6565{
    66     LOG(WebGPU, "WebGPUCommandBuffer::presentDrawable()");
     66    LOG(WebMetal, "WebMetalCommandBuffer::presentDrawable()");
    6767    m_buffer.presentDrawable(drawable.drawable());
    6868}
    6969
    70 Ref<WebGPURenderCommandEncoder> WebGPUCommandBuffer::createRenderCommandEncoderWithDescriptor(WebGPURenderPassDescriptor& descriptor)
     70Ref<WebMetalRenderCommandEncoder> WebMetalCommandBuffer::createRenderCommandEncoderWithDescriptor(WebMetalRenderPassDescriptor& descriptor)
    7171{
    72     return WebGPURenderCommandEncoder::create(GPURenderCommandEncoder { m_buffer, descriptor.descriptor() });
     72    return WebMetalRenderCommandEncoder::create(GPURenderCommandEncoder { m_buffer, descriptor.descriptor() });
    7373}
    7474
    75 Ref<WebGPUComputeCommandEncoder> WebGPUCommandBuffer::createComputeCommandEncoder()
     75Ref<WebMetalComputeCommandEncoder> WebMetalCommandBuffer::createComputeCommandEncoder()
    7676{
    77     return WebGPUComputeCommandEncoder::create(GPUComputeCommandEncoder { m_buffer });
     77    return WebMetalComputeCommandEncoder::create(GPUComputeCommandEncoder { m_buffer });
    7878}
    7979
    80 DOMPromiseProxy<IDLVoid>& WebGPUCommandBuffer::completed()
     80DOMPromiseProxy<IDLVoid>& WebMetalCommandBuffer::completed()
    8181{
    8282    return m_completed;

  • trunk/Source/WebCore/html/canvas/WebMetalCommandBuffer.h

    r236953 r236954  
    2727#pragma once
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "DOMPromiseProxy.h"
    … …  
    3636namespace WebCore {
    3737
    38 class WebGPUComputeCommandEncoder;
    39 class WebGPUDrawable;
    40 class WebGPURenderCommandEncoder;
    41 class WebGPURenderPassDescriptor;
     38class WebMetalComputeCommandEncoder;
     39class WebMetalDrawable;
     40class WebMetalRenderCommandEncoder;
     41class WebMetalRenderPassDescriptor;
    4242
    43 class WebGPUCommandBuffer : public RefCounted<WebGPUCommandBuffer> {
     43class WebMetalCommandBuffer : public RefCounted<WebMetalCommandBuffer> {
    4444public:
    45     ~WebGPUCommandBuffer();
    46     static Ref<WebGPUCommandBuffer> create(const GPUCommandQueue&);
     45    ~WebMetalCommandBuffer();
     46    static Ref<WebMetalCommandBuffer> create(const GPUCommandQueue&);
    4747
    4848    void commit();
    49     void presentDrawable(WebGPUDrawable&);
     49    void presentDrawable(WebMetalDrawable&);
    5050
    51     Ref<WebGPURenderCommandEncoder> createRenderCommandEncoderWithDescriptor(WebGPURenderPassDescriptor&);
    52     Ref<WebGPUComputeCommandEncoder> createComputeCommandEncoder();
     51    Ref<WebMetalRenderCommandEncoder> createRenderCommandEncoderWithDescriptor(WebMetalRenderPassDescriptor&);
     52    Ref<WebMetalComputeCommandEncoder> createComputeCommandEncoder();
    5353
    5454    DOMPromiseProxy<IDLVoid>& completed();
    … …  
    5757
    5858private:
    59     explicit WebGPUCommandBuffer(const GPUCommandQueue&);
     59    explicit WebMetalCommandBuffer(const GPUCommandQueue&);
    6060
    6161    GPUCommandBuffer m_buffer;

  • trunk/Source/WebCore/html/canvas/WebMetalCommandBuffer.idl

    r236953 r236954  
    2626
    2727[
    28     Conditional=WEBGPU,
    29     EnabledAtRuntime=WebGPU,
     28    Conditional=WEBMETAL,
     29    EnabledAtRuntime=WebMetal,
    3030    ImplementationLacksVTable
    31 ] interface WebGPUCommandBuffer {
    32     WebGPURenderCommandEncoder createRenderCommandEncoderWithDescriptor(WebGPURenderPassDescriptor descriptor);
    33     WebGPUComputeCommandEncoder createComputeCommandEncoder();
     31] interface WebMetalCommandBuffer {
     32    WebMetalRenderCommandEncoder createRenderCommandEncoderWithDescriptor(WebMetalRenderPassDescriptor descriptor);
     33    WebMetalComputeCommandEncoder createComputeCommandEncoder();
    3434    void commit();
    35     void presentDrawable(WebGPUDrawable drawable);
     35    void presentDrawable(WebMetalDrawable drawable);
    3636    readonly attribute Promise<void> completed;
    3737};

  • trunk/Source/WebCore/html/canvas/WebMetalCommandQueue.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUCommandQueue.h"
     27#include "WebMetalCommandQueue.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    31 #include "WebGPUCommandBuffer.h"
     31#include "WebMetalCommandBuffer.h"
    3232
    3333namespace WebCore {
    3434
    35 Ref<WebGPUCommandQueue> WebGPUCommandQueue::create(GPUCommandQueue&& queue)
     35Ref<WebMetalCommandQueue> WebMetalCommandQueue::create(GPUCommandQueue&& queue)
    3636{
    37     return adoptRef(*new WebGPUCommandQueue(WTFMove(queue)));
     37    return adoptRef(*new WebMetalCommandQueue(WTFMove(queue)));
    3838}
    3939
    40 WebGPUCommandQueue::WebGPUCommandQueue(GPUCommandQueue&& queue)
     40WebMetalCommandQueue::WebMetalCommandQueue(GPUCommandQueue&& queue)
    4141    : m_queue { WTFMove(queue) }
    4242{
    4343}
    4444
    45 WebGPUCommandQueue::~WebGPUCommandQueue() = default;
     45WebMetalCommandQueue::~WebMetalCommandQueue() = default;
    4646
    47 Ref<WebGPUCommandBuffer> WebGPUCommandQueue::createCommandBuffer()
     47Ref<WebMetalCommandBuffer> WebMetalCommandQueue::createCommandBuffer()
    4848{
    49     return WebGPUCommandBuffer::create(m_queue);
     49    return WebMetalCommandBuffer::create(m_queue);
    5050}
    5151

  • trunk/Source/WebCore/html/canvas/WebMetalCommandQueue.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUCommandQueue.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPUCommandBuffer;
     36class WebMetalCommandBuffer;
    3737
    38 class WebGPUCommandQueue : public RefCounted<WebGPUCommandQueue> {
     38class WebMetalCommandQueue : public RefCounted<WebMetalCommandQueue> {
    3939public:
    40     ~WebGPUCommandQueue();
    41     static Ref<WebGPUCommandQueue> create(GPUCommandQueue&&);
     40    ~WebMetalCommandQueue();
     41    static Ref<WebMetalCommandQueue> create(GPUCommandQueue&&);
    4242
    4343    String label() const { return m_queue.label(); }
    4444    void setLabel(const String& label) { m_queue.setLabel(label); }
    4545
    46     Ref<WebGPUCommandBuffer> createCommandBuffer();
     46    Ref<WebMetalCommandBuffer> createCommandBuffer();
    4747
    4848private:
    49     explicit WebGPUCommandQueue(GPUCommandQueue&&);
     49    explicit WebMetalCommandQueue(GPUCommandQueue&&);
    5050
    5151    GPUCommandQueue m_queue;

  • trunk/Source/WebCore/html/canvas/WebMetalCommandQueue.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPUCommandQueue {
     30] interface WebMetalCommandQueue {
    3131
    3232    attribute DOMString label;
    3333
    34     WebGPUCommandBuffer createCommandBuffer();
     34    WebMetalCommandBuffer createCommandBuffer();
    3535
    3636};

  • trunk/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUComputeCommandEncoder.h"
     27#include "WebMetalComputeCommandEncoder.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPUCommandBuffer.h"
    3232#include "GPUComputeCommandEncoder.h"
    3333#include "GPUSize.h"
    34 #include "WebGPUBuffer.h"
    35 #include "WebGPUCommandBuffer.h"
    36 #include "WebGPUComputePipelineState.h"
     34#include "WebMetalBuffer.h"
     35#include "WebMetalCommandBuffer.h"
     36#include "WebMetalComputePipelineState.h"
    3737
    3838namespace WebCore {
    3939
    40 static inline GPUSize GPUSizeMake(WebGPUSize size)
     40static inline GPUSize GPUSizeMake(WebMetalSize size)
    4141{
    4242    return { size.width, size.height, size.depth };
    4343}
    4444
    45 Ref<WebGPUComputeCommandEncoder> WebGPUComputeCommandEncoder::create(GPUComputeCommandEncoder&& encoder)
     45Ref<WebMetalComputeCommandEncoder> WebMetalComputeCommandEncoder::create(GPUComputeCommandEncoder&& encoder)
    4646{
    47     return adoptRef(*new WebGPUComputeCommandEncoder(WTFMove(encoder)));
     47    return adoptRef(*new WebMetalComputeCommandEncoder(WTFMove(encoder)));
    4848}
    4949   
    50 WebGPUComputeCommandEncoder::WebGPUComputeCommandEncoder(GPUComputeCommandEncoder&& encoder)
     50WebMetalComputeCommandEncoder::WebMetalComputeCommandEncoder(GPUComputeCommandEncoder&& encoder)
    5151    : m_encoder { WTFMove(encoder) }
    5252{
    5353}
    5454
    55 void WebGPUComputeCommandEncoder::setComputePipelineState(WebGPUComputePipelineState& pipelineState)
     55void WebMetalComputeCommandEncoder::setComputePipelineState(WebMetalComputePipelineState& pipelineState)
    5656{
    5757    m_encoder.setComputePipelineState(pipelineState.state());
    5858}
    5959
    60 void WebGPUComputeCommandEncoder::setBuffer(WebGPUBuffer& buffer, unsigned offset, unsigned index)
     60void WebMetalComputeCommandEncoder::setBuffer(WebMetalBuffer& buffer, unsigned offset, unsigned index)
    6161{
    6262    m_encoder.setBuffer(buffer.buffer(), offset, index);
    6363}
    6464
    65 void WebGPUComputeCommandEncoder::dispatch(WebGPUSize threadgroupsPerGrid, WebGPUSize threadsPerThreadgroup)
     65void WebMetalComputeCommandEncoder::dispatch(WebMetalSize threadgroupsPerGrid, WebMetalSize threadsPerThreadgroup)
    6666{
    6767    m_encoder.dispatch(GPUSizeMake(threadgroupsPerGrid), GPUSizeMake(threadsPerThreadgroup));
    6868}
    6969
    70 void WebGPUComputeCommandEncoder::endEncoding()
     70void WebMetalComputeCommandEncoder::endEncoding()
    7171{
    7272    m_encoder.endEncoding();

  • trunk/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUComputeCommandEncoder.h"
    31 #include "WebGPUSize.h"
     31#include "WebMetalSize.h"
    3232#include <wtf/Ref.h>
    3333#include <wtf/RefCounted.h>
    … …  
    3535namespace WebCore {
    3636
    37 class WebGPUBuffer;
    38 class WebGPUComputePipelineState;
     37class WebMetalBuffer;
     38class WebMetalComputePipelineState;
    3939
    40 class WebGPUComputeCommandEncoder : public RefCounted<WebGPUComputeCommandEncoder> {
     40class WebMetalComputeCommandEncoder : public RefCounted<WebMetalComputeCommandEncoder> {
    4141public:
    42     static Ref<WebGPUComputeCommandEncoder> create(GPUComputeCommandEncoder&&);
     42    static Ref<WebMetalComputeCommandEncoder> create(GPUComputeCommandEncoder&&);
    4343
    44     void setComputePipelineState(WebGPUComputePipelineState&);
    45     void setBuffer(WebGPUBuffer&, unsigned, unsigned);
    46     void dispatch(WebGPUSize, WebGPUSize);
     44    void setComputePipelineState(WebMetalComputePipelineState&);
     45    void setBuffer(WebMetalBuffer&, unsigned, unsigned);
     46    void dispatch(WebMetalSize, WebMetalSize);
    4747    void endEncoding();
    4848
    4949private:
    50     explicit WebGPUComputeCommandEncoder(GPUComputeCommandEncoder&&);
     50    explicit WebMetalComputeCommandEncoder(GPUComputeCommandEncoder&&);
    5151
    5252    GPUComputeCommandEncoder m_encoder;

  • trunk/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPUComputeCommandEncoder {
     30] interface WebMetalComputeCommandEncoder {
    3131
    32     void setComputePipelineState(WebGPUComputePipelineState pipelineState);
    33     void setBuffer(WebGPUBuffer buffer, unsigned long offset, unsigned long index);
    34     void dispatch(WebGPUSize threadgroupsPerGrid, WebGPUSize threadsPerThreadgroup);
     32    void setComputePipelineState(WebMetalComputePipelineState pipelineState);
     33    void setBuffer(WebMetalBuffer buffer, unsigned long offset, unsigned long index);
     34    void dispatch(WebMetalSize threadgroupsPerGrid, WebMetalSize threadsPerThreadgroup);
    3535
    3636    void endEncoding();

  • trunk/Source/WebCore/html/canvas/WebMetalComputePipelineState.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUComputePipelineState.h"
     27#include "WebMetalComputePipelineState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131namespace WebCore {
    3232
    33 Ref<WebGPUComputePipelineState> WebGPUComputePipelineState::create(GPUComputePipelineState&& state)
     33Ref<WebMetalComputePipelineState> WebMetalComputePipelineState::create(GPUComputePipelineState&& state)
    3434{
    35     return adoptRef(*new WebGPUComputePipelineState(WTFMove(state)));
     35    return adoptRef(*new WebMetalComputePipelineState(WTFMove(state)));
    3636}
    3737
    38 WebGPUComputePipelineState::WebGPUComputePipelineState(GPUComputePipelineState&& state)
     38WebMetalComputePipelineState::WebMetalComputePipelineState(GPUComputePipelineState&& state)
    3939    : m_state { WTFMove(state) }
    4040{

  • trunk/Source/WebCore/html/canvas/WebMetalComputePipelineState.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUComputePipelineState.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPUFunction;
     36class WebMetalFunction;
    3737
    38 class WebGPUComputePipelineState : public RefCounted<WebGPUComputePipelineState> {
     38class WebMetalComputePipelineState : public RefCounted<WebMetalComputePipelineState> {
    3939public:
    40     static Ref<WebGPUComputePipelineState> create(GPUComputePipelineState&&);
     40    static Ref<WebMetalComputePipelineState> create(GPUComputePipelineState&&);
    4141
    4242    GPUComputePipelineState& state() { return m_state; }
    4343
    4444private:
    45     explicit WebGPUComputePipelineState(GPUComputePipelineState&&);
     45    explicit WebMetalComputePipelineState(GPUComputePipelineState&&);
    4646
    4747    GPUComputePipelineState m_state;

  • trunk/Source/WebCore/html/canvas/WebMetalComputePipelineState.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPUComputePipelineState {
     30] interface WebMetalComputePipelineState {
    3131};

  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUDepthStencilDescriptor.h"
     27#include "WebMetalDepthStencilDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131namespace WebCore {
    3232
    33 Ref<WebGPUDepthStencilDescriptor> WebGPUDepthStencilDescriptor::create()
     33Ref<WebMetalDepthStencilDescriptor> WebMetalDepthStencilDescriptor::create()
    3434{
    35     return adoptRef(*new WebGPUDepthStencilDescriptor);
     35    return adoptRef(*new WebMetalDepthStencilDescriptor);
    3636}
    3737
    38 bool WebGPUDepthStencilDescriptor::depthWriteEnabled() const
     38bool WebMetalDepthStencilDescriptor::depthWriteEnabled() const
    3939{
    4040    return m_descriptor.depthWriteEnabled();
    4141}
    4242
    43 void WebGPUDepthStencilDescriptor::setDepthWriteEnabled(bool newDepthWriteEnabled)
     43void WebMetalDepthStencilDescriptor::setDepthWriteEnabled(bool newDepthWriteEnabled)
    4444{
    4545    m_descriptor.setDepthWriteEnabled(newDepthWriteEnabled);
    4646}
    4747
    48 WebGPUCompareFunction WebGPUDepthStencilDescriptor::depthCompareFunction() const
     48WebMetalCompareFunction WebMetalDepthStencilDescriptor::depthCompareFunction() const
    4949{
    5050    return m_depthCompareFunction;
    5151}
    5252
    53 void WebGPUDepthStencilDescriptor::setDepthCompareFunction(CompareFunction newDepthCompareFunction)
     53void WebMetalDepthStencilDescriptor::setDepthCompareFunction(CompareFunction newDepthCompareFunction)
    5454{
    5555    m_depthCompareFunction = newDepthCompareFunction;

  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUDepthStencilDescriptor.h"
    31 #include "WebGPUEnums.h"
     31#include "WebMetalEnums.h"
    3232#include <wtf/Ref.h>
    3333#include <wtf/RefCounted.h>
    … …  
    3535namespace WebCore {
    3636
    37 class WebGPUDepthStencilDescriptor : public RefCounted<WebGPUDepthStencilDescriptor> {
     37class WebMetalDepthStencilDescriptor : public RefCounted<WebMetalDepthStencilDescriptor> {
    3838public:
    39     static Ref<WebGPUDepthStencilDescriptor> create();
     39    static Ref<WebMetalDepthStencilDescriptor> create();
    4040
    4141    bool depthWriteEnabled() const;
    4242    void setDepthWriteEnabled(bool);
    4343
    44     using CompareFunction = WebGPUCompareFunction;
     44    using CompareFunction = WebMetalCompareFunction;
    4545    CompareFunction depthCompareFunction() const;
    4646    void setDepthCompareFunction(CompareFunction);
    … …  
    4949
    5050private:
    51     WebGPUDepthStencilDescriptor() = default;
     51    WebMetalDepthStencilDescriptor() = default;
    5252
    5353    // FIXME: The default value of "Always" is defined both here and in the
    … …  
    5656    // there would be no need for a default value here.
    5757
    58     WebGPUCompareFunction m_depthCompareFunction { WebGPUCompareFunction::Always };
     58    WebMetalCompareFunction m_depthCompareFunction { WebMetalCompareFunction::Always };
    5959    GPUDepthStencilDescriptor m_descriptor;
    6060};

  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU
    29 ] enum WebGPUCompareFunction {
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal
     29] enum WebMetalCompareFunction {
    3030    "never",
    3131    "less",
    … …  
    4040[
    4141    Constructor,
    42     Conditional=WEBGPU,
    43     EnabledAtRuntime=WebGPU,
     42    Conditional=WEBMETAL,
     43    EnabledAtRuntime=WebMetal,
    4444    ImplementationLacksVTable
    45 ] interface WebGPUDepthStencilDescriptor {
     45] interface WebMetalDepthStencilDescriptor {
    4646
    47     attribute WebGPUCompareFunction depthCompareFunction;
     47    attribute WebMetalCompareFunction depthCompareFunction;
    4848    attribute boolean depthWriteEnabled;
    4949

  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilState.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUDepthStencilState.h"
     27#include "WebMetalDepthStencilState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    31 #include "WebGPUDepthStencilDescriptor.h"
     31#include "WebMetalDepthStencilDescriptor.h"
    3232#include <wtf/text/WTFString.h>
    3333
    3434namespace WebCore {
    3535
    36 Ref<WebGPUDepthStencilState> WebGPUDepthStencilState::create(GPUDepthStencilState&& state)
     36Ref<WebMetalDepthStencilState> WebMetalDepthStencilState::create(GPUDepthStencilState&& state)
    3737{
    38     return adoptRef(*new WebGPUDepthStencilState(WTFMove(state)));
     38    return adoptRef(*new WebMetalDepthStencilState(WTFMove(state)));
    3939}
    4040
    41 WebGPUDepthStencilState::WebGPUDepthStencilState(GPUDepthStencilState&& state)
     41WebMetalDepthStencilState::WebMetalDepthStencilState(GPUDepthStencilState&& state)
    4242    : m_state { WTFMove(state) }
    4343{
    4444}
    4545
    46 String WebGPUDepthStencilState::label() const
     46String WebMetalDepthStencilState::label() const
    4747{
    4848    return m_state.label();
    4949}
    5050
    51 void WebGPUDepthStencilState::setLabel(const String& label)
     51void WebMetalDepthStencilState::setLabel(const String& label)
    5252{
    5353    m_state.setLabel(label);

  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilState.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUDepthStencilState.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPUDepthStencilState : public RefCounted<WebGPUDepthStencilState> {
     36class WebMetalDepthStencilState : public RefCounted<WebMetalDepthStencilState> {
    3737public:
    38     static Ref<WebGPUDepthStencilState> create(GPUDepthStencilState&&);
     38    static Ref<WebMetalDepthStencilState> create(GPUDepthStencilState&&);
    3939
    4040    String label() const;
    … …  
    4444
    4545private:
    46     explicit WebGPUDepthStencilState(GPUDepthStencilState&&);
     46    explicit WebMetalDepthStencilState(GPUDepthStencilState&&);
    4747
    4848    GPUDepthStencilState m_state;

  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilState.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPURenderPipelineState {
     30] interface WebMetalDepthStencilState {
    3131
    3232    attribute DOMString label;

  • trunk/Source/WebCore/html/canvas/WebMetalDrawable.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUDrawable.h"
     27#include "WebMetalDrawable.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPUTexture.h"
    32 #include "WebGPUTexture.h"
     32#include "WebMetalTexture.h"
    3333
    3434namespace WebCore {
    3535
    36 Ref<WebGPUDrawable> WebGPUDrawable::create(GPUDrawable&& drawable)
     36Ref<WebMetalDrawable> WebMetalDrawable::create(GPUDrawable&& drawable)
    3737{
    38     return adoptRef(*new WebGPUDrawable(WTFMove(drawable)));
     38    return adoptRef(*new WebMetalDrawable(WTFMove(drawable)));
    3939}
    4040
    41 WebGPUDrawable::WebGPUDrawable(GPUDrawable&& drawable)
     41WebMetalDrawable::WebMetalDrawable(GPUDrawable&& drawable)
    4242    : m_drawable { WTFMove(drawable) }
    43     , m_texture { WebGPUTexture::create(GPUTexture { m_drawable }) }
     43    , m_texture { WebMetalTexture::create(GPUTexture { m_drawable }) }
    4444{
    4545}
    4646
    47 WebGPUDrawable::~WebGPUDrawable() = default;
     47WebMetalDrawable::~WebMetalDrawable() = default;
    4848
    4949} // namespace WebCore

  • trunk/Source/WebCore/html/canvas/WebMetalDrawable.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUDrawable.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPUTexture;
     36class WebMetalTexture;
    3737
    38 class WebGPUDrawable : public RefCounted<WebGPUDrawable> {
     38class WebMetalDrawable : public RefCounted<WebMetalDrawable> {
    3939public:
    40     ~WebGPUDrawable();
    41     static Ref<WebGPUDrawable> create(GPUDrawable&&);
     40    ~WebMetalDrawable();
     41    static Ref<WebMetalDrawable> create(GPUDrawable&&);
    4242
    4343    GPUDrawable& drawable() { return m_drawable; }
    44     WebGPUTexture& texture() { return m_texture.get(); }
     44    WebMetalTexture& texture() { return m_texture.get(); }
    4545
    4646private:
    47     explicit WebGPUDrawable(GPUDrawable&&);
     47    explicit WebMetalDrawable(GPUDrawable&&);
    4848
    4949    GPUDrawable m_drawable;
    50     Ref<WebGPUTexture> m_texture;
     50    Ref<WebMetalTexture> m_texture;
    5151};
    5252

  • trunk/Source/WebCore/html/canvas/WebMetalDrawable.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPUDrawable {
     30] interface WebMetalDrawable {
    3131
    32     readonly attribute WebGPUTexture texture; // FIXME: Only the framebuffer should have this.
     32    readonly attribute WebMetalTexture texture; // FIXME: Only the framebuffer should have this.
    3333
    3434};

  • trunk/Source/WebCore/html/canvas/WebMetalEnums.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUEnums.h"
     27#include "WebMetalEnums.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPUEnums.h"
    … …  
    3434namespace WebCore {
    3535
    36 std::optional<WebGPUCompareFunction> toWebGPUCompareFunction(const String& name)
     36std::optional<WebMetalCompareFunction> toWebMetalCompareFunction(const String& name)
    3737{
    3838    if (equalLettersIgnoringASCIICase(name, "never"))
    39         return WebGPUCompareFunction::Never;
     39        return WebMetalCompareFunction::Never;
    4040    if (equalLettersIgnoringASCIICase(name, "less"))
    41         return WebGPUCompareFunction::Less;
     41        return WebMetalCompareFunction::Less;
    4242    if (equalLettersIgnoringASCIICase(name, "equal"))
    43         return WebGPUCompareFunction::Equal;
     43        return WebMetalCompareFunction::Equal;
    4444    if (equalLettersIgnoringASCIICase(name, "lessequal"))
    45         return WebGPUCompareFunction::Lessequal;
     45        return WebMetalCompareFunction::Lessequal;
    4646    if (equalLettersIgnoringASCIICase(name, "greater"))
    47         return WebGPUCompareFunction::Greater;
     47        return WebMetalCompareFunction::Greater;
    4848    if (equalLettersIgnoringASCIICase(name, "notequal"))
    49         return WebGPUCompareFunction::Notequal;
     49        return WebMetalCompareFunction::Notequal;
    5050    if (equalLettersIgnoringASCIICase(name, "greaterequal"))
    51         return WebGPUCompareFunction::Greaterequal;
     51        return WebMetalCompareFunction::Greaterequal;
    5252    if (equalLettersIgnoringASCIICase(name, "always"))
    53         return WebGPUCompareFunction::Always;
     53        return WebMetalCompareFunction::Always;
    5454
    5555    ASSERT_NOT_REACHED();
    … …  
    5757}
    5858
    59 String web3DCompareFunctionName(WebGPUCompareFunction value)
     59String web3DCompareFunctionName(WebMetalCompareFunction value)
    6060{
    61     if (value == WebGPUCompareFunction::Never)
     61    if (value == WebMetalCompareFunction::Never)
    6262        return "never"_s;
    63     if (value == WebGPUCompareFunction::Less)
     63    if (value == WebMetalCompareFunction::Less)
    6464        return "less"_s;
    65     if (value == WebGPUCompareFunction::Equal)
     65    if (value == WebMetalCompareFunction::Equal)
    6666        return "equal"_s;
    67     if (value == WebGPUCompareFunction::Lessequal)
     67    if (value == WebMetalCompareFunction::Lessequal)
    6868        return "lessequal"_s;
    69     if (value == WebGPUCompareFunction::Greater)
     69    if (value == WebMetalCompareFunction::Greater)
    7070        return "greater"_s;
    71     if (value == WebGPUCompareFunction::Notequal)
     71    if (value == WebMetalCompareFunction::Notequal)
    7272        return "notequal"_s;
    73     if (value == WebGPUCompareFunction::Greaterequal)
     73    if (value == WebMetalCompareFunction::Greaterequal)
    7474        return "greaterequal"_s;
    75     if (value == WebGPUCompareFunction::Always)
     75    if (value == WebMetalCompareFunction::Always)
    7676        return "always"_s;
    7777   
    … …  
    8080}
    8181
    82 GPUCompareFunction toGPUCompareFunction(const WebGPUCompareFunction value)
     82GPUCompareFunction toGPUCompareFunction(const WebMetalCompareFunction value)
    8383{
    84     if (value == WebGPUCompareFunction::Never)
     84    if (value == WebMetalCompareFunction::Never)
    8585        return GPUCompareFunction::Never;
    86     if (value == WebGPUCompareFunction::Less)
     86    if (value == WebMetalCompareFunction::Less)
    8787        return GPUCompareFunction::Less;
    88     if (value == WebGPUCompareFunction::Equal)
     88    if (value == WebMetalCompareFunction::Equal)
    8989        return GPUCompareFunction::Equal;
    90     if (value == WebGPUCompareFunction::Lessequal)
     90    if (value == WebMetalCompareFunction::Lessequal)
    9191        return GPUCompareFunction::LessEqual;
    92     if (value == WebGPUCompareFunction::Greater)
     92    if (value == WebMetalCompareFunction::Greater)
    9393        return GPUCompareFunction::Greater;
    94     if (value == WebGPUCompareFunction::Notequal)
     94    if (value == WebMetalCompareFunction::Notequal)
    9595        return GPUCompareFunction::NotEqual;
    96     if (value == WebGPUCompareFunction::Greaterequal)
     96    if (value == WebMetalCompareFunction::Greaterequal)
    9797        return GPUCompareFunction::GreaterEqual;
    98     if (value == WebGPUCompareFunction::Always)
     98    if (value == WebMetalCompareFunction::Always)
    9999        return GPUCompareFunction::Always;
    100100   

  • trunk/Source/WebCore/html/canvas/WebMetalEnums.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/Forward.h>
    … …  
    3535enum class GPUCompareFunction;
    3636
    37 enum class WebGPUCompareFunction {
     37enum class WebMetalCompareFunction {
    3838    Never,
    3939    Less,
    … …  
    4646};
    4747
    48 std::optional<WebGPUCompareFunction> toWebGPUCompareFunction(const String&);
    49 String web3DCompareFunctionName(WebGPUCompareFunction);
    50 GPUCompareFunction toGPUCompareFunction(WebGPUCompareFunction);
     48std::optional<WebMetalCompareFunction> toWebMetalCompareFunction(const String&);
     49String web3DCompareFunctionName(WebMetalCompareFunction);
     50GPUCompareFunction toGPUCompareFunction(WebMetalCompareFunction);
    5151
    5252} // namespace WebCore

  • trunk/Source/WebCore/html/canvas/WebMetalEnums.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU
    29 ] enum WebGPUPixelFormat {
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal
     29] enum WebMetalPixelFormat {
    3030    "BGRA8Unorm"
    3131};
    3232
    3333[
    34     Conditional=WEBGPU,
    35     EnabledAtRuntime=WebGPU
    36 ] enum WebGPULoadAction {
     34    Conditional=WEBMETAL,
     35    EnabledAtRuntime=WebMetal
     36] enum WebMetalLoadAction {
    3737    "dontcare",
    3838    "load",
    … …  
    4141
    4242[
    43     Conditional=WEBGPU,
    44     EnabledAtRuntime=WebGPU
    45 ] enum WebGPUStoreAction {
     43    Conditional=WEBMETAL,
     44    EnabledAtRuntime=WebMetal
     45] enum WebMetalStoreAction {
    4646    "dontcare",
    4747    "store",
    … …  
    5050
    5151[
    52     Conditional=WEBGPU,
    53     EnabledAtRuntime=WebGPU
    54 ] enum WebGPUPrimitiveType {
     52    Conditional=WEBMETAL,
     53    EnabledAtRuntime=WebMetal
     54] enum WebMetalPrimitiveType {
    5555    "point",
    5656    "line",
    … …  
    6161
    6262[
    63     Conditional=WEBGPU,
    64     EnabledAtRuntime=WebGPU
    65 ] enum WebGPUFunctionType {
     63    Conditional=WEBMETAL,
     64    EnabledAtRuntime=WebMetal
     65] enum WebMetalFunctionType {
    6666    "fragment",
    6767    "vertex"
    … …  
    6969
    7070[
    71     Conditional=WEBGPU,
    72     EnabledAtRuntime=WebGPU
    73 ] enum WebGPUStencilOperation {
     71    Conditional=WEBMETAL,
     72    EnabledAtRuntime=WebMetal
     73] enum WebMetalStencilOperation {
    7474    "keep",
    7575    "zero",
    … …  
    8383
    8484[
    85     Conditional=WEBGPU,
    86     EnabledAtRuntime=WebGPU
    87 ] enum WebGPUStatus {
     85    Conditional=WEBMETAL,
     86    EnabledAtRuntime=WebMetal
     87] enum WebMetalStatus {
    8888    "notenqueued",
    8989    "enqueued",
    … …  
    9595
    9696[
    97     Conditional=WEBGPU,
    98     EnabledAtRuntime=WebGPU
    99 ] enum WebGPUSamplerAddressMode {
     97    Conditional=WEBMETAL,
     98    EnabledAtRuntime=WebMetal
     99] enum WebMetalSamplerAddressMode {
    100100    "clamptoedge",
    101101    "mirrorclamptoedge",
    … …  
    106106
    107107[
    108     Conditional=WEBGPU,
    109     EnabledAtRuntime=WebGPU
    110 ] enum WebGPUSamplerMinMagFilter {
     108    Conditional=WEBMETAL,
     109    EnabledAtRuntime=WebMetal
     110] enum WebMetalSamplerMinMagFilter {
    111111    "nearest",
    112112    "linear"
    … …  
    114114
    115115[
    116     Conditional=WEBGPU,
    117     EnabledAtRuntime=WebGPU
    118 ] enum WebGPUSamplerMipFilter {
     116    Conditional=WEBMETAL,
     117    EnabledAtRuntime=WebMetal
     118] enum WebMetalSamplerMipFilter {
    119119    "notmipmapped",
    120120    "nearest",
    … …  
    123123
    124124[
    125     Conditional=WEBGPU,
    126     EnabledAtRuntime=WebGPU
    127 ] enum WebGPUCullMode {
     125    Conditional=WEBMETAL,
     126    EnabledAtRuntime=WebMetal
     127] enum WebMetalCullMode {
    128128    "none",
    129129    "front",
    … …  
    132132
    133133[
    134     Conditional=WEBGPU,
    135     EnabledAtRuntime=WebGPU
    136 ] enum WebGPUIndexType {
     134    Conditional=WEBMETAL,
     135    EnabledAtRuntime=WebMetal
     136] enum WebMetalIndexType {
    137137    "uint16",
    138138    "uint32"
    … …  
    140140
    141141[
    142     Conditional=WEBGPU,
    143     EnabledAtRuntime=WebGPU
    144 ] enum WebGPUVisibilityResultMode {
     142    Conditional=WEBMETAL,
     143    EnabledAtRuntime=WebMetal
     144] enum WebMetalVisibilityResultMode {
    145145    "disabled",
    146146    "boolean",
    … …  
    149149
    150150[
    151     Conditional=WEBGPU,
    152     EnabledAtRuntime=WebGPU
    153 ] enum WebGPUWinding {
     151    Conditional=WEBMETAL,
     152    EnabledAtRuntime=WebMetal
     153] enum WebMetalWinding {
    154154    "clockwise",
    155155    "counterclockwise"
    … …  
    157157
    158158[
    159     Conditional=WEBGPU,
    160     EnabledAtRuntime=WebGPU
    161 ] enum WebGPUDepthClipMode {
     159    Conditional=WEBMETAL,
     160    EnabledAtRuntime=WebMetal
     161] enum WebMetalDepthClipMode {
    162162    "clip",
    163163    "clamp"
    … …  
    165165
    166166[
    167     Conditional=WEBGPU,
    168     EnabledAtRuntime=WebGPU
    169 ] enum WebGPUTriangleFillMode {
     167    Conditional=WEBMETAL,
     168    EnabledAtRuntime=WebMetal
     169] enum WebMetalTriangleFillMode {
    170170    "fill",
    171171    "lines"
    … …  
    173173
    174174[
    175     Conditional=WEBGPU,
    176     EnabledAtRuntime=WebGPU
    177 ] enum WebGPUCPUCacheMode {
     175    Conditional=WEBMETAL,
     176    EnabledAtRuntime=WebMetal
     177] enum WebMetalCPUCacheMode {
    178178    "defaultcache",
    179179    "writecombined"
    … …  
    181181
    182182[
    183     Conditional=WEBGPU,
    184     EnabledAtRuntime=WebGPU
    185 ] enum WebGPUStorageMode {
     183    Conditional=WEBMETAL,
     184    EnabledAtRuntime=WebMetal
     185] enum WebMetalStorageMode {
    186186    "shared",
    187187    "managed",
    … …  
    190190
    191191[
    192     Conditional=WEBGPU,
    193     EnabledAtRuntime=WebGPU
    194 ] enum WebGPUResourceOptions {
     192    Conditional=WEBMETAL,
     193    EnabledAtRuntime=WebMetal
     194] enum WebMetalResourceOptions {
    195195    "cpucachemodedefaultcache",
    196196    "cpucachemodewritecombined",
    … …  
    203203
    204204[
    205     Conditional=WEBGPU,
    206     EnabledAtRuntime=WebGPU
    207 ] enum WebGPUTextureUsage {
     205    Conditional=WEBMETAL,
     206    EnabledAtRuntime=WebMetal
     207] enum WebMetalTextureUsage {
    208208    "unknown",
    209209    "shaderread",
    … …  
    214214
    215215[
    216     Conditional=WEBGPU,
    217     EnabledAtRuntime=WebGPU
    218 ] enum WebGPUBlendOperation {
     216    Conditional=WEBMETAL,
     217    EnabledAtRuntime=WebMetal
     218] enum WebMetalBlendOperation {
    219219    "add",
    220220    "subtract",
    … …  
    225225
    226226[
    227     Conditional=WEBGPU,
    228     EnabledAtRuntime=WebGPU
    229 ] enum WebGPUBlendFactor {
     227    Conditional=WEBMETAL,
     228    EnabledAtRuntime=WebMetal
     229] enum WebMetalBlendFactor {
    230230    "zero",
    231231    "one",
    … …  
    246246
    247247[
    248     Conditional=WEBGPU,
    249     EnabledAtRuntime=WebGPU
    250 ] enum WebGPUColorWriteMask {
     248    Conditional=WEBMETAL,
     249    EnabledAtRuntime=WebMetal
     250] enum WebMetalColorWriteMask {
    251251    "none",
    252252    "red",
    … …  
    258258
    259259[
    260     Conditional=WEBGPU,
    261     EnabledAtRuntime=WebGPU
    262 ] enum WebGPUMultisampleDepthResolveFilter {
     260    Conditional=WEBMETAL,
     261    EnabledAtRuntime=WebMetal
     262] enum WebMetalMultisampleDepthResolveFilter {
    263263    "sample0",
    264264    "min",
    … …  
    267267
    268268[
    269     Conditional=WEBGPU,
    270     EnabledAtRuntime=WebGPU
    271 ] enum WebGPUFeatureSet {
     269    Conditional=WEBMETAL,
     270    EnabledAtRuntime=WebMetal
     271] enum WebMetalFeatureSet {
    272272    "level1",
    273273    "level2"

  • trunk/Source/WebCore/html/canvas/WebMetalFunction.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUFunction.h"
     27#include "WebMetalFunction.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    31 #include "WebGPULibrary.h"
     31#include "WebMetalLibrary.h"
    3232
    3333namespace WebCore {
    3434
    35 Ref<WebGPUFunction> WebGPUFunction::create(GPUFunction&& function)
     35Ref<WebMetalFunction> WebMetalFunction::create(GPUFunction&& function)
    3636{
    37     return adoptRef(*new WebGPUFunction(WTFMove(function)));
     37    return adoptRef(*new WebMetalFunction(WTFMove(function)));
    3838}
    3939
    40 WebGPUFunction::WebGPUFunction(GPUFunction&& function)
     40WebMetalFunction::WebMetalFunction(GPUFunction&& function)
    4141    : m_function { WTFMove(function) }
    4242{

  • trunk/Source/WebCore/html/canvas/WebMetalFunction.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUFunction.h"
    … …  
    3535namespace WebCore {
    3636
    37 class WebGPUFunction : public RefCounted<WebGPUFunction> {
     37class WebMetalFunction : public RefCounted<WebMetalFunction> {
    3838public:
    39     static Ref<WebGPUFunction> create(GPUFunction&&);
     39    static Ref<WebMetalFunction> create(GPUFunction&&);
    4040
    4141    String name() const { return m_function.name(); }
    … …  
    4343
    4444private:
    45     explicit WebGPUFunction(GPUFunction&&);
     45    explicit WebMetalFunction(GPUFunction&&);
    4646
    4747    GPUFunction m_function;

  • trunk/Source/WebCore/html/canvas/WebMetalFunction.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPUFunction {
     30] interface WebMetalFunction {
    3131
    3232    readonly attribute DOMString name;

  • trunk/Source/WebCore/html/canvas/WebMetalLibrary.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPULibrary.h"
     27#include "WebMetalLibrary.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    31 #include "WebGPUFunction.h"
     31#include "WebMetalFunction.h"
    3232
    3333namespace WebCore {
    3434
    35 Ref<WebGPULibrary> WebGPULibrary::create(GPULibrary&& library, const String& sourceCode)
     35Ref<WebMetalLibrary> WebMetalLibrary::create(GPULibrary&& library, const String& sourceCode)
    3636{
    37     return adoptRef(*new WebGPULibrary(WTFMove(library), sourceCode));
     37    return adoptRef(*new WebMetalLibrary(WTFMove(library), sourceCode));
    3838}
    3939
    40 WebGPULibrary::WebGPULibrary(GPULibrary&& library, const String& sourceCode)
     40WebMetalLibrary::WebMetalLibrary(GPULibrary&& library, const String& sourceCode)
    4141    : m_sourceCode { sourceCode }
    4242    , m_library { WTFMove(library) }
    … …  
    4444}
    4545
    46 Vector<String> WebGPULibrary::functionNames() const
     46Vector<String> WebMetalLibrary::functionNames() const
    4747{
    4848    return m_library.functionNames();
    4949}
    5050
    51 RefPtr<WebGPUFunction> WebGPULibrary::functionWithName(const String& name) const
     51RefPtr<WebMetalFunction> WebMetalLibrary::functionWithName(const String& name) const
    5252{
    5353    GPUFunction function { m_library, name };
    5454    if (!function)
    5555        return nullptr;
    56     return WebGPUFunction::create(WTFMove(function));
     56    return WebMetalFunction::create(WTFMove(function));
    5757}
    5858

  • trunk/Source/WebCore/html/canvas/WebMetalLibrary.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPULibrary.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPUFunction;
     36class WebMetalFunction;
    3737
    38 class WebGPULibrary : public RefCounted<WebGPULibrary> {
     38class WebMetalLibrary : public RefCounted<WebMetalLibrary> {
    3939public:
    40     static Ref<WebGPULibrary> create(GPULibrary&&, const String& sourceCode);
     40    static Ref<WebMetalLibrary> create(GPULibrary&&, const String& sourceCode);
    4141
    4242    const String& sourceCode() const { return m_sourceCode; }
    … …  
    4747    Vector<String> functionNames() const;
    4848
    49     RefPtr<WebGPUFunction> functionWithName(const String&) const;
     49    RefPtr<WebMetalFunction> functionWithName(const String&) const;
    5050
    5151private:
    52     WebGPULibrary(GPULibrary&&, const String& sourceCode);
     52    WebMetalLibrary(GPULibrary&&, const String& sourceCode);
    5353
    5454    String m_sourceCode;

  • trunk/Source/WebCore/html/canvas/WebMetalLibrary.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPULibrary {
     30] interface WebMetalLibrary {
    3131
    3232    readonly attribute DOMString sourceCode;
    … …  
    3434    readonly attribute sequence<DOMString> functionNames;
    3535
    36     WebGPUFunction? functionWithName(DOMString name);
     36    WebMetalFunction? functionWithName(DOMString name);
    3737
    3838};

  • trunk/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPURenderCommandEncoder.h"
     27#include "WebMetalRenderCommandEncoder.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPUCommandBuffer.h"
    3232#include "GPURenderPassDescriptor.h"
    33 #include "WebGPUBuffer.h"
    34 #include "WebGPUCommandBuffer.h"
    35 #include "WebGPUDepthStencilState.h"
    36 #include "WebGPURenderPassDescriptor.h"
    37 #include "WebGPURenderPipelineState.h"
     33#include "WebMetalBuffer.h"
     34#include "WebMetalCommandBuffer.h"
     35#include "WebMetalDepthStencilState.h"
     36#include "WebMetalRenderPassDescriptor.h"
     37#include "WebMetalRenderPipelineState.h"
    3838
    3939namespace WebCore {
    4040
    41 Ref<WebGPURenderCommandEncoder> WebGPURenderCommandEncoder::create(GPURenderCommandEncoder&& encoder)
     41Ref<WebMetalRenderCommandEncoder> WebMetalRenderCommandEncoder::create(GPURenderCommandEncoder&& encoder)
    4242{
    43     return adoptRef(*new WebGPURenderCommandEncoder(WTFMove(encoder)));
     43    return adoptRef(*new WebMetalRenderCommandEncoder(WTFMove(encoder)));
    4444}
    4545
    46 WebGPURenderCommandEncoder::WebGPURenderCommandEncoder(GPURenderCommandEncoder&& encoder)
     46WebMetalRenderCommandEncoder::WebMetalRenderCommandEncoder(GPURenderCommandEncoder&& encoder)
    4747    : m_encoder { WTFMove(encoder) }
    4848{
    4949}
    5050
    51 WebGPURenderCommandEncoder::~WebGPURenderCommandEncoder() = default;
     51WebMetalRenderCommandEncoder::~WebMetalRenderCommandEncoder() = default;
    5252
    53 void WebGPURenderCommandEncoder::setRenderPipelineState(WebGPURenderPipelineState& pipelineState)
     53void WebMetalRenderCommandEncoder::setRenderPipelineState(WebMetalRenderPipelineState& pipelineState)
    5454{
    5555    m_encoder.setRenderPipelineState(pipelineState.state());
    5656}
    5757
    58 void WebGPURenderCommandEncoder::setDepthStencilState(WebGPUDepthStencilState& depthStencilState)
     58void WebMetalRenderCommandEncoder::setDepthStencilState(WebMetalDepthStencilState& depthStencilState)
    5959{
    6060    m_encoder.setDepthStencilState(depthStencilState.state());
    6161}
    6262
    63 void WebGPURenderCommandEncoder::setVertexBuffer(WebGPUBuffer& buffer, unsigned offset, unsigned index)
     63void WebMetalRenderCommandEncoder::setVertexBuffer(WebMetalBuffer& buffer, unsigned offset, unsigned index)
    6464{
    6565    m_encoder.setVertexBuffer(buffer.buffer(), offset, index);
    6666}
    6767
    68 void WebGPURenderCommandEncoder::setFragmentBuffer(WebGPUBuffer& buffer, unsigned offset, unsigned index)
     68void WebMetalRenderCommandEncoder::setFragmentBuffer(WebMetalBuffer& buffer, unsigned offset, unsigned index)
    6969{
    7070    m_encoder.setFragmentBuffer(buffer.buffer(), offset, index);
    7171}
    7272
    73 void WebGPURenderCommandEncoder::drawPrimitives(unsigned type, unsigned start, unsigned count)
     73void WebMetalRenderCommandEncoder::drawPrimitives(unsigned type, unsigned start, unsigned count)
    7474{
    7575    m_encoder.drawPrimitives(type, start, count);
    7676}
    7777
    78 void WebGPURenderCommandEncoder::endEncoding()
     78void WebMetalRenderCommandEncoder::endEncoding()
    7979{
    8080    return m_encoder.endEncoding();

  • trunk/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderCommandEncoder.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPUBuffer;
    37 class WebGPUDepthStencilState;
    38 class WebGPURenderPipelineState;
     36class WebMetalBuffer;
     37class WebMetalDepthStencilState;
     38class WebMetalRenderPipelineState;
    3939
    40 class WebGPURenderCommandEncoder : public RefCounted<WebGPURenderCommandEncoder> {
     40class WebMetalRenderCommandEncoder : public RefCounted<WebMetalRenderCommandEncoder> {
    4141public:
    42     ~WebGPURenderCommandEncoder();
    43     static Ref<WebGPURenderCommandEncoder> create(GPURenderCommandEncoder&&);
     42    ~WebMetalRenderCommandEncoder();
     43    static Ref<WebMetalRenderCommandEncoder> create(GPURenderCommandEncoder&&);
    4444
    45     void setRenderPipelineState(WebGPURenderPipelineState&);
    46     void setDepthStencilState(WebGPUDepthStencilState&);
    47     void setVertexBuffer(WebGPUBuffer&, unsigned offset, unsigned index);
    48     void setFragmentBuffer(WebGPUBuffer&, unsigned offset, unsigned index);
     45    void setRenderPipelineState(WebMetalRenderPipelineState&);
     46    void setDepthStencilState(WebMetalDepthStencilState&);
     47    void setVertexBuffer(WebMetalBuffer&, unsigned offset, unsigned index);
     48    void setFragmentBuffer(WebMetalBuffer&, unsigned offset, unsigned index);
    4949    void drawPrimitives(unsigned type, unsigned start, unsigned count);
    5050    void endEncoding();
    … …  
    5353
    5454private:
    55     explicit WebGPURenderCommandEncoder(GPURenderCommandEncoder&&);
     55    explicit WebMetalRenderCommandEncoder(GPURenderCommandEncoder&&);
    5656
    5757    GPURenderCommandEncoder m_encoder;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPURenderCommandEncoder {
     30] interface WebMetalRenderCommandEncoder {
    3131
    32     void setRenderPipelineState(WebGPURenderPipelineState pipelineState);
    33     void setDepthStencilState(WebGPUDepthStencilState depthStencilState);
    34     void setVertexBuffer(WebGPUBuffer buffer, unsigned long offset, unsigned long index);
    35     void setFragmentBuffer(WebGPUBuffer buffer, unsigned long offset, unsigned long index);
     32    void setRenderPipelineState(WebMetalRenderPipelineState pipelineState);
     33    void setDepthStencilState(WebMetalDepthStencilState depthStencilState);
     34    void setVertexBuffer(WebMetalBuffer buffer, unsigned long offset, unsigned long index);
     35    void setFragmentBuffer(WebMetalBuffer buffer, unsigned long offset, unsigned long index);
    3636    void drawPrimitives(unsigned long type, unsigned long start, unsigned long count);
    3737

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPURenderPassAttachmentDescriptor.h"
     27#include "WebMetalRenderPassAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPURenderPassAttachmentDescriptor.h"
    3232#include "GPUTexture.h"
    33 #include "WebGPUTexture.h"
     33#include "WebMetalTexture.h"
    3434
    3535namespace WebCore {
    3636
    37 WebGPURenderPassAttachmentDescriptor::WebGPURenderPassAttachmentDescriptor()
     37WebMetalRenderPassAttachmentDescriptor::WebMetalRenderPassAttachmentDescriptor()
    3838{
    3939}
    4040
    41 WebGPURenderPassAttachmentDescriptor::~WebGPURenderPassAttachmentDescriptor() = default;
     41WebMetalRenderPassAttachmentDescriptor::~WebMetalRenderPassAttachmentDescriptor() = default;
    4242
    43 unsigned WebGPURenderPassAttachmentDescriptor::loadAction() const
     43unsigned WebMetalRenderPassAttachmentDescriptor::loadAction() const
    4444{
    4545    return descriptor().loadAction();
    4646}
    4747
    48 void WebGPURenderPassAttachmentDescriptor::setLoadAction(unsigned newLoadAction)
     48void WebMetalRenderPassAttachmentDescriptor::setLoadAction(unsigned newLoadAction)
    4949{
    5050    descriptor().setLoadAction(newLoadAction);
    5151}
    5252
    53 unsigned WebGPURenderPassAttachmentDescriptor::storeAction() const
     53unsigned WebMetalRenderPassAttachmentDescriptor::storeAction() const
    5454{
    5555    return descriptor().storeAction();
    5656}
    5757
    58 void WebGPURenderPassAttachmentDescriptor::setStoreAction(unsigned newStoreAction)
     58void WebMetalRenderPassAttachmentDescriptor::setStoreAction(unsigned newStoreAction)
    5959{
    6060    descriptor().setStoreAction(newStoreAction);
    6161}
    6262
    63 WebGPUTexture* WebGPURenderPassAttachmentDescriptor::texture() const
     63WebMetalTexture* WebMetalRenderPassAttachmentDescriptor::texture() const
    6464{
    6565    return m_texture.get();
    6666}
    6767
    68 void WebGPURenderPassAttachmentDescriptor::setTexture(RefPtr<WebGPUTexture>&& newTexture)
     68void WebMetalRenderPassAttachmentDescriptor::setTexture(RefPtr<WebMetalTexture>&& newTexture)
    6969{
    7070    // FIXME: Why can't we set this to null?

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/Ref.h>
    … …  
    3434
    3535class GPURenderPassAttachmentDescriptor;
    36 class WebGPUTexture;
     36class WebMetalTexture;
    3737
    38 class WebGPURenderPassAttachmentDescriptor : public RefCounted<WebGPURenderPassAttachmentDescriptor> {
     38class WebMetalRenderPassAttachmentDescriptor : public RefCounted<WebMetalRenderPassAttachmentDescriptor> {
    3939public:
    40     virtual ~WebGPURenderPassAttachmentDescriptor();
     40    virtual ~WebMetalRenderPassAttachmentDescriptor();
    4141
    4242    unsigned loadAction() const;
    … …  
    4646    void setStoreAction(unsigned);
    4747
    48     WebGPUTexture* texture() const;
    49     void setTexture(RefPtr<WebGPUTexture>&&);
     48    WebMetalTexture* texture() const;
     49    void setTexture(RefPtr<WebMetalTexture>&&);
    5050
    5151    virtual bool isColorAttachmentDescriptor() const = 0;
    5252
    5353protected:
    54     WebGPURenderPassAttachmentDescriptor();
     54    WebMetalRenderPassAttachmentDescriptor();
    5555
    5656private:
    5757    virtual const GPURenderPassAttachmentDescriptor& descriptor() const = 0;
    5858
    59     RefPtr<WebGPUTexture> m_texture;
     59    RefPtr<WebMetalTexture> m_texture;
    6060};
    6161

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    CustomToJSObject
    3030]
    31 interface WebGPURenderPassAttachmentDescriptor {
     31interface WebMetalRenderPassAttachmentDescriptor {
    3232
    33     attribute WebGPUTexture? texture;
     33    attribute WebMetalTexture? texture;
    3434
    35     attribute unsigned long loadAction; // should be WebGPULoadAction
    36     attribute unsigned long storeAction; // should be WebGPUStoreAction
     35    attribute unsigned long loadAction; // should be WebMetalLoadAction
     36    attribute unsigned long storeAction; // should be WebMetalStoreAction
    3737
    3838};

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPURenderPassColorAttachmentDescriptor.h"
     27#include "WebMetalRenderPassColorAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPUTexture.h"
    32 #include "WebGPUTexture.h"
     32#include "WebMetalTexture.h"
    3333#include <wtf/Vector.h>
    3434
    3535namespace WebCore {
    3636
    37 Ref<WebGPURenderPassColorAttachmentDescriptor> WebGPURenderPassColorAttachmentDescriptor::create(GPURenderPassColorAttachmentDescriptor&& descriptor)
     37Ref<WebMetalRenderPassColorAttachmentDescriptor> WebMetalRenderPassColorAttachmentDescriptor::create(GPURenderPassColorAttachmentDescriptor&& descriptor)
    3838{
    39     return adoptRef(*new WebGPURenderPassColorAttachmentDescriptor(WTFMove(descriptor)));
     39    return adoptRef(*new WebMetalRenderPassColorAttachmentDescriptor(WTFMove(descriptor)));
    4040}
    4141
    42 WebGPURenderPassColorAttachmentDescriptor::WebGPURenderPassColorAttachmentDescriptor(GPURenderPassColorAttachmentDescriptor&& descriptor)
     42WebMetalRenderPassColorAttachmentDescriptor::WebMetalRenderPassColorAttachmentDescriptor(GPURenderPassColorAttachmentDescriptor&& descriptor)
    4343    : m_descriptor { WTFMove(descriptor) }
    4444{
    4545}
    4646
    47 WebGPURenderPassColorAttachmentDescriptor::~WebGPURenderPassColorAttachmentDescriptor() = default;
     47WebMetalRenderPassColorAttachmentDescriptor::~WebMetalRenderPassColorAttachmentDescriptor() = default;
    4848
    49 const GPURenderPassAttachmentDescriptor& WebGPURenderPassColorAttachmentDescriptor::descriptor() const
     49const GPURenderPassAttachmentDescriptor& WebMetalRenderPassColorAttachmentDescriptor::descriptor() const
    5050{
    5151    return m_descriptor;
    5252}
    5353
    54 Vector<float> WebGPURenderPassColorAttachmentDescriptor::clearColor() const
     54Vector<float> WebMetalRenderPassColorAttachmentDescriptor::clearColor() const
    5555{
    5656    return m_descriptor.clearColor();
    5757}
    5858
    59 void WebGPURenderPassColorAttachmentDescriptor::setClearColor(const Vector<float>& newClearColor)
     59void WebMetalRenderPassColorAttachmentDescriptor::setClearColor(const Vector<float>& newClearColor)
    6060{
    6161    m_descriptor.setClearColor(newClearColor);

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderPassColorAttachmentDescriptor.h"
    31 #include "WebGPURenderPassAttachmentDescriptor.h"
     31#include "WebMetalRenderPassAttachmentDescriptor.h"
    3232
    3333namespace WebCore {
    3434
    35 class WebGPURenderPassColorAttachmentDescriptor final : public WebGPURenderPassAttachmentDescriptor {
     35class WebMetalRenderPassColorAttachmentDescriptor final : public WebMetalRenderPassAttachmentDescriptor {
    3636public:
    37     virtual ~WebGPURenderPassColorAttachmentDescriptor();
    38     static Ref<WebGPURenderPassColorAttachmentDescriptor> create(GPURenderPassColorAttachmentDescriptor&&);
     37    virtual ~WebMetalRenderPassColorAttachmentDescriptor();
     38    static Ref<WebMetalRenderPassColorAttachmentDescriptor> create(GPURenderPassColorAttachmentDescriptor&&);
    3939
    4040    Vector<float> clearColor() const;
    … …  
    4242
    4343private:
    44     explicit WebGPURenderPassColorAttachmentDescriptor(GPURenderPassColorAttachmentDescriptor&&);
     44    explicit WebMetalRenderPassColorAttachmentDescriptor(GPURenderPassColorAttachmentDescriptor&&);
    4545
    4646    const GPURenderPassAttachmentDescriptor& descriptor() const final;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU
    29 ] interface WebGPURenderPassColorAttachmentDescriptor : WebGPURenderPassAttachmentDescriptor {
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal
     29] interface WebMetalRenderPassColorAttachmentDescriptor : WebMetalRenderPassAttachmentDescriptor {
    3030
    3131    attribute sequence<float> clearColor;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPURenderPassDepthAttachmentDescriptor.h"
     27#include "WebMetalRenderPassDepthAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    31 #include "WebGPUTexture.h"
     31#include "WebMetalTexture.h"
    3232
    3333namespace WebCore {
    3434
    35 Ref<WebGPURenderPassDepthAttachmentDescriptor> WebGPURenderPassDepthAttachmentDescriptor::create(GPURenderPassDepthAttachmentDescriptor&& descriptor)
     35Ref<WebMetalRenderPassDepthAttachmentDescriptor> WebMetalRenderPassDepthAttachmentDescriptor::create(GPURenderPassDepthAttachmentDescriptor&& descriptor)
    3636{
    37     return adoptRef(*new WebGPURenderPassDepthAttachmentDescriptor(WTFMove(descriptor)));
     37    return adoptRef(*new WebMetalRenderPassDepthAttachmentDescriptor(WTFMove(descriptor)));
    3838}
    3939
    40 WebGPURenderPassDepthAttachmentDescriptor::WebGPURenderPassDepthAttachmentDescriptor(GPURenderPassDepthAttachmentDescriptor&& descriptor)
     40WebMetalRenderPassDepthAttachmentDescriptor::WebMetalRenderPassDepthAttachmentDescriptor(GPURenderPassDepthAttachmentDescriptor&& descriptor)
    4141    : m_descriptor { WTFMove(descriptor) }
    4242{
    4343}
    4444
    45 WebGPURenderPassDepthAttachmentDescriptor::~WebGPURenderPassDepthAttachmentDescriptor() = default;
     45WebMetalRenderPassDepthAttachmentDescriptor::~WebMetalRenderPassDepthAttachmentDescriptor() = default;
    4646
    47 double WebGPURenderPassDepthAttachmentDescriptor::clearDepth() const
     47double WebMetalRenderPassDepthAttachmentDescriptor::clearDepth() const
    4848{
    4949    return m_descriptor.clearDepth();
    5050}
    5151
    52 void WebGPURenderPassDepthAttachmentDescriptor::setClearDepth(double newClearDepth)
     52void WebMetalRenderPassDepthAttachmentDescriptor::setClearDepth(double newClearDepth)
    5353{
    5454    m_descriptor.setClearDepth(newClearDepth);
    5555}
    5656
    57 const GPURenderPassAttachmentDescriptor& WebGPURenderPassDepthAttachmentDescriptor::descriptor() const
     57const GPURenderPassAttachmentDescriptor& WebMetalRenderPassDepthAttachmentDescriptor::descriptor() const
    5858{
    5959    return m_descriptor;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderPassDepthAttachmentDescriptor.h"
    31 #include "WebGPURenderPassAttachmentDescriptor.h"
     31#include "WebMetalRenderPassAttachmentDescriptor.h"
    3232
    3333namespace WebCore {
    3434
    35 class WebGPURenderPassDepthAttachmentDescriptor final : public WebGPURenderPassAttachmentDescriptor {
     35class WebMetalRenderPassDepthAttachmentDescriptor final : public WebMetalRenderPassAttachmentDescriptor {
    3636public:
    37     virtual ~WebGPURenderPassDepthAttachmentDescriptor();
    38     static Ref<WebGPURenderPassDepthAttachmentDescriptor> create(GPURenderPassDepthAttachmentDescriptor&&);
     37    virtual ~WebMetalRenderPassDepthAttachmentDescriptor();
     38    static Ref<WebMetalRenderPassDepthAttachmentDescriptor> create(GPURenderPassDepthAttachmentDescriptor&&);
    3939
    4040    double clearDepth() const;
    … …  
    4242
    4343private:
    44     explicit WebGPURenderPassDepthAttachmentDescriptor(GPURenderPassDepthAttachmentDescriptor&&);
     44    explicit WebMetalRenderPassDepthAttachmentDescriptor(GPURenderPassDepthAttachmentDescriptor&&);
    4545
    4646    const GPURenderPassAttachmentDescriptor& descriptor() const final;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU
    29 ] interface WebGPURenderPassDepthAttachmentDescriptor : WebGPURenderPassAttachmentDescriptor {
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal
     29] interface WebMetalRenderPassDepthAttachmentDescriptor : WebMetalRenderPassAttachmentDescriptor {
    3030
    3131    attribute unrestricted double clearDepth;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPURenderPassDescriptor.h"
     27#include "WebMetalRenderPassDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131namespace WebCore {
    3232
    33 Ref<WebGPURenderPassDescriptor> WebGPURenderPassDescriptor::create()
     33Ref<WebMetalRenderPassDescriptor> WebMetalRenderPassDescriptor::create()
    3434{
    35     return adoptRef(*new WebGPURenderPassDescriptor);
     35    return adoptRef(*new WebMetalRenderPassDescriptor);
    3636}
    3737
    38 WebGPURenderPassDescriptor::WebGPURenderPassDescriptor() = default;
     38WebMetalRenderPassDescriptor::WebMetalRenderPassDescriptor() = default;
    3939
    40 WebGPURenderPassDescriptor::~WebGPURenderPassDescriptor() = default;
     40WebMetalRenderPassDescriptor::~WebMetalRenderPassDescriptor() = default;
    4141
    42 WebGPURenderPassDepthAttachmentDescriptor& WebGPURenderPassDescriptor::depthAttachment()
     42WebMetalRenderPassDepthAttachmentDescriptor& WebMetalRenderPassDescriptor::depthAttachment()
    4343{
    4444    if (!m_depthAttachment)
    45         m_depthAttachment = WebGPURenderPassDepthAttachmentDescriptor::create(m_descriptor.depthAttachment());
     45        m_depthAttachment = WebMetalRenderPassDepthAttachmentDescriptor::create(m_descriptor.depthAttachment());
    4646    return *m_depthAttachment;
    4747}
    4848
    49 const Vector<RefPtr<WebGPURenderPassColorAttachmentDescriptor>>& WebGPURenderPassDescriptor::colorAttachments()
     49const Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>>& WebMetalRenderPassDescriptor::colorAttachments()
    5050{
    5151    if (m_colorAttachments.isEmpty()) {
    … …  
    5454        m_colorAttachments.reserveInitialCapacity(attachments.size());
    5555        for (auto& attachment : attachments)
    56             m_colorAttachments.uncheckedAppend(WebGPURenderPassColorAttachmentDescriptor::create(WTFMove(attachment)));
     56            m_colorAttachments.uncheckedAppend(WebMetalRenderPassColorAttachmentDescriptor::create(WTFMove(attachment)));
    5757    }
    5858    return m_colorAttachments;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderPassDescriptor.h"
    31 #include "WebGPURenderPassColorAttachmentDescriptor.h"
    32 #include "WebGPURenderPassDepthAttachmentDescriptor.h"
     31#include "WebMetalRenderPassColorAttachmentDescriptor.h"
     32#include "WebMetalRenderPassDepthAttachmentDescriptor.h"
    3333#include <wtf/Ref.h>
    3434#include <wtf/RefCounted.h>
    … …  
    3737namespace WebCore {
    3838
    39 class WebGPURenderPassDescriptor : public RefCounted<WebGPURenderPassDescriptor> {
     39class WebMetalRenderPassDescriptor : public RefCounted<WebMetalRenderPassDescriptor> {
    4040public:
    41     ~WebGPURenderPassDescriptor();
    42     static Ref<WebGPURenderPassDescriptor> create();
     41    ~WebMetalRenderPassDescriptor();
     42    static Ref<WebMetalRenderPassDescriptor> create();
    4343
    44     WebGPURenderPassDepthAttachmentDescriptor& depthAttachment();
    45     const Vector<RefPtr<WebGPURenderPassColorAttachmentDescriptor>>& colorAttachments();
     44    WebMetalRenderPassDepthAttachmentDescriptor& depthAttachment();
     45    const Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>>& colorAttachments();
    4646
    4747    const GPURenderPassDescriptor& descriptor() const { return m_descriptor; }
    4848
    4949private:
    50     WebGPURenderPassDescriptor();
     50    WebMetalRenderPassDescriptor();
    5151
    52     Vector<RefPtr<WebGPURenderPassColorAttachmentDescriptor>> m_colorAttachments;
    53     RefPtr<WebGPURenderPassDepthAttachmentDescriptor> m_depthAttachment;
     52    Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>> m_colorAttachments;
     53    RefPtr<WebMetalRenderPassDepthAttachmentDescriptor> m_depthAttachment;
    5454
    5555    GPURenderPassDescriptor m_descriptor;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.idl

    r236953 r236954  
    2626[
    2727    Constructor,
    28     Conditional=WEBGPU,
    29     EnabledAtRuntime=WebGPU,
     28    Conditional=WEBMETAL,
     29    EnabledAtRuntime=WebMetal,
    3030    ImplementationLacksVTable
    31 ] interface WebGPURenderPassDescriptor {
     31] interface WebMetalRenderPassDescriptor {
    3232
    33     readonly attribute sequence<WebGPURenderPassColorAttachmentDescriptor> colorAttachments;
    34     readonly attribute WebGPURenderPassDepthAttachmentDescriptor depthAttachment;
    35     //readonly attribute WebGPURenderPassStencilAttachmentDescriptor stencilAttachment;
     33    readonly attribute sequence<WebMetalRenderPassColorAttachmentDescriptor> colorAttachments;
     34    readonly attribute WebMetalRenderPassDepthAttachmentDescriptor depthAttachment;
     35    //readonly attribute WebMetalRenderPassStencilAttachmentDescriptor stencilAttachment;
    3636
    3737    // renderTargetArrayLength

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPURenderPipelineColorAttachmentDescriptor.h"
     27#include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131namespace WebCore {
    3232
    33 Ref<WebGPURenderPipelineColorAttachmentDescriptor> WebGPURenderPipelineColorAttachmentDescriptor::create(GPURenderPipelineColorAttachmentDescriptor&& descriptor)
     33Ref<WebMetalRenderPipelineColorAttachmentDescriptor> WebMetalRenderPipelineColorAttachmentDescriptor::create(GPURenderPipelineColorAttachmentDescriptor&& descriptor)
    3434{
    35     return adoptRef(*new WebGPURenderPipelineColorAttachmentDescriptor(WTFMove(descriptor)));
     35    return adoptRef(*new WebMetalRenderPipelineColorAttachmentDescriptor(WTFMove(descriptor)));
    3636}
    3737
    38 WebGPURenderPipelineColorAttachmentDescriptor::WebGPURenderPipelineColorAttachmentDescriptor(GPURenderPipelineColorAttachmentDescriptor&& descriptor)
     38WebMetalRenderPipelineColorAttachmentDescriptor::WebMetalRenderPipelineColorAttachmentDescriptor(GPURenderPipelineColorAttachmentDescriptor&& descriptor)
    3939    : m_descriptor { WTFMove(descriptor) }
    4040{
    4141}
    4242
    43 unsigned WebGPURenderPipelineColorAttachmentDescriptor::pixelFormat() const
     43unsigned WebMetalRenderPipelineColorAttachmentDescriptor::pixelFormat() const
    4444{
    4545    return m_descriptor.pixelFormat();
    4646}
    4747
    48 void WebGPURenderPipelineColorAttachmentDescriptor::setPixelFormat(unsigned newPixelFormat)
     48void WebMetalRenderPipelineColorAttachmentDescriptor::setPixelFormat(unsigned newPixelFormat)
    4949{
    5050    m_descriptor.setPixelFormat(newPixelFormat);

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderPipelineColorAttachmentDescriptor.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPURenderPipelineColorAttachmentDescriptor : public RefCounted<WebGPURenderPipelineColorAttachmentDescriptor> {
     36class WebMetalRenderPipelineColorAttachmentDescriptor : public RefCounted<WebMetalRenderPipelineColorAttachmentDescriptor> {
    3737public:
    38     static Ref<WebGPURenderPipelineColorAttachmentDescriptor> create(GPURenderPipelineColorAttachmentDescriptor&&);
     38    static Ref<WebMetalRenderPipelineColorAttachmentDescriptor> create(GPURenderPipelineColorAttachmentDescriptor&&);
    3939
    4040    unsigned pixelFormat() const;
    … …  
    4242
    4343private:
    44     explicit WebGPURenderPipelineColorAttachmentDescriptor(GPURenderPipelineColorAttachmentDescriptor&&);
     44    explicit WebMetalRenderPipelineColorAttachmentDescriptor(GPURenderPipelineColorAttachmentDescriptor&&);
    4545
    4646    GPURenderPipelineColorAttachmentDescriptor m_descriptor;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPURenderPipelineColorAttachmentDescriptor {
     30] interface WebMetalRenderPipelineColorAttachmentDescriptor {
    3131
    3232    attribute unsigned long pixelFormat; // should be MTLPixelFormat

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPURenderPipelineDescriptor.h"
     27#include "WebMetalRenderPipelineDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPUFunction.h"
    3232#include "GPURenderPipelineColorAttachmentDescriptor.h"
    33 #include "WebGPUFunction.h"
    34 #include "WebGPURenderPipelineColorAttachmentDescriptor.h"
     33#include "WebMetalFunction.h"
     34#include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
    3535
    3636namespace WebCore {
    3737
    38 Ref<WebGPURenderPipelineDescriptor> WebGPURenderPipelineDescriptor::create()
     38Ref<WebMetalRenderPipelineDescriptor> WebMetalRenderPipelineDescriptor::create()
    3939{
    40     return adoptRef(*new WebGPURenderPipelineDescriptor);
     40    return adoptRef(*new WebMetalRenderPipelineDescriptor);
    4141}
    4242
    43 WebGPURenderPipelineDescriptor::WebGPURenderPipelineDescriptor() = default;
     43WebMetalRenderPipelineDescriptor::WebMetalRenderPipelineDescriptor() = default;
    4444
    45 WebGPURenderPipelineDescriptor::~WebGPURenderPipelineDescriptor() = default;
     45WebMetalRenderPipelineDescriptor::~WebMetalRenderPipelineDescriptor() = default;
    4646
    47 WebGPUFunction* WebGPURenderPipelineDescriptor::vertexFunction() const
     47WebMetalFunction* WebMetalRenderPipelineDescriptor::vertexFunction() const
    4848{
    4949    return m_vertexFunction.get();
    5050}
    5151
    52 void WebGPURenderPipelineDescriptor::setVertexFunction(RefPtr<WebGPUFunction>&& newVertexFunction)
     52void WebMetalRenderPipelineDescriptor::setVertexFunction(RefPtr<WebMetalFunction>&& newVertexFunction)
    5353{
    5454    // FIXME: Why can't we set this to null?
    … …  
    6161}
    6262
    63 WebGPUFunction* WebGPURenderPipelineDescriptor::fragmentFunction() const
     63WebMetalFunction* WebMetalRenderPipelineDescriptor::fragmentFunction() const
    6464{
    6565    return m_fragmentFunction.get();
    6666}
    6767
    68 void WebGPURenderPipelineDescriptor::setFragmentFunction(RefPtr<WebGPUFunction>&& newFragmentFunction)
     68void WebMetalRenderPipelineDescriptor::setFragmentFunction(RefPtr<WebMetalFunction>&& newFragmentFunction)
    6969{
    7070    // FIXME: Why can't we set this to null?
    … …  
    7777}
    7878
    79 const Vector<RefPtr<WebGPURenderPipelineColorAttachmentDescriptor>>& WebGPURenderPipelineDescriptor::colorAttachments()
     79const Vector<RefPtr<WebMetalRenderPipelineColorAttachmentDescriptor>>& WebMetalRenderPipelineDescriptor::colorAttachments()
    8080{
    8181    if (!m_colorAttachments.size()) {
    … …  
    8383        m_colorAttachments.reserveInitialCapacity(attachments.size());
    8484        for (auto& attachment : attachments)
    85             m_colorAttachments.uncheckedAppend(WebGPURenderPipelineColorAttachmentDescriptor::create(WTFMove(attachment)));
     85            m_colorAttachments.uncheckedAppend(WebMetalRenderPipelineColorAttachmentDescriptor::create(WTFMove(attachment)));
    8686    }
    8787    return m_colorAttachments;
    8888}
    8989
    90 unsigned WebGPURenderPipelineDescriptor::depthAttachmentPixelFormat() const
     90unsigned WebMetalRenderPipelineDescriptor::depthAttachmentPixelFormat() const
    9191{
    9292    return m_descriptor.depthAttachmentPixelFormat();
    9393}
    9494
    95 void WebGPURenderPipelineDescriptor::setDepthAttachmentPixelFormat(unsigned newPixelFormat)
     95void WebMetalRenderPipelineDescriptor::setDepthAttachmentPixelFormat(unsigned newPixelFormat)
    9696{
    9797    m_descriptor.setDepthAttachmentPixelFormat(newPixelFormat);
    9898}
    9999
    100 void WebGPURenderPipelineDescriptor::reset()
     100void WebMetalRenderPipelineDescriptor::reset()
    101101{
    102102    m_vertexFunction = nullptr;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderPipelineDescriptor.h"
    31 #include "WebGPURenderPipelineColorAttachmentDescriptor.h"
     31#include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
    3232#include <wtf/Ref.h>
    3333#include <wtf/RefCounted.h>
    … …  
    3838class GPUFunction;
    3939class GPURenderPipelineDescriptor;
    40 class WebGPUFunction;
    41 class WebGPURenderPipelineColorAttachmentDescriptor;
     40class WebMetalFunction;
     41class WebMetalRenderPipelineColorAttachmentDescriptor;
    4242
    43 class WebGPURenderPipelineDescriptor : public RefCounted<WebGPURenderPipelineDescriptor> {
     43class WebMetalRenderPipelineDescriptor : public RefCounted<WebMetalRenderPipelineDescriptor> {
    4444public:
    45     ~WebGPURenderPipelineDescriptor();
    46     static Ref<WebGPURenderPipelineDescriptor> create();
     45    ~WebMetalRenderPipelineDescriptor();
     46    static Ref<WebMetalRenderPipelineDescriptor> create();
    4747
    48     WebGPUFunction* vertexFunction() const;
    49     void setVertexFunction(RefPtr<WebGPUFunction>&&);
     48    WebMetalFunction* vertexFunction() const;
     49    void setVertexFunction(RefPtr<WebMetalFunction>&&);
    5050
    51     WebGPUFunction* fragmentFunction() const;
    52     void setFragmentFunction(RefPtr<WebGPUFunction>&&);
     51    WebMetalFunction* fragmentFunction() const;
     52    void setFragmentFunction(RefPtr<WebMetalFunction>&&);
    5353
    54     const Vector<RefPtr<WebGPURenderPipelineColorAttachmentDescriptor>>& colorAttachments();
     54    const Vector<RefPtr<WebMetalRenderPipelineColorAttachmentDescriptor>>& colorAttachments();
    5555
    5656    unsigned depthAttachmentPixelFormat() const;
    … …  
    6262
    6363private:
    64     WebGPURenderPipelineDescriptor();
     64    WebMetalRenderPipelineDescriptor();
    6565
    66     RefPtr<WebGPUFunction> m_vertexFunction;
    67     RefPtr<WebGPUFunction> m_fragmentFunction;
     66    RefPtr<WebMetalFunction> m_vertexFunction;
     67    RefPtr<WebMetalFunction> m_fragmentFunction;
    6868
    69     Vector<RefPtr<WebGPURenderPipelineColorAttachmentDescriptor>> m_colorAttachments;
     69    Vector<RefPtr<WebMetalRenderPipelineColorAttachmentDescriptor>> m_colorAttachments;
    7070
    7171    GPURenderPipelineDescriptor m_descriptor;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.idl

    r236953 r236954  
    2626[
    2727    Constructor,
    28     Conditional=WEBGPU,
    29     EnabledAtRuntime=WebGPU,
     28    Conditional=WEBMETAL,
     29    EnabledAtRuntime=WebMetal,
    3030    ImplementationLacksVTable
    31 ] interface WebGPURenderPipelineDescriptor {
     31] interface WebMetalRenderPipelineDescriptor {
    3232
    33     attribute WebGPUFunction? vertexFunction;
    34     attribute WebGPUFunction? fragmentFunction;
     33    attribute WebMetalFunction? vertexFunction;
     34    attribute WebMetalFunction? fragmentFunction;
    3535
    36     readonly attribute sequence<WebGPURenderPipelineColorAttachmentDescriptor> colorAttachments;
     36    readonly attribute sequence<WebMetalRenderPipelineColorAttachmentDescriptor> colorAttachments;
    3737
    3838    attribute unsigned long depthAttachmentPixelFormat;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineState.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPURenderPipelineState.h"
     27#include "WebMetalRenderPipelineState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131namespace WebCore {
    3232
    33 Ref<WebGPURenderPipelineState> WebGPURenderPipelineState::create(GPURenderPipelineState&& state)
     33Ref<WebMetalRenderPipelineState> WebMetalRenderPipelineState::create(GPURenderPipelineState&& state)
    3434{
    35     return adoptRef(*new WebGPURenderPipelineState(WTFMove(state)));
     35    return adoptRef(*new WebMetalRenderPipelineState(WTFMove(state)));
    3636}
    3737
    38 WebGPURenderPipelineState::WebGPURenderPipelineState(GPURenderPipelineState&& state)
     38WebMetalRenderPipelineState::WebMetalRenderPipelineState(GPURenderPipelineState&& state)
    3939    : m_state { WTFMove(state) }
    4040{
    4141}
    4242
    43 String WebGPURenderPipelineState::label() const
     43String WebMetalRenderPipelineState::label() const
    4444{
    4545    return m_state.label();
    4646}
    4747
    48 void WebGPURenderPipelineState::setLabel(const String& label)
     48void WebMetalRenderPipelineState::setLabel(const String& label)
    4949{
    5050    m_state.setLabel(label);

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineState.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderPipelineState.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPURenderPipelineState : public RefCounted<WebGPURenderPipelineState> {
     36class WebMetalRenderPipelineState : public RefCounted<WebMetalRenderPipelineState> {
    3737public:
    38     static Ref<WebGPURenderPipelineState> create(GPURenderPipelineState&&);
     38    static Ref<WebMetalRenderPipelineState> create(GPURenderPipelineState&&);
    3939
    4040    String label() const;
    … …  
    4444
    4545private:
    46     explicit WebGPURenderPipelineState(GPURenderPipelineState&&);
     46    explicit WebMetalRenderPipelineState(GPURenderPipelineState&&);
    4747
    4848    GPURenderPipelineState m_state;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineState.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPUDepthStencilState {
     30] interface WebMetalRenderPipelineState {
    3131
    3232    attribute DOMString label;

  • trunk/Source/WebCore/html/canvas/WebMetalRenderingContext.h

    r236953 r236954  
    2727#pragma once
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPUBasedCanvasRenderingContext.h"
    … …  
    3838namespace WebCore {
    3939
    40 class WebGPUBuffer;
    41 class WebGPUCommandQueue;
    42 class WebGPUComputePipelineState;
    43 class WebGPUDepthStencilDescriptor;
    44 class WebGPUDepthStencilState;
    45 class WebGPUDrawable;
    46 class WebGPUFunction;
    47 class WebGPULibrary;
    48 class WebGPURenderPipelineDescriptor;
    49 class WebGPURenderPipelineState;
    50 class WebGPUTexture;
    51 class WebGPUTextureDescriptor;
     40class WebMetalBuffer;
     41class WebMetalCommandQueue;
     42class WebMetalComputePipelineState;
     43class WebMetalDepthStencilDescriptor;
     44class WebMetalDepthStencilState;
     45class WebMetalDrawable;
     46class WebMetalFunction;
     47class WebMetalLibrary;
     48class WebMetalRenderPipelineDescriptor;
     49class WebMetalRenderPipelineState;
     50class WebMetalTexture;
     51class WebMetalTextureDescriptor;
    5252
    53 class WebGPURenderingContext final : public GPUBasedCanvasRenderingContext {
     53class WebMetalRenderingContext final : public GPUBasedCanvasRenderingContext {
    5454public:
    55     static std::unique_ptr<WebGPURenderingContext> create(CanvasBase&);
     55    static std::unique_ptr<WebMetalRenderingContext> create(CanvasBase&);
    5656
    5757    // FIXME: IDL file says this is not nullable, but this function can return null.
    5858    HTMLCanvasElement* canvas() const;
    5959
    60     Ref<WebGPULibrary> createLibrary(const String&);
    61     Ref<WebGPURenderPipelineState> createRenderPipelineState(WebGPURenderPipelineDescriptor&);
    62     Ref<WebGPUDepthStencilState> createDepthStencilState(WebGPUDepthStencilDescriptor&);
    63     Ref<WebGPUComputePipelineState> createComputePipelineState(WebGPUFunction&);
    64     Ref<WebGPUCommandQueue> createCommandQueue();
    65     Ref<WebGPUDrawable> nextDrawable();
    66     RefPtr<WebGPUBuffer> createBuffer(JSC::ArrayBufferView&);
    67     Ref<WebGPUTexture> createTexture(WebGPUTextureDescriptor&);
     60    Ref<WebMetalLibrary> createLibrary(const String&);
     61    Ref<WebMetalRenderPipelineState> createRenderPipelineState(WebMetalRenderPipelineDescriptor&);
     62    Ref<WebMetalDepthStencilState> createDepthStencilState(WebMetalDepthStencilDescriptor&);
     63    Ref<WebMetalComputePipelineState> createComputePipelineState(WebMetalFunction&);
     64    Ref<WebMetalCommandQueue> createCommandQueue();
     65    Ref<WebMetalDrawable> nextDrawable();
     66    RefPtr<WebMetalBuffer> createBuffer(JSC::ArrayBufferView&);
     67    Ref<WebMetalTexture> createTexture(WebMetalTextureDescriptor&);
    6868
    6969    const GPUDevice& device() const { return m_device; }
    7070
    7171private:
    72     WebGPURenderingContext(CanvasBase&, GPUDevice&&);
     72    WebMetalRenderingContext(CanvasBase&, GPUDevice&&);
    7373
    7474    bool hasPendingActivity() const final;
    … …  
    8080    void initializeNewContext();
    8181
    82     bool isWebGPU() const final { return true; }
     82    bool isWebMetal() const final { return true; }
    8383
    8484    void reshape(int width, int height) final;
    … …  
    9191} // namespace WebCore
    9292
    93 SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(WebCore::WebGPURenderingContext, isWebGPU())
     93SPECIALIZE_TYPE_TRAITS_CANVASRENDERINGCONTEXT(WebCore::WebMetalRenderingContext, isWebMetal())
    9494
    9595#endif

  • trunk/Source/WebCore/html/canvas/WebMetalRenderingContext.idl

    r236953 r236954  
    2626
    2727[
    28     Conditional=WEBGPU,
    29     EnabledAtRuntime=WebGPU,
     28    Conditional=WEBMETAL,
     29    EnabledAtRuntime=WebMetal,
    3030    JSCustomMarkFunction,
    3131    DoNotCheckConstants
    32 ] interface WebGPURenderingContext {
     32] interface WebMetalRenderingContext {
    3333    // back-reference to the canvas
    3434    readonly attribute HTMLCanvasElement canvas;
    … …  
    9999    // Entry points
    100100
    101     WebGPULibrary createLibrary(DOMString sourceCode);
     101    WebMetalLibrary createLibrary(DOMString sourceCode);
    102102
    103     WebGPURenderPipelineState createRenderPipelineState(WebGPURenderPipelineDescriptor descriptor);
    104     WebGPUDepthStencilState createDepthStencilState(WebGPUDepthStencilDescriptor descriptor);
    105     WebGPUComputePipelineState createComputePipelineState(WebGPUFunction function);
     103    WebMetalRenderPipelineState createRenderPipelineState(WebMetalRenderPipelineDescriptor descriptor);
     104    WebMetalDepthStencilState createDepthStencilState(WebMetalDepthStencilDescriptor descriptor);
     105    WebMetalComputePipelineState createComputePipelineState(WebMetalFunction function);
    106106
    107     WebGPUCommandQueue createCommandQueue();
     107    WebMetalCommandQueue createCommandQueue();
    108108
    109     WebGPUDrawable nextDrawable();
     109    WebMetalDrawable nextDrawable();
    110110
    111     WebGPUBuffer? createBuffer(ArrayBufferView data);
     111    WebMetalBuffer? createBuffer(ArrayBufferView data);
    112112
    113     WebGPUTexture createTexture(WebGPUTextureDescriptor descriptor);
     113    WebMetalTexture createTexture(WebMetalTextureDescriptor descriptor);
    114114
    115115};

  • trunk/Source/WebCore/html/canvas/WebMetalSize.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030namespace WebCore {
    3131   
    32 struct WebGPUSize {
     32struct WebMetalSize {
    3333    unsigned width;
    3434    unsigned height;

  • trunk/Source/WebCore/html/canvas/WebMetalSize.idl

    r236953 r236954  
    2525 
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU
    29 ] dictionary WebGPUSize {
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal
     29] dictionary WebMetalSize {
    3030    unsigned long width;
    3131    unsigned long height;

  • trunk/Source/WebCore/html/canvas/WebMetalTexture.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUTexture.h"
     27#include "WebMetalTexture.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131namespace WebCore {
    3232
    33 Ref<WebGPUTexture> WebGPUTexture::create(GPUTexture&& texture)
     33Ref<WebMetalTexture> WebMetalTexture::create(GPUTexture&& texture)
    3434{
    35     return adoptRef(*new WebGPUTexture(WTFMove(texture)));
     35    return adoptRef(*new WebMetalTexture(WTFMove(texture)));
    3636}
    3737
    38 WebGPUTexture::WebGPUTexture(GPUTexture&& texture)
     38WebMetalTexture::WebMetalTexture(GPUTexture&& texture)
    3939    : m_texture { WTFMove(texture) }
    4040{

  • trunk/Source/WebCore/html/canvas/WebMetalTexture.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUTexture.h"
    … …  
    3636class GPUTextureDescriptor;
    3737
    38 class WebGPUTexture : public RefCounted<WebGPUTexture> {
     38class WebMetalTexture : public RefCounted<WebMetalTexture> {
    3939public:
    40     static Ref<WebGPUTexture> create(GPUTexture&&);
     40    static Ref<WebMetalTexture> create(GPUTexture&&);
    4141
    4242    unsigned width() const { return m_texture.width(); }
    … …  
    4646
    4747private:
    48     explicit WebGPUTexture(GPUTexture&&);
     48    explicit WebMetalTexture(GPUTexture&&);
    4949
    5050    GPUTexture m_texture;

  • trunk/Source/WebCore/html/canvas/WebMetalTexture.idl

    r236953 r236954  
    2525
    2626[
    27     Conditional=WEBGPU,
    28     EnabledAtRuntime=WebGPU,
     27    Conditional=WEBMETAL,
     28    EnabledAtRuntime=WebMetal,
    2929    ImplementationLacksVTable
    30 ] interface WebGPUTexture {
     30] interface WebMetalTexture {
    3131
    3232    readonly attribute unsigned long width;

  • trunk/Source/WebCore/html/canvas/WebMetalTextureDescriptor.cpp

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #include "WebGPUTextureDescriptor.h"
     27#include "WebMetalTextureDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131namespace WebCore {
    3232
    33 Ref<WebGPUTextureDescriptor> WebGPUTextureDescriptor::create(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
     33Ref<WebMetalTextureDescriptor> WebMetalTextureDescriptor::create(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
    3434{
    35     return adoptRef(*new WebGPUTextureDescriptor(pixelFormat, width, height, mipmapped));
     35    return adoptRef(*new WebMetalTextureDescriptor(pixelFormat, width, height, mipmapped));
    3636}
    3737
    38 WebGPUTextureDescriptor::WebGPUTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
     38WebMetalTextureDescriptor::WebMetalTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
    3939    : m_descriptor { pixelFormat, width, height, mipmapped }
    4040{
    4141}
    4242
    43 unsigned WebGPUTextureDescriptor::width() const
     43unsigned WebMetalTextureDescriptor::width() const
    4444{
    4545    return m_descriptor.width();
    4646}
    4747
    48 void WebGPUTextureDescriptor::setWidth(unsigned width)
     48void WebMetalTextureDescriptor::setWidth(unsigned width)
    4949{
    5050    m_descriptor.setWidth(width);
    5151}
    5252
    53 unsigned WebGPUTextureDescriptor::height() const
     53unsigned WebMetalTextureDescriptor::height() const
    5454{
    5555    return m_descriptor.height();
    5656}
    5757
    58 void WebGPUTextureDescriptor::setHeight(unsigned height)
     58void WebMetalTextureDescriptor::setHeight(unsigned height)
    5959{
    6060    m_descriptor.setHeight(height);
    6161}
    6262
    63 unsigned WebGPUTextureDescriptor::sampleCount() const
     63unsigned WebMetalTextureDescriptor::sampleCount() const
    6464{
    6565    return m_descriptor.sampleCount();
    6666}
    6767
    68 void WebGPUTextureDescriptor::setSampleCount(unsigned sampleCount)
     68void WebMetalTextureDescriptor::setSampleCount(unsigned sampleCount)
    6969{
    7070    m_descriptor.setSampleCount(sampleCount);
    7171}
    7272
    73 unsigned WebGPUTextureDescriptor::textureType() const
     73unsigned WebMetalTextureDescriptor::textureType() const
    7474{
    7575    return m_descriptor.textureType();
    7676}
    7777
    78 void WebGPUTextureDescriptor::setTextureType(unsigned textureType)
     78void WebMetalTextureDescriptor::setTextureType(unsigned textureType)
    7979{
    8080    m_descriptor.setTextureType(textureType);
    8181}
    8282
    83 unsigned WebGPUTextureDescriptor::storageMode() const
     83unsigned WebMetalTextureDescriptor::storageMode() const
    8484{
    8585    return m_descriptor.storageMode();
    8686}
    8787
    88 void WebGPUTextureDescriptor::setStorageMode(unsigned storageMode)
     88void WebMetalTextureDescriptor::setStorageMode(unsigned storageMode)
    8989{
    9090    m_descriptor.setStorageMode(storageMode);
    9191}
    9292
    93 unsigned WebGPUTextureDescriptor::usage() const
     93unsigned WebMetalTextureDescriptor::usage() const
    9494{
    9595    return m_descriptor.usage();
    9696}
    9797
    98 void WebGPUTextureDescriptor::setUsage(unsigned usage)
     98void WebMetalTextureDescriptor::setUsage(unsigned usage)
    9999{
    100100    m_descriptor.setUsage(usage);

  • trunk/Source/WebCore/html/canvas/WebMetalTextureDescriptor.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPUTextureDescriptor.h"
    … …  
    3434namespace WebCore {
    3535
    36 class WebGPUTextureDescriptor : public RefCounted<WebGPUTextureDescriptor> {
     36class WebMetalTextureDescriptor : public RefCounted<WebMetalTextureDescriptor> {
    3737public:
    38     static Ref<WebGPUTextureDescriptor> create(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
     38    static Ref<WebMetalTextureDescriptor> create(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
    3939
    4040    unsigned width() const;
    … …  
    5959
    6060private:
    61     WebGPUTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
     61    WebMetalTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
    6262
    6363    GPUTextureDescriptor m_descriptor;

  • trunk/Source/WebCore/html/canvas/WebMetalTextureDescriptor.idl

    r236953 r236954  
    2626[
    2727    Constructor(unsigned long pixelFormat, unsigned long width, unsigned long height, boolean mipmapped),
    28     Conditional=WEBGPU,
    29     EnabledAtRuntime=WebGPU,
     28    Conditional=WEBMETAL,
     29    EnabledAtRuntime=WebMetal,
    3030    ImplementationLacksVTable
    31 ] interface WebGPUTextureDescriptor {
     31] interface WebMetalTextureDescriptor {
    3232
    3333    attribute unsigned long textureType;

  • trunk/Source/WebCore/inspector/InspectorCanvas.cpp

    r236927 r236954  
    6464#include "WebGL2RenderingContext.h"
    6565#endif
    66 #if ENABLE(WEBGPU)
    67 #include "WebGPURenderingContext.h"
     66#if ENABLE(WEBMETAL)
     67#include "WebMetalRenderingContext.h"
    6868#endif
    6969#include <JavaScriptCore/IdentifiersFactory.h>
    … …  
    232232        contextType = Inspector::Protocol::Canvas::ContextType::WebGL2;
    233233#endif
    234 #if ENABLE(WEBGPU)
    235     else if (is<WebGPURenderingContext>(m_context))
    236         contextType = Inspector::Protocol::Canvas::ContextType::WebGPU;
     234#if ENABLE(WEBMETAL)
     235    else if (is<WebMetalRenderingContext>(m_context))
     236        contextType = Inspector::Protocol::Canvas::ContextType::WebMetal;
    237237#endif
    238238    else {

  • trunk/Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp

    r236927 r236954  
    5757#endif
    5858
    59 #if ENABLE(WEBGPU)
    60 #include "JSWebGPURenderingContext.h"
     59#if ENABLE(WEBMETAL)
     60#include "JSWebMetalRenderingContext.h"
    6161#endif
    6262
    … …  
    200200    }
    201201
    202     // FIXME: <https://webkit.org/b/173621> Web Inspector: Support getting the content of WebGPU context;
     202    // FIXME: <https://webkit.org/b/173621> Web Inspector: Support getting the content of WebMetal context;
    203203    errorString = "Unsupported canvas context type"_s;
    204204}
    … …  
    231231        return toJS(&state, deprecatedGlobalObjectForPrototype(&state), downcast<WebGL2RenderingContext>(context));
    232232#endif
    233 #if ENABLE(WEBGPU)
    234     if (is<WebGPURenderingContext>(context))
    235         return toJS(&state, deprecatedGlobalObjectForPrototype(&state), downcast<WebGPURenderingContext>(context));
     233#if ENABLE(WEBMETAL)
     234    if (is<WebMetalRenderingContext>(context))
     235        return toJS(&state, deprecatedGlobalObjectForPrototype(&state), downcast<WebMetalRenderingContext>(context));
    236236#endif
    237237    if (is<ImageBitmapRenderingContext>(context))

  • trunk/Source/WebCore/page/RuntimeEnabledFeatures.h

    r236942 r236954  
    253253#endif
    254254
    255 #if ENABLE(WEBGPU)
    256     void setWebGPUEnabled(bool isEnabled) { m_isWebGPUEnabled = isEnabled; }
    257     bool webGPUEnabled() const { return m_isWebGPUEnabled; }
     255#if ENABLE(WEBMETAL)
     256    void setWebMetalEnabled(bool isEnabled) { m_isWebMetalEnabled = isEnabled; }
     257    bool webMetalEnabled() const { return m_isWebMetalEnabled; }
    258258#endif
    259259
    … …  
    410410#endif
    411411
    412 #if ENABLE(WEBGPU)
    413     bool m_isWebGPUEnabled { false };
     412#if ENABLE(WEBMETAL)
     413    bool m_isWebMetalEnabled { false };
    414414#endif
    415415

  • trunk/Source/WebCore/platform/Logging.h

    r235862 r236954  
    100100    M(WebAudio) \
    101101    M(WebGL) \
    102     M(WebGPU) \
     102    M(WebMetal) \
    103103    M(WebRTC) \
    104104    M(WheelEventTestTriggers) \

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

    r236481 r236954  
    4141#import <pal/spi/cocoa/QuartzCoreSPI.h>
    4242#import <wtf/SoftLinking.h>
    43 #if ENABLE(WEBGPU)
    44 #import "WebGPULayer.h"
     43#if ENABLE(WEBMETAL)
     44#import "WebMetalLayer.h"
    4545#endif
    4646#import "WebLayer.h"
    … …  
    204204        return LayerTypeContentsProvidedLayer;
    205205
    206 #if ENABLE(WEBGPU)
    207     if ([layer isKindOfClass:[WebGPULayer class]])
     206#if ENABLE(WEBMETAL)
     207    if ([layer isKindOfClass:[WebMetalLayer class]])
    208208        return LayerTypeContentsProvidedLayer;
    209209#endif
    … …  
    260260        break;
    261261    case LayerTypeContentsProvidedLayer:
    262         // We don't create PlatformCALayerCocoas wrapped around WebGLLayers or WebGPULayers.
     262        // We don't create PlatformCALayerCocoas wrapped around WebGLLayers or WebMetalLayers.
    263263        ASSERT_NOT_REACHED();
    264264        break;

  • trunk/Source/WebCore/platform/graphics/cocoa/WebMetalLayer.h

    r236953 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#import <Metal/Metal.h>
    … …  
    3636
    3737#if !PLATFORM(IOS_SIMULATOR)
    38 @interface WebGPULayer : CAMetalLayer {
     38@interface WebMetalLayer : CAMetalLayer {
    3939#else
    40 @interface WebGPULayer : CALayer { // FIXME: WebGPU - Disable WebGPU on iOS simulator?
     40@interface WebMetalLayer : CALayer { // FIXME: WebMetal - Disable WebMetal on iOS simulator?
    4141#endif
    4242    WebCore::GPUDevice* _context;

  • trunk/Source/WebCore/platform/graphics/cocoa/WebMetalLayer.mm

    r236953 r236954  
    2525
    2626#include "config.h"
    27 #import "WebGPULayer.h"
     27#import "WebMetalLayer.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDevice.h"
    … …  
    3535#import <wtf/RetainPtr.h>
    3636
    37 @implementation WebGPULayer
     37@implementation WebMetalLayer
    3838
    3939@synthesize context=_context;
    … …  
    4444    _context = context;
    4545
    46     // FIXME: WebGPU - handle retina correctly.
     46    // FIXME: WebMetal - handle retina correctly.
    4747    _devicePixelRatio = 1;
    4848

  • trunk/Source/WebCore/platform/graphics/gpu/GPUBuffer.cpp

    r234258 r236954  
    2727#include "GPUBuffer.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3636GPUBuffer::~GPUBuffer()
    3737{
    38     LOG(WebGPU, "GPUBuffer::~GPUBuffer()");
     38    LOG(WebMetal, "GPUBuffer::~GPUBuffer()");
    3939}
    4040

  • trunk/Source/WebCore/platform/graphics/gpu/GPUBuffer.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.cpp

    r234258 r236954  
    2828#include "GPUCommandBuffer.h"
    2929
    30 #if ENABLE(WEBGPU)
     30#if ENABLE(WEBMETAL)
    3131
    3232#include "Logging.h"
    … …  
    3636GPUCommandBuffer::~GPUCommandBuffer()
    3737{
    38     LOG(WebGPU, "GPUCommandBuffer::~GPUCommandBuffer()");
     38    LOG(WebMetal, "GPUCommandBuffer::~GPUCommandBuffer()");
    3939}
    4040

  • trunk/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.h

    r234258 r236954  
    2727#pragma once
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include <wtf/Function.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUCommandQueue.cpp

    r234258 r236954  
    2727#include "GPUCommandQueue.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUCommandQueue::~GPUCommandQueue()
    3636{
    37     LOG(WebGPU, "GPUCommandQueue::~GPUCommandQueue()");
     37    LOG(WebMetal, "GPUCommandQueue::~GPUCommandQueue()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPUCommandQueue.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUComputeCommandEncoder.cpp

    r234258 r236954  
    2727#include "GPUComputeCommandEncoder.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUComputeCommandEncoder::~GPUComputeCommandEncoder()
    3636{
    37     LOG(WebGPU, "GPUComputeCommandEncoder::~GPUComputeCommandEncoder()");
     37    LOG(WebMetal, "GPUComputeCommandEncoder::~GPUComputeCommandEncoder()");
    3838}
    3939   

  • trunk/Source/WebCore/platform/graphics/gpu/GPUComputeCommandEncoder.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUComputePipelineState.cpp

    r234258 r236954  
    2727#include "GPUComputePipelineState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUComputePipelineState::~GPUComputePipelineState()
    3636{
    37     LOG(WebGPU, "GPUComputePipelineState::~GPUComputePipelineState()");
     37    LOG(WebMetal, "GPUComputePipelineState::~GPUComputePipelineState()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPUComputePipelineState.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUDepthStencilDescriptor.cpp

    r234258 r236954  
    2727#include "GPUDepthStencilDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()
    3636{
    37     LOG(WebGPU, "GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()");
     37    LOG(WebMetal, "GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPUDepthStencilDescriptor.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUDepthStencilState.cpp

    r234258 r236954  
    2727#include "GPUDepthStencilState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUDepthStencilState::~GPUDepthStencilState()
    3636{
    37     LOG(WebGPU, "GPUDepthStencilState::~GPUDepthStencilState()");
     37    LOG(WebMetal, "GPUDepthStencilState::~GPUDepthStencilState()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPUDepthStencilState.h

    r234564 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/Forward.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp

    r234258 r236954  
    2727#include "GPUDevice.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUDevice::~GPUDevice()
    3636{
    37     LOG(WebGPU, "GPUDevice::~GPUDevice()");
     37    LOG(WebMetal, "GPUDevice::~GPUDevice()");
    3838    disconnect();
    3939}

  • trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>
    3131
    3232OBJC_CLASS CALayer;
    33 OBJC_CLASS WebGPULayer;
     33OBJC_CLASS WebMetalLayer;
    3434
    3535OBJC_PROTOCOL(MTLDevice);
    … …  
    4747
    4848#if USE(METAL)
    49     WebGPULayer *layer() const { return m_layer.get(); }
     49    WebMetalLayer *layer() const { return m_layer.get(); }
    5050    WEBCORE_EXPORT CALayer *platformLayer() const;
    5151    MTLDevice *metal() const { return m_metal.get(); }
    … …  
    5858
    5959#if USE(METAL)
    60     RetainPtr<WebGPULayer> m_layer;
     60    RetainPtr<WebMetalLayer> m_layer;
    6161    RetainPtr<MTLDevice> m_metal;
    6262#endif

  • trunk/Source/WebCore/platform/graphics/gpu/GPUDrawable.cpp

    r234258 r236954  
    2727#include "GPUDrawable.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUDrawable::~GPUDrawable()
    3636{
    37     LOG(WebGPU, "GPUDrawable::~GPUDrawable()");
     37    LOG(WebMetal, "GPUDrawable::~GPUDrawable()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPUDrawable.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>
    … …  
    4747    MTLDrawable *metal() const;
    4848
    49     // FIXME: WebGPU - not all drawables should have this. Only the framebuffer.
     49    // FIXME: WebMetal - not all drawables should have this. Only the framebuffer.
    5050    MTLTexture *texture() const;
    5151#endif

  • trunk/Source/WebCore/platform/graphics/gpu/GPUEnums.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/gpu/GPUFunction.cpp

    r234258 r236954  
    2727#include "GPUFunction.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUFunction::~GPUFunction()
    3636{
    37     LOG(WebGPU, "GPUFunction::~GPUFunction()");
     37    LOG(WebMetal, "GPUFunction::~GPUFunction()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPUFunction.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPULibrary.cpp

    r234258 r236954  
    2727#include "GPULibrary.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPULibrary::~GPULibrary()
    3636{
    37     LOG(WebGPU, "GPULibrary::~GPULibrary()");
     37    LOG(WebMetal, "GPULibrary::~GPULibrary()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPULibrary.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderCommandEncoder.cpp

    r234258 r236954  
    2727#include "GPURenderCommandEncoder.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPURenderCommandEncoder::~GPURenderCommandEncoder()
    3636{
    37     LOG(WebGPU, "GPURenderCommandEncoder::~GPURenderCommandEncoder()");
     37    LOG(WebMetal, "GPURenderCommandEncoder::~GPURenderCommandEncoder()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderCommandEncoder.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp

    r234258 r236954  
    2727#include "GPURenderPassAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPUTexture.h"
    … …  
    3636GPURenderPassAttachmentDescriptor::~GPURenderPassAttachmentDescriptor()
    3737{
    38     LOG(WebGPU, "GPURenderPassAttachmentDescriptor::~GPURenderPassAttachmentDescriptor()");
     38    LOG(WebMetal, "GPURenderPassAttachmentDescriptor::~GPURenderPassAttachmentDescriptor()");
    3939}
    4040

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassAttachmentDescriptor.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp

    r234258 r236954  
    2727#include "GPURenderPassColorAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPURenderPassColorAttachmentDescriptor::~GPURenderPassColorAttachmentDescriptor()
    3636{
    37     LOG(WebGPU, "GPURenderPassColorAttachmentDescriptor::~GPURenderPassColorAttachmentDescriptor()");
     37    LOG(WebMetal, "GPURenderPassColorAttachmentDescriptor::~GPURenderPassColorAttachmentDescriptor()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderPassAttachmentDescriptor.h"

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.cpp

    r234258 r236954  
    2727#include "GPURenderPassDepthAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor()
    3636{
    37     LOG(WebGPU, "GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor()");
     37    LOG(WebMetal, "GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include "GPURenderPassAttachmentDescriptor.h"

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassDescriptor.cpp

    r234258 r236954  
    2727#include "GPURenderPassDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "GPURenderPassDepthAttachmentDescriptor.h"
    … …  
    3636GPURenderPassDescriptor::~GPURenderPassDescriptor()
    3737{
    38     LOG(WebGPU, "GPURenderPassDescriptor::~GPURenderPassDescriptor()");
     38    LOG(WebMetal, "GPURenderPassDescriptor::~GPURenderPassDescriptor()");
    3939}
    4040

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPassDescriptor.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp

    r234258 r236954  
    2727#include "GPURenderPipelineColorAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPURenderPipelineColorAttachmentDescriptor::~GPURenderPipelineColorAttachmentDescriptor()
    3636{
    37     LOG(WebGPU, "GPURenderPipelineColorAttachmentDescriptor::~GPURenderPipelineColorAttachmentDescriptor()");
     37    LOG(WebMetal, "GPURenderPipelineColorAttachmentDescriptor::~GPURenderPipelineColorAttachmentDescriptor()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipelineDescriptor.cpp

    r234258 r236954  
    2727#include "GPURenderPipelineDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor()
    3636{
    37     LOG(WebGPU, "GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor()");
     37    LOG(WebMetal, "GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipelineDescriptor.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipelineState.cpp

    r234258 r236954  
    2727#include "GPURenderPipelineState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPURenderPipelineState::~GPURenderPipelineState()
    3636{
    37     LOG(WebGPU, "GPURenderPipelineState::~GPURenderPipelineState()");
     37    LOG(WebMetal, "GPURenderPipelineState::~GPURenderPipelineState()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPURenderPipelineState.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUSize.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/gpu/GPUTexture.cpp

    r234258 r236954  
    2727#include "GPUTexture.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUTexture::~GPUTexture()
    3636{
    37     LOG(WebGPU, "GPUTexture::~GPUTexture()");
     37    LOG(WebMetal, "GPUTexture::~GPUTexture()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPUTexture.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/gpu/GPUTextureDescriptor.cpp

    r234258 r236954  
    2727#include "GPUTextureDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#include "Logging.h"
    … …  
    3535GPUTextureDescriptor::~GPUTextureDescriptor()
    3636{
    37     LOG(WebGPU, "GPUTextureDescriptor::~GPUTextureDescriptor()");
     37    LOG(WebMetal, "GPUTextureDescriptor::~GPUTextureDescriptor()");
    3838}
    3939

  • trunk/Source/WebCore/platform/graphics/gpu/GPUTextureDescriptor.h

    r234258 r236954  
    2626#pragma once
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/metal/GPUBufferMetal.mm

    r234258 r236954  
    2727#import "GPUBuffer.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDevice.h"
    … …  
    4040GPUBuffer::GPUBuffer(const GPUDevice& device, const JSC::ArrayBufferView& data)
    4141{
    42     LOG(WebGPU, "GPUBuffer::GPUBuffer()");
     42    LOG(WebMetal, "GPUBuffer::GPUBuffer()");
    4343
    4444    if (!device.metal())

  • trunk/Source/WebCore/platform/graphics/metal/GPUCommandBufferMetal.mm

    r234258 r236954  
    2727#import "GPUCommandBuffer.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUCommandQueue.h"
    … …  
    4141    : m_metal { [queue.metal() commandBuffer] }
    4242{
    43     LOG(WebGPU, "GPUCommandBuffer::GPUCommandBuffer()");
     43    LOG(WebMetal, "GPUCommandBuffer::GPUCommandBuffer()");
    4444
    4545    [m_metal addCompletedHandler:BlockPtr<void (id<MTLCommandBuffer>)>::fromCallable([completedCallback = WTFMove(completedCallback)] (id<MTLCommandBuffer>) mutable {

  • trunk/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm

    r235521 r236954  
    2727#import "GPUCommandQueue.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDevice.h"
    … …  
    4242    : m_metal { adoptNS([device.metal() newCommandQueue]) }
    4343{
    44     LOG(WebGPU, "GPUCommandQueue::GPUCommandQueue()");
     44    LOG(WebMetal, "GPUCommandQueue::GPUCommandQueue()");
    4545
    4646    [m_metal setLabel:commandQueueDefaultLabel];

  • trunk/Source/WebCore/platform/graphics/metal/GPUComputeCommandEncoderMetal.mm

    r234258 r236954  
    2727#import "GPUComputeCommandEncoder.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUBuffer.h"
    … …  
    4646    : m_metal { [buffer.metal() computeCommandEncoder] }
    4747{
    48     LOG(WebGPU, "GPUComputeCommandEncoder::GPUComputeCommandEncoder()");
     48    LOG(WebMetal, "GPUComputeCommandEncoder::GPUComputeCommandEncoder()");
    4949}
    5050

  • trunk/Source/WebCore/platform/graphics/metal/GPUComputePipelineStateMetal.mm

    r234258 r236954  
    2727#import "GPUComputePipelineState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDevice.h"
    … …  
    3838GPUComputePipelineState::GPUComputePipelineState(const GPUDevice& device, const GPUFunction& function)
    3939{
    40     LOG(WebGPU, "GPUComputePipelineState::GPUComputePipelineState()");
     40    LOG(WebMetal, "GPUComputePipelineState::GPUComputePipelineState()");
    4141
    4242    if (!function.metal())

  • trunk/Source/WebCore/platform/graphics/metal/GPUDepthStencilDescriptorMetal.mm

    r234258 r236954  
    2727#import "GPUDepthStencilDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUEnums.h"
    … …  
    3838    : m_metal { adoptNS([MTLDepthStencilDescriptor new]) }
    3939{
    40     LOG(WebGPU, "GPUDepthStencilDescriptor::GPUDepthStencilDescriptor()");
     40    LOG(WebMetal, "GPUDepthStencilDescriptor::GPUDepthStencilDescriptor()");
    4141}
    4242

  • trunk/Source/WebCore/platform/graphics/metal/GPUDepthStencilStateMetal.mm

    r234258 r236954  
    2727#import "GPUDepthStencilState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDepthStencilDescriptor.h"
    … …  
    4040    : m_metal { adoptNS([device.metal() newDepthStencilStateWithDescriptor:descriptor.metal()]) }
    4141{
    42     LOG(WebGPU, "GPUDepthStencilState::GPUDepthStencilState()");
     42    LOG(WebMetal, "GPUDepthStencilState::GPUDepthStencilState()");
    4343}
    4444
    … …  
    5555    // FIXME: The MTLDepthStencilState protocol does not allow setting the label.
    5656    // The label has to be set on the descriptor when creating the state object.
    57     // We should consider changing the WebGPU interface to not require this!
     57    // We should consider changing the WebMetal interface to not require this!
    5858}
    5959   

  • trunk/Source/WebCore/platform/graphics/metal/GPUDeviceMetal.mm

    r234258 r236954  
    2727#import "GPUDevice.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "Logging.h"
    32 #import "WebGPULayer.h"
     32#import "WebMetalLayer.h"
    3333#import <JavaScriptCore/ArrayBuffer.h>
    3434#import <Metal/Metal.h>
    … …  
    4242
    4343    if (!m_metal) {
    44         LOG(WebGPU, "GPUDevice::GPUDevice -- could not create the device. This usually means Metal is not available on this hardware.");
     44        LOG(WebMetal, "GPUDevice::GPUDevice -- could not create the device. This usually means Metal is not available on this hardware.");
    4545        return;
    4646    }
    4747
    48     LOG(WebGPU, "GPUDevice::GPUDevice Metal device is %p", m_metal.get());
     48    LOG(WebMetal, "GPUDevice::GPUDevice Metal device is %p", m_metal.get());
    4949
    5050    BEGIN_BLOCK_OBJC_EXCEPTIONS
    5151
    52     m_layer = adoptNS([[WebGPULayer alloc] initWithGPUDevice:this]);
     52    m_layer = adoptNS([[WebMetalLayer alloc] initWithGPUDevice:this]);
    5353    [m_layer setOpaque:0];
    54     [m_layer setName:@"WebGPU Layer"];
     54    [m_layer setName:@"WebMetal Layer"];
    5555
    56     // FIXME: WebGPU - Should this be in the WebGPULayer initializer?
     56    // FIXME: WebMetal - Should this be in the WebMetalLayer initializer?
    5757    [m_layer setDevice:m_metal.get()];
    5858    [m_layer setPixelFormat:MTLPixelFormatBGRA8Unorm];
    … …  
    7373    [m_layer setDrawableSize:CGSizeMake(width, height)];
    7474
    75     // FIXME: WebGPU - Lots of reshape stuff should go here. See GC3D.
     75    // FIXME: WebMetal - Lots of reshape stuff should go here. See GC3D.
    7676}
    7777

  • trunk/Source/WebCore/platform/graphics/metal/GPUDrawableMetal.mm

    r234348 r236954  
    2727#import "GPUDrawable.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDevice.h"
    3232#import "Logging.h"
    33 #import "WebGPULayer.h"
     33#import "WebMetalLayer.h"
    3434
    3535namespace WebCore {
    … …  
    3838    : m_metal { [device.layer() nextDrawable] }
    3939{
    40     LOG(WebGPU, "GPUDrawable::GPUDrawable()");
     40    LOG(WebMetal, "GPUDrawable::GPUDrawable()");
    4141}
    4242
    4343void GPUDrawable::release()
    4444{
    45     LOG(WebGPU, "GPUDrawable::release()");
     45    LOG(WebMetal, "GPUDrawable::release()");
    4646    m_metal = nil;
    4747}

  • trunk/Source/WebCore/platform/graphics/metal/GPUFunctionMetal.mm

    r234258 r236954  
    2727#import "GPUFunction.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPULibrary.h"
    … …  
    3939    : m_metal { adoptNS([library.metal() newFunctionWithName:name]) }
    4040{
    41     LOG(WebGPU, "GPUFunction::GPUFunction()");
     41    LOG(WebMetal, "GPUFunction::GPUFunction()");
    4242}
    4343

  • trunk/Source/WebCore/platform/graphics/metal/GPULibraryMetal.mm

    r234258 r236954  
    2727#import "GPULibrary.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDevice.h"
    … …  
    3939GPULibrary::GPULibrary(const GPUDevice& device, const String& sourceCode)
    4040{
    41     LOG(WebGPU, "GPULibrary::GPULibrary()");
     41    LOG(WebMetal, "GPULibrary::GPULibrary()");
    4242
    4343    if (!device.metal())
    … …  
    4747    m_metal = adoptNS([device.metal() newLibraryWithSource:sourceCode options:nil error:&error]);
    4848    if (!m_metal)
    49         LOG(WebGPU, "Compilation error: %s", [[error localizedDescription] UTF8String]);
     49        LOG(WebMetal, "Compilation error: %s", [[error localizedDescription] UTF8String]);
    5050}
    5151

  • trunk/Source/WebCore/platform/graphics/metal/GPURenderCommandEncoderMetal.mm

    r234258 r236954  
    2727#import "GPURenderCommandEncoder.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUBuffer.h"
    … …  
    4141GPURenderCommandEncoder::GPURenderCommandEncoder(const GPUCommandBuffer& buffer, const GPURenderPassDescriptor& descriptor)
    4242{
    43     LOG(WebGPU, "GPURenderCommandEncoder::GPURenderCommandEncoder()");
     43    LOG(WebMetal, "GPURenderCommandEncoder::GPURenderCommandEncoder()");
    4444
    4545    if (!descriptor.metal())

  • trunk/Source/WebCore/platform/graphics/metal/GPURenderPassAttachmentDescriptorMetal.mm

    r234258 r236954  
    2727#import "GPURenderPassAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUTexture.h"
    … …  
    3939    : m_metal { metal }
    4040{
    41     LOG(WebGPU, "GPURenderPassAttachmentDescriptor::GPURenderPassAttachmentDescriptor()");
     41    LOG(WebMetal, "GPURenderPassAttachmentDescriptor::GPURenderPassAttachmentDescriptor()");
    4242}
    4343

  • trunk/Source/WebCore/platform/graphics/metal/GPURenderPassColorAttachmentDescriptorMetal.mm

    r234258 r236954  
    2727#import "GPURenderPassColorAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "FloatConversion.h"
    … …  
    3939    : GPURenderPassAttachmentDescriptor { metal }
    4040{
    41     LOG(WebGPU, "GPURenderPassColorAttachmentDescriptor::GPURenderPassColorAttachmentDescriptor()");
     41    LOG(WebMetal, "GPURenderPassColorAttachmentDescriptor::GPURenderPassColorAttachmentDescriptor()");
    4242}
    4343

  • trunk/Source/WebCore/platform/graphics/metal/GPURenderPassDepthAttachmentDescriptorMetal.mm

    r234258 r236954  
    2727#import "GPURenderPassDepthAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPURenderPassAttachmentDescriptor.h"
    … …  
    3838    : GPURenderPassAttachmentDescriptor { metal }
    3939{
    40     LOG(WebGPU, "GPURenderPassDepthAttachmentDescriptor::GPURenderPassDepthAttachmentDescriptor()");
     40    LOG(WebMetal, "GPURenderPassDepthAttachmentDescriptor::GPURenderPassDepthAttachmentDescriptor()");
    4141}
    4242

  • trunk/Source/WebCore/platform/graphics/metal/GPURenderPassDescriptorMetal.mm

    r236445 r236954  
    2727#import "GPURenderPassDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPURenderPassColorAttachmentDescriptor.h"
    … …  
    4040    : m_metal { adoptNS([MTLRenderPassDescriptor new]) }
    4141{
    42     LOG(WebGPU, "GPURenderPassDescriptor::GPURenderPassDescriptor()");
     42    LOG(WebMetal, "GPURenderPassDescriptor::GPURenderPassDescriptor()");
    4343}
    4444

  • trunk/Source/WebCore/platform/graphics/metal/GPURenderPipelineColorAttachmentDescriptorMetal.mm

    r234258 r236954  
    2727#import "GPURenderPipelineColorAttachmentDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "Logging.h"
    … …  
    3737    : m_metal { metal }
    3838{
    39     LOG(WebGPU, "GPURenderPipelineColorAttachmentDescriptor::GPURenderPipelineColorAttachmentDescriptor()");
     39    LOG(WebMetal, "GPURenderPipelineColorAttachmentDescriptor::GPURenderPipelineColorAttachmentDescriptor()");
    4040}
    4141

  • trunk/Source/WebCore/platform/graphics/metal/GPURenderPipelineDescriptorMetal.mm

    r234258 r236954  
    2727#import "GPURenderPipelineDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUFunction.h"
    … …  
    4040    : m_metal { adoptNS([MTLRenderPipelineDescriptor new]) }
    4141{
    42     LOG(WebGPU, "GPURenderPipelineDescriptor::GPURenderPipelineDescriptor()");
     42    LOG(WebMetal, "GPURenderPipelineDescriptor::GPURenderPipelineDescriptor()");
    4343}
    4444

  • trunk/Source/WebCore/platform/graphics/metal/GPURenderPipelineStateMetal.mm

    r234258 r236954  
    2727#import "GPURenderPipelineState.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDevice.h"
    … …  
    4040    : m_metal { adoptNS([device.metal() newRenderPipelineStateWithDescriptor:descriptor.metal() error:nil]) }
    4141{
    42     LOG(WebGPU, "GPURenderPipelineState::GPURenderPipelineState()");
     42    LOG(WebMetal, "GPURenderPipelineState::GPURenderPipelineState()");
    4343}
    4444
    … …  
    5454    // FIXME: The MTLRenderPipelineState protocol does not allow setting the label.
    5555    // The label has to be set on the descriptor when creating the state object.
    56     // We should consider changing the WebGPU interface to not require this!
     56    // We should consider changing the WebMetal interface to not require this!
    5757}
    5858   

  • trunk/Source/WebCore/platform/graphics/metal/GPUTextureDescriptorMetal.mm

    r234258 r236954  
    2727#import "GPUTextureDescriptor.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "Logging.h"
    … …  
    3737    : m_metal { [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:static_cast<MTLPixelFormat>(pixelFormat) width:width height:height mipmapped:mipmapped] }
    3838{
    39     LOG(WebGPU, "GPUTextureDescriptor::GPUTextureDescriptor()");
     39    LOG(WebMetal, "GPUTextureDescriptor::GPUTextureDescriptor()");
    4040}
    4141

  • trunk/Source/WebCore/platform/graphics/metal/GPUTextureMetal.mm

    r234258 r236954  
    2727#import "GPUTexture.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUDevice.h"
    … …  
    3939GPUTexture::GPUTexture(const GPUDevice& device, const GPUTextureDescriptor& descriptor)
    4040{
    41     LOG(WebGPU, "GPUTexture::GPUTexture()");
     41    LOG(WebMetal, "GPUTexture::GPUTexture()");
    4242
    4343    if (!descriptor.metal())
    … …  
    5050    : m_metal { other.texture() }
    5151{
    52     LOG(WebGPU, "GPUTexture::GPUTexture()");
     52    LOG(WebMetal, "GPUTexture::GPUTexture()");
    5353}
    5454

  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r234808 r236954  
    112112    , m_webGL2Enabled(RuntimeEnabledFeatures::sharedFeatures().webGL2Enabled())
    113113#endif
    114 #if ENABLE(WEBGPU)
    115     , m_webGPUEnabled(RuntimeEnabledFeatures::sharedFeatures().webGPUEnabled())
     114#if ENABLE(WEBMETAL)
     115    , m_webMetalEnabled(RuntimeEnabledFeatures::sharedFeatures().webMetalEnabled())
    116116#endif
    117117    , m_webVREnabled(RuntimeEnabledFeatures::sharedFeatures().webVREnabled())
    … …  
    217217    RuntimeEnabledFeatures::sharedFeatures().setWebGL2Enabled(m_webGL2Enabled);
    218218#endif
    219 #if ENABLE(WEBGPU)
    220     RuntimeEnabledFeatures::sharedFeatures().setWebGPUEnabled(m_webGPUEnabled);
     219#if ENABLE(WEBMETAL)
     220    RuntimeEnabledFeatures::sharedFeatures().setWebMetalEnabled(m_webMetalEnabled);
    221221#endif
    222222    RuntimeEnabledFeatures::sharedFeatures().setWebVREnabled(m_webVREnabled);
    … …  
    759759}
    760760
    761 void InternalSettings::setWebGPUEnabled(bool enabled)
    762 {
    763 #if ENABLE(WEBGPU)
    764     RuntimeEnabledFeatures::sharedFeatures().setWebGPUEnabled(enabled);
     761void InternalSettings::setWebMetalEnabled(bool enabled)
     762{
     763#if ENABLE(WEBMETAL)
     764    RuntimeEnabledFeatures::sharedFeatures().setWebMetalEnabled(enabled);
    765765#else
    766766    UNUSED_PARAM(enabled);

  • trunk/Source/WebCore/testing/InternalSettings.h

    r233115 r236954  
    123123    static void setIndexedDBWorkersEnabled(bool);
    124124    static void setWebGL2Enabled(bool);
    125     static void setWebGPUEnabled(bool);
     125    static void setWebMetalEnabled(bool);
    126126    static void setWebVREnabled(bool);
    127127    static void setScreenCaptureEnabled(bool);
    … …  
    210210        bool m_indexedDBWorkersEnabled;
    211211        bool m_webGL2Enabled;
    212         bool m_webGPUEnabled;
     212        bool m_webMetalEnabled;
    213213        bool m_webVREnabled;
    214214        bool m_setScreenCaptureEnabled;

  • trunk/Source/WebCore/testing/InternalSettings.idl

    r233115 r236954  
    9191    void setIndexedDBWorkersEnabled(boolean enabled);
    9292    void setWebGL2Enabled(boolean enabled);
    93     void setWebGPUEnabled(boolean enabled);
     93    void setWebMetalEnabled(boolean enabled);
    9494    void setWebVREnabled(boolean enabled);
    9595    void setScreenCaptureEnabled(boolean enabled);

  • trunk/Source/WebInspectorUI/ChangeLog

    r236953 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     10        For WebInspector, add WebMetal to valid enums for canvas types.
     11
     12        * UserInterface/Models/Canvas.js:
     13        (WI.Canvas.fromPayload):
     14        (WI.Canvas.displayNameForContextType):
     15
    1162018-10-08  Devin Rousso  <drousso@apple.com>
    217

  • trunk/Source/WebInspectorUI/UserInterface/Models/Canvas.js

    r236952 r236954  
    7575        case CanvasAgent.ContextType.WebGPU:
    7676            contextType = WI.Canvas.ContextType.WebGPU;
     77        case CanvasAgent.ContextType.WebMetal:
     78            contextType = WI.Canvas.ContextType.WebMetal;
    7779            break;
    7880        default:
    … …  
    102104        case WI.Canvas.ContextType.WebGPU:
    103105            return WI.unlocalizedString("WebGPU");
     106        case WI.Canvas.ContextType.WebMetal:
     107            return WI.unlocalizedString("WebMetal");
    104108        default:
    105109            console.error("Invalid canvas context type", contextType);
    … …  
    369373    WebGL2: "webgl2",
    370374    WebGPU: "webgpu",
     375    WebMetal: "webmetal",
    371376};
    372377

  • trunk/Source/WebKit/ChangeLog

    r236951 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     10
     11        * Configurations/FeatureDefines.xcconfig:
     12        * Shared/WebPreferences.yaml:
     13        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     14        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
     15
    1162018-10-08  Wenson Hsieh  <wenson_hsieh@apple.com>
    217

  • trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig

    r236942 r236954  
    351351ENABLE_WEBGL2 = ENABLE_WEBGL2;
    352352
    353 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
    354 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
    355 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
    356 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
    357 ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
     353ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
     354ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
     355ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
     356ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
     357ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
    358358
    359359ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
    … …  
    373373ENABLE_XSLT = ENABLE_XSLT;
    374374
    375 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_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);
     375FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);

  • trunk/Source/WebKit/Shared/WebPreferences.yaml

    r236951 r236954  
    12391239  condition: ENABLE(WEBGL2)
    12401240
    1241 WebGPUEnabled:
    1242   type: bool
    1243   defaultValue: false
    1244   humanReadableName: "WebGPU"
    1245   humanReadableDescription: "WebGPU prototype"
    1246   category: experimental
    1247   webcoreBinding: RuntimeEnabledFeatures
    1248   condition: ENABLE(WEBGPU)
     1241WebMetalEnabled:
     1242  type: bool
     1243  defaultValue: false
     1244  humanReadableName: "WebMetal"
     1245  humanReadableDescription: "WebMetal prototype"
     1246  category: experimental
     1247  webcoreBinding: RuntimeEnabledFeatures
     1248  condition: ENABLE(WEBMETAL)
    12491249
    12501250AccessibilityObjectModelEnabled:

  • trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp

    r236762 r236954  
    212212#endif
    213213
    214 #if ENABLE(WEBGPU)
    215     if (preference == "WebKitWebGPUEnabled")
    216         RuntimeEnabledFeatures::sharedFeatures().setWebGPUEnabled(enabled);
     214#if ENABLE(WEBMETAL)
     215    if (preference == "WebKitWebMetalEnabled")
     216        RuntimeEnabledFeatures::sharedFeatures().setWebMetalEnabled(enabled);
    217217#endif
    218218

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r236942 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     10
     11        * Configurations/FeatureDefines.xcconfig:
     12        * WebView/WebPreferenceKeysPrivate.h:
     13        * WebView/WebPreferences.mm:
     14        (+[WebPreferences initialize]):
     15        (-[WebPreferences webMetalEnabled]):
     16        (-[WebPreferences setWebMetalEnabled:]):
     17        (-[WebPreferences webGPUEnabled]): Deleted.
     18        (-[WebPreferences setWebGPUEnabled:]): Deleted.
     19        * WebView/WebPreferencesPrivate.h:
     20        * WebView/WebView.mm:
     21        (-[WebView _preferencesChanged:]):
     22
    1232018-10-08  Aditya Keerthi  <akeerthi@apple.com>
    224

  • trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig

    r236942 r236954  
    351351ENABLE_WEBGL2 = ENABLE_WEBGL2;
    352352
    353 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
    354 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
    355 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
    356 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
    357 ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
     353ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
     354ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
     355ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
     356ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
     357ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
    358358
    359359ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
    … …  
    373373ENABLE_XSLT = ENABLE_XSLT;
    374374
    375 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_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);
     375FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);

  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h

    r236840 r236954  
    114114#define WebKitWebGLEnabledPreferenceKey @"WebKitWebGLEnabled"
    115115#define WebKitWebGL2EnabledPreferenceKey @"WebKitWebGL2Enabled"
    116 #define WebKitWebGPUEnabledPreferenceKey @"WebKitWebGPUEnabled"
     116#define WebKitWebMetalEnabledPreferenceKey @"WebKitWebMetalEnabled"
    117117#define WebKitForceSoftwareWebGLRenderingPreferenceKey @"WebKitForceSoftwareWebGLRendering"
    118118#define WebKitForceWebGLUsesLowPowerPreferenceKey @"WebKitForceWebGLUsesLowPower"

  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

    r236840 r236954  
    631631        [NSNumber numberWithBool:NO], WebKitWebGL2EnabledPreferenceKey,
    632632#endif
    633 #if ENABLE(WEBGPU)
    634         [NSNumber numberWithBool:NO], WebKitWebGPUEnabledPreferenceKey,
     633#if ENABLE(WEBMETAL)
     634        [NSNumber numberWithBool:NO], WebKitWebMetalEnabledPreferenceKey,
    635635#endif
    636636        [NSNumber numberWithBool:NO], WebKitCacheAPIEnabledPreferenceKey,
    … …  
    21102110}
    21112111
    2112 - (BOOL)webGPUEnabled
    2113 {
    2114     return [self _boolValueForKey:WebKitWebGPUEnabledPreferenceKey];
    2115 }
    2116 
    2117 - (void)setWebGPUEnabled:(BOOL)enabled
    2118 {
    2119     [self _setBoolValue:enabled forKey:WebKitWebGPUEnabledPreferenceKey];
     2112- (BOOL)webMetalEnabled
     2113{
     2114    return [self _boolValueForKey:WebKitWebMetalEnabledPreferenceKey];
     2115}
     2116
     2117- (void)setWebMetalEnabled:(BOOL)enabled
     2118{
     2119    [self _setBoolValue:enabled forKey:WebKitWebMetalEnabledPreferenceKey];
    21202120}
    21212121

  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h

    r236840 r236954  
    273273- (void)setForceWebGLUsesLowPower:(BOOL)forceLowPower;
    274274
    275 - (BOOL)webGPUEnabled;
    276 - (void)setWebGPUEnabled:(BOOL)enabled;
     275- (BOOL)webMetalEnabled;
     276- (void)setWebMetalEnabled:(BOOL)enabled;
    277277
    278278- (BOOL)accelerated2dCanvasEnabled;

  • trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r236846 r236954  
    31123112#endif
    31133113
    3114 #if ENABLE(WEBGPU)
    3115     RuntimeEnabledFeatures::sharedFeatures().setWebGPUEnabled([preferences webGPUEnabled]);
     3114#if ENABLE(WEBMETAL)
     3115    RuntimeEnabledFeatures::sharedFeatures().setWebMetalEnabled([preferences webMetalEnabled]);
    31163116#endif
    31173117

  • trunk/Source/cmake/WebKitFeatures.cmake

    r236750 r236954  
    186186    WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle WebGL support" PRIVATE ON)
    187187    WEBKIT_OPTION_DEFINE(ENABLE_WEBGL2 "Toggle WebGL 2.0 support" PRIVATE OFF)
    188     WEBKIT_OPTION_DEFINE(ENABLE_WEBGPU "Toggle WebGPU support" PRIVATE OFF)
     188    WEBKIT_OPTION_DEFINE(ENABLE_WEBMETAL "Toggle WebMetal support" PRIVATE OFF)
    189189    WEBKIT_OPTION_DEFINE(ENABLE_WEBVTT_REGIONS "Toggle webvtt region support" PRIVATE OFF)
    190190    WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" PRIVATE ON)

  • trunk/Tools/ChangeLog

    r236943 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     10
     11        * DumpRenderTree/mac/DumpRenderTree.mm:
     12        (enableExperimentalFeatures):
     13        (resetWebPreferencesToConsistentValues):
     14        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
     15        * TestWebKitAPI/Tests/WebCore/mac/GPUBuffer.mm:
     16        * TestWebKitAPI/Tests/WebCore/mac/GPUCommandQueue.mm:
     17        * TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm:
     18        * TestWebKitAPI/Tests/WebCore/mac/GPUFunction.mm:
     19        * TestWebKitAPI/Tests/WebCore/mac/GPULibrary.mm:
     20        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
     21        (WTR::InjectedBundle::beginTesting):
     22        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     23        (WTR::TestRunner::setWebMetalEnabled):
     24        (WTR::TestRunner::setWebGPUEnabled): Deleted.
     25        * WebKitTestRunner/InjectedBundle/TestRunner.h:
     26
    1272018-10-08  Commit Queue  <commit-queue@webkit.org>
    228

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r236840 r236954  
    855855    [preferences setWebAnimationsEnabled:YES];
    856856    [preferences setWebGL2Enabled:YES];
    857     [preferences setWebGPUEnabled:YES];
     857    [preferences setWebMetalEnabled:YES];
    858858    // FIXME: AsyncFrameScrollingEnabled
    859859    [preferences setWebAuthenticationEnabled:NO];
    … …  
    972972
    973973    [preferences setWebGL2Enabled:YES];
    974     [preferences setWebGPUEnabled:YES];
     974    [preferences setWebMetalEnabled:YES];
    975975
    976976    [preferences setDownloadAttributeEnabled:YES];

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r236942 r236954  
    351351ENABLE_WEBGL2 = ENABLE_WEBGL2;
    352352
    353 ENABLE_WEBGPU = $(ENABLE_WEBGPU_$(WK_PLATFORM_NAME));
    354 ENABLE_WEBGPU_iphoneos = ENABLE_WEBGPU;
    355 ENABLE_WEBGPU_watchos = ENABLE_WEBGPU;
    356 ENABLE_WEBGPU_appletvos = ENABLE_WEBGPU;
    357 ENABLE_WEBGPU_macosx = ENABLE_WEBGPU;
     353ENABLE_WEBMETAL = $(ENABLE_WEBMETAL_$(WK_PLATFORM_NAME));
     354ENABLE_WEBMETAL_iphoneos = ENABLE_WEBMETAL;
     355ENABLE_WEBMETAL_watchos = ENABLE_WEBMETAL;
     356ENABLE_WEBMETAL_appletvos = ENABLE_WEBMETAL;
     357ENABLE_WEBMETAL_macosx = ENABLE_WEBMETAL;
    358358
    359359ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
    … …  
    373373ENABLE_XSLT = ENABLE_XSLT;
    374374
    375 FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_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);
     375FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(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_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(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_JS_ASYNC_ITERATION) $(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_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_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_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPUBuffer.mm

    r234258 r236954  
    2626#import "config.h"
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#import "GPUTest.h"

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPUCommandQueue.mm

    r234258 r236954  
    2626#import "config.h"
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#import "GPUTest.h"

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm

    r234258 r236954  
    2626#import "config.h"
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#import "GPUTest.h"

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPUFunction.mm

    r234258 r236954  
    2727#import "config.h"
    2828
    29 #if ENABLE(WEBGPU)
     29#if ENABLE(WEBMETAL)
    3030
    3131#import "GPUTest.h"

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULibrary.mm

    r234258 r236954  
    2626#import "config.h"
    2727
    28 #if ENABLE(WEBGPU)
     28#if ENABLE(WEBMETAL)
    2929
    3030#import "GPUTest.h"

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

    r236680 r236954  
    497497
    498498    m_testRunner->setWebGL2Enabled(true);
    499     m_testRunner->setWebGPUEnabled(true);
     499    m_testRunner->setWebMetalEnabled(true);
    500500
    501501    m_testRunner->setWritableStreamAPIEnabled(true);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r236842 r236954  
    477477}
    478478
    479 void TestRunner::setWebGPUEnabled(bool enabled)
    480 {
    481     WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitWebGPUEnabled"));
     479void TestRunner::setWebMetalEnabled(bool enabled)
     480{
     481    WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitWebMetalEnabled"));
    482482    auto& injectedBundle = InjectedBundle::singleton();
    483483    WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r236690 r236954  
    105105    void setModernMediaControlsEnabled(bool);
    106106    void setWebGL2Enabled(bool);
    107     void setWebGPUEnabled(bool);
     107    void setWebMetalEnabled(bool);
    108108    void setWritableStreamAPIEnabled(bool);
    109109    void setReadableByteStreamAPIEnabled(bool);

  • trunk/Websites/webkit.org/ChangeLog

    r235717 r236954  
     12018-10-08  Justin Fan  <justin_fan@apple.com>
     2
     3        WebGPU: Rename old WebGPU prototype to WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190325
     5        <rdar://problem/44990443>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Rename WebGPU prototype files to WebMetal in preparation for implementing the new (Oct 2018) WebGPU interface.
     10
     11        * demos/webgpu/shared.js: Removed.
     12        * demos/webmetal/2d.html: Renamed from Websites/webkit.org/demos/webgpu/2d.html.
     13        * demos/webmetal/2d.jpg: Renamed from Websites/webkit.org/demos/webgpu/2d.jpg.
     14        * demos/webmetal/2d.js: Renamed from Websites/webkit.org/demos/webgpu/2d.js.
     15        (init):
     16        * demos/webmetal/circle.svg: Renamed from Websites/webkit.org/demos/webgpu/circle.svg.
     17        * demos/webmetal/cubes.html: Renamed from Websites/webkit.org/demos/webgpu/cubes.html.
     18        * demos/webmetal/cubes.jpg: Renamed from Websites/webkit.org/demos/webgpu/cubes.jpg.
     19        * demos/webmetal/cubes.js: Renamed from Websites/webkit.org/demos/webgpu/cubes.js.
     20        (init):
     21        * demos/webmetal/gl-matrix-min.js: Renamed from Websites/webkit.org/demos/webgpu/gl-matrix-min.js.
     22        * demos/webmetal/hello.html: Renamed from Websites/webkit.org/demos/webgpu/hello.html.
     23        * demos/webmetal/hello.jpg: Renamed from Websites/webkit.org/demos/webgpu/hello.jpg.
     24        * demos/webmetal/hello.js: Renamed from Websites/webkit.org/demos/webgpu/hello.js.
     25        (init):
     26        * demos/webmetal/index.html: Renamed from Websites/webkit.org/demos/webgpu/index.html.
     27        * demos/webmetal/shared.css: Renamed from Websites/webkit.org/demos/webgpu/shared.css.
     28        * demos/webmetal/shared.js: Added.
     29        (const.hasWebMetal):
     30        (const.checkForWebMetal):
     31        * demos/webmetal/simple.html: Renamed from Websites/webkit.org/demos/webgpu/simple.html.
     32        * demos/webmetal/simple.jpg: Renamed from Websites/webkit.org/demos/webgpu/simple.jpg.
     33        * demos/webmetal/simple.js: Renamed from Websites/webkit.org/demos/webgpu/simple.js.
     34        (init):
     35        * experimental-features.html:
     36
    1372018-09-05  Fujii Hironori  <Hironori.Fujii@sony.com>
    238

  • trunk/Websites/webkit.org/demos/webmetal/2d.html

    r236953 r236954  
    44<meta name="viewport" content="width=600">
    55<meta http-equiv="Content-type" content="text/html; charset=utf-8">
    6 <title>WebGPU 2D demo</title>
     6<title>WebMetal 2D demo</title>
    77<link rel="stylesheet" href="shared.css">
    88<link rel="stylesheet" href="https://webkit.org/wp-content/themes/webkit/style.css">
    … …  
    5151<canvas></canvas>
    5252<div id="error">
    53     <h2>WebGPU not available</h2>
     53    <h2>WebMetal not available</h2>
    5454    <p>
    55         Make sure you are on a system with WebGPU enabled. In
     55        Make sure you are on a system with WebMetal enabled. In
    5656        Safari, first make sure the Developer Menu is visible (Preferences →
    57         Advanced), then Develop → Experimental Features → Enable WebGPU.
     57        Advanced), then Develop → Experimental Features → Enable WebMetal.
    5858    </p>
    5959</div>

  • trunk/Websites/webkit.org/demos/webmetal/2d.js

    r236953 r236954  
    5959function init() {
    6060
    61     if (!checkForWebGPU()) {
     61    if (!checkForWebMetal()) {
    6262        return;
    6363    }
    … …  
    6868    canvas.height = canvasSize.height;
    6969
    70     gpu = canvas.getContext("webgpu");
     70    gpu = canvas.getContext("webmetal");
    7171    commandQueue = gpu.createCommandQueue();
    7272
    … …  
    7979    }
    8080
    81     let pipelineDescriptor = new WebGPURenderPipelineDescriptor();
     81    let pipelineDescriptor = new WebMetalRenderPipelineDescriptor();
    8282    pipelineDescriptor.vertexFunction = vertexFunction;
    8383    pipelineDescriptor.fragmentFunction = fragmentFunction;
    … …  
    9595    }
    9696
    97     renderPassDescriptor = new WebGPURenderPassDescriptor();
     97    renderPassDescriptor = new WebMetalRenderPassDescriptor();
    9898    // NOTE: Our API proposal has some of these values as enums, not constant numbers.
    9999    // We haven't got around to implementing the enums yet.

  • trunk/Websites/webkit.org/demos/webmetal/cubes.html

    r236953 r236954  
    44<meta name="viewport" content="width=600">
    55<meta http-equiv="Content-type" content="text/html; charset=utf-8">
    6 <title>WebGPU Cubes demo</title>
     6<title>WebMetal Cubes demo</title>
    77<link rel="stylesheet" href="shared.css">
    88<link rel="stylesheet" href="https://webkit.org/wp-content/themes/webkit/style.css">
    … …  
    6868<canvas></canvas>
    6969<div id="error">
    70     <h2>WebGPU not available</h2>
     70    <h2>WebMetal not available</h2>
    7171    <p>
    72         Make sure you are on a system with WebGPU enabled. In
     72        Make sure you are on a system with WebMetal enabled. In
    7373        Safari, first make sure the Developer Menu is visible (Preferences →
    74         Advanced), then Develop → Experimental Features → Enable WebGPU.
     74        Advanced), then Develop → Experimental Features → Enable WebMetal.
    7575    </p>
    7676</div>

  • trunk/Websites/webkit.org/demos/webmetal/cubes.js

    r236953 r236954  
    149149function init() {
    150150
    151     if (!checkForWebGPU()) {
     151    if (!checkForWebMetal()) {
    152152        return;
    153153    }
    … …  
    162162    mat4.lookAt(viewMatrix, kEye, kCenter, kUp);
    163163
    164     gpu = canvas.getContext("webgpu");
     164    gpu = canvas.getContext("webmetal");
    165165    commandQueue = gpu.createCommandQueue();
    166166
    … …  
    173173    }
    174174
    175     var pipelineDescriptor = new WebGPURenderPipelineDescriptor();
     175    var pipelineDescriptor = new WebMetalRenderPipelineDescriptor();
    176176    pipelineDescriptor.vertexFunction = vertexFunction;
    177177    pipelineDescriptor.fragmentFunction = fragmentFunction;
    … …  
    183183    renderPipelineState = gpu.createRenderPipelineState(pipelineDescriptor);
    184184
    185     let depthStencilDescriptor = new WebGPUDepthStencilDescriptor();
     185    let depthStencilDescriptor = new WebMetalDepthStencilDescriptor();
    186186    depthStencilDescriptor.depthWriteEnabled = true;
    187187    depthStencilDescriptor.depthCompareFunction = "less";
    … …  
    199199    }
    200200
    201     let depthTextureDescriptor = new WebGPUTextureDescriptor(gpu.PixelFormatDepth32Float, canvasSize.width, canvasSize.height, false);
     201    let depthTextureDescriptor = new WebMetalTextureDescriptor(gpu.PixelFormatDepth32Float, canvasSize.width, canvasSize.height, false);
    202202    // NOTE: Our API proposal has some of these values as enums, not constant numbers.
    203203    // We haven't got around to implementing the enums yet.
    … …  
    209209    let depthTexture = gpu.createTexture(depthTextureDescriptor);
    210210
    211     renderPassDescriptor = new WebGPURenderPassDescriptor();
     211    renderPassDescriptor = new WebMetalRenderPassDescriptor();
    212212    // NOTE: Our API proposal has some of these values as enums, not constant numbers.
    213213    // We haven't got around to implementing the enums yet.

  • trunk/Websites/webkit.org/demos/webmetal/hello.html

    r236953 r236954  
    44<meta name="viewport" content="width=600">
    55<meta http-equiv="Content-type" content="text/html; charset=utf-8">
    6 <title>WebGPU Hello World demo</title>
     6<title>WebMetal Hello World demo</title>
    77<link rel="stylesheet" href="shared.css">
    88<link rel="stylesheet" href="https://webkit.org/wp-content/themes/webkit/style.css">
    … …  
    4848<canvas></canvas>
    4949<div id="error">
    50     <h2>WebGPU not available</h2>
     50    <h2>WebMetal not available</h2>
    5151    <p>
    52         Make sure you are on a system with WebGPU enabled. In
     52        Make sure you are on a system with WebMetal enabled. In
    5353        Safari, first make sure the Developer Menu is visible (Preferences →
    54         Advanced), then Develop → Experimental Features → Enable WebGPU.
     54        Advanced), then Develop → Experimental Features → Enable WebMetal.
    5555    </p>
    5656</div>

  • trunk/Websites/webkit.org/demos/webmetal/hello.js

    r236953 r236954  
    88function init() {
    99
    10     if (!checkForWebGPU()) {
     10    if (!checkForWebMetal()) {
    1111        return;
    1212    }
    … …  
    1717    canvas.height = canvasSize.height;
    1818
    19     gpu = canvas.getContext("webgpu");
     19    gpu = canvas.getContext("webmetal");
    2020    commandQueue = gpu.createCommandQueue();
    2121
    … …  
    2828    }
    2929
    30     let pipelineDescriptor = new WebGPURenderPipelineDescriptor();
     30    let pipelineDescriptor = new WebMetalRenderPipelineDescriptor();
    3131    pipelineDescriptor.vertexFunction = vertexFunction;
    3232    pipelineDescriptor.fragmentFunction = fragmentFunction;
    … …  
    3737    renderPipelineState = gpu.createRenderPipelineState(pipelineDescriptor);
    3838
    39     renderPassDescriptor = new WebGPURenderPassDescriptor();
     39    renderPassDescriptor = new WebMetalRenderPassDescriptor();
    4040    // NOTE: Our API proposal has some of these values as enums, not constant numbers.
    4141    // We haven't got around to implementing the enums yet.

  • trunk/Websites/webkit.org/demos/webmetal/index.html

    r236953 r236954  
    44<meta name="viewport" content="width=device-width">
    55<meta http-equiv="Content-type" content="text/html; charset=utf-8">
    6 <title>WebGPU demos</title>
     6<title>WebMetal demos</title>
    77<link rel="stylesheet" href="https://webkit.org/wp-content/themes/webkit/style.css">
    88<link rel="stylesheet" href="https://www.apple.com/wss/fonts?family=Myriad+Set+Pro&amp;v=1">
    … …  
    163163    <header>
    164164        <img src="circle.svg">
    165         <h1>WebGPU<br>demos</h1>
     165        <h1>WebMetal<br>demos</h1>
    166166    </header>
    167167    <section class="demos">
    168168        <p class="intro">
    169169            Here are a collection of simple <a
    170             href="https://webkit.org/blog/7380/next-generation-3d-graphics-on-the-web/">WebGPU</a>
     170            href="https://webkit.org/blog/7380/next-generation-3d-graphics-on-the-web/">WebMetal</a>
    171171            examples. They should work in the latest <a
    172172            href="https://developer.apple.com/safari/technology-preview/">Safari
    … …  
    179179        </p>
    180180        <p class="howto">
    181             Make sure you are on a system with WebGPU enabled. In Safari, first
     181            Make sure you are on a system with WebMetal enabled. In Safari, first
    182182            make sure the Developer Menu is visible (Preferences → Advanced),
    183             then Develop → Experimental Features → Enable WebGPU.
     183            then Develop → Experimental Features → Enable WebMetal.
    184184        </p>
    185185        <p class="warning">
    186             WebGPU is an experimental technology, and you should not browse the entire
     186            WebMetal is an experimental technology, and you should not browse the entire
    187187            Web with it enabled for now. It doesn't do any validation of content, and
    188188            thus may cause some issues with your computer.

  • trunk/Websites/webkit.org/demos/webmetal/simple.html

    r236953 r236954  
    44<meta name="viewport" content="width=600">
    55<meta http-equiv="Content-type" content="text/html; charset=utf-8">
    6 <title>WebGPU Simple demo</title>
     6<title>WebMetal Simple demo</title>
    77<link rel="stylesheet" href="shared.css">
    88<link rel="stylesheet" href="https://webkit.org/wp-content/themes/webkit/style.css">
    … …  
    4747<canvas></canvas>
    4848<div id="error">
    49     <h2>WebGPU not available</h2>
     49    <h2>WebMetal not available</h2>
    5050    <p>
    51         Make sure you are on a system with WebGPU enabled. In
     51        Make sure you are on a system with WebMetal enabled. In
    5252        Safari, first make sure the Developer Menu is visible (Preferences →
    53         Advanced), then Develop → Experimental Features → Enable WebGPU.
     53        Advanced), then Develop → Experimental Features → Enable WebMetal.
    5454    </p>
    5555</div>

  • trunk/Websites/webkit.org/demos/webmetal/simple.js

    r236953 r236954  
    6161function init() {
    6262
    63     if (!checkForWebGPU()) {
     63    if (!checkForWebMetal()) {
    6464        return;
    6565    }
    … …  
    7373    mat4.perspective(projectionMatrix, (2 * Math.PI) / 5, aspect, 1, 100.0);
    7474
    75     gpu = canvas.getContext("webgpu");
     75    gpu = canvas.getContext("webmetal");
    7676    commandQueue = gpu.createCommandQueue();
    7777
    … …  
    8484    }
    8585
    86     let pipelineDescriptor = new WebGPURenderPipelineDescriptor();
     86    let pipelineDescriptor = new WebMetalRenderPipelineDescriptor();
    8787    pipelineDescriptor.vertexFunction = vertexFunction;
    8888    pipelineDescriptor.fragmentFunction = fragmentFunction;
    … …  
    9494    renderPipelineState = gpu.createRenderPipelineState(pipelineDescriptor);
    9595
    96     let depthStencilDescriptor = new WebGPUDepthStencilDescriptor();
     96    let depthStencilDescriptor = new WebMetalDepthStencilDescriptor();
    9797    depthStencilDescriptor.depthWriteEnabled = true;
    9898    depthStencilDescriptor.depthCompareFunction = "less";
    … …  
    104104    }
    105105
    106     let depthTextureDescriptor = new WebGPUTextureDescriptor(gpu.PixelFormatDepth32Float, canvasSize.width, canvasSize.height, false);
     106    let depthTextureDescriptor = new WebMetalTextureDescriptor(gpu.PixelFormatDepth32Float, canvasSize.width, canvasSize.height, false);
    107107    // NOTE: Our API proposal has some of these values as enums, not constant numbers.
    108108    // We haven't got around to implementing the enums yet.
    … …  
    114114    let depthTexture = gpu.createTexture(depthTextureDescriptor);
    115115
    116     renderPassDescriptor = new WebGPURenderPassDescriptor();
     116    renderPassDescriptor = new WebMetalRenderPassDescriptor();
    117117    // NOTE: Our API proposal has some of these values as enums, not constant numbers.
    118118    // We haven't got around to implementing the enums yet.

  • trunk/Websites/webkit.org/experimental-features.html

    r232537 r236954  
    104104}
    105105
    106 function testWebGPU() {
    107     return window.WebGPURenderingContext;
     106function testWebMetal() {
     107    return window.WebMetalRenderingContext;
    108108}
    109109
    … …  
    153153        <div class="test" id="WebAnimationsCSSIntegration"><p>Web Animations and CSS Integration</p></div>
    154154        <div class="test" id="WebGL2"><p>WebGL 2.0</p></div>
    155         <div class="test" id="WebGPU"><p>WebGPU</p></div>
     155        <div class="test" id="WebMetal"><p>WebMetal</p></div>
    156156        <div class="test" id="WebRTC"><p>WebRTC</p></div>
    157157        <div class="test" id="ObjectRest"><p>ObjectRest</p></div>
Note: See TracChangeset for help on using the changeset viewer.