Changeset 237368 in webkit


Ignore:
Timestamp:
Oct 23, 2018 3:05:27 PM (5 years ago)
Author:
Justin Fan
Message:

[WebGPU] Rename old GPU* implementation files to GPULegacy* for WebMetal
https://bugs.webkit.org/show_bug.cgi?id=190817

Reviewed by Dean Jackson.

Source/WebCore:

No new tests. No change in behavior.

  • [Large list of refactored classes and renamed files]: GPU* is now GPULegacy*

Tools:

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebCore/mac/GPULegacyBuffer.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUBuffer.mm.

(TestWebKitAPI::TEST_F):

  • TestWebKitAPI/Tests/WebCore/mac/GPULegacyCommandQueue.mm: Copied from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUFunction.mm.

(TestWebKitAPI::TEST_F):

  • TestWebKitAPI/Tests/WebCore/mac/GPULegacyDevice.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm.

(TestWebKitAPI::TEST_F):

  • TestWebKitAPI/Tests/WebCore/mac/GPULegacyFunction.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUFunction.mm.

(TestWebKitAPI::TEST_F):

  • TestWebKitAPI/Tests/WebCore/mac/GPULegacyLibrary.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPULibrary.mm.

(TestWebKitAPI::TEST_F):

  • TestWebKitAPI/Tests/WebCore/mac/GPULegacyTest.h: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUTest.h.
Location:
trunk
Files:
7 deleted
50 edited
8 copied
63 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r237367 r237368  
     12018-10-23  Justin Fan  <justin_fan@apple.com>
     2
     3        [WebGPU] Rename old GPU* implementation files to GPULegacy* for WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190817
     5
     6        Reviewed by Dean Jackson.
     7
     8        No new tests. No change in behavior.
     9
     10        * [Large list of refactored classes and renamed files]: GPU* is now GPULegacy*
     11
    1122018-10-23  Ryan Haddad  <ryanhaddad@apple.com>
    213
  • trunk/Source/WebCore/Sources.txt

    r237344 r237368  
    17191719platform/graphics/filters/SpotLightSource.cpp
    17201720
    1721 platform/graphics/gpu/GPUBuffer.cpp
    1722 platform/graphics/gpu/GPUCommandBuffer.cpp
    1723 platform/graphics/gpu/GPUCommandQueue.cpp
    1724 platform/graphics/gpu/GPUComputeCommandEncoder.cpp
    1725 platform/graphics/gpu/GPUComputePipelineState.cpp
    1726 platform/graphics/gpu/GPUDepthStencilDescriptor.cpp
    1727 platform/graphics/gpu/GPUDepthStencilState.cpp
    1728 platform/graphics/gpu/GPUDevice.cpp
    1729 platform/graphics/gpu/GPUDrawable.cpp
    1730 platform/graphics/gpu/GPUFunction.cpp
    1731 platform/graphics/gpu/GPULibrary.cpp
    1732 platform/graphics/gpu/GPURenderCommandEncoder.cpp
    1733 platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp
    1734 platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp
    1735 platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.cpp
    1736 platform/graphics/gpu/GPURenderPassDescriptor.cpp
    1737 platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp
    1738 platform/graphics/gpu/GPURenderPipelineDescriptor.cpp
    1739 platform/graphics/gpu/GPURenderPipelineState.cpp
    1740 platform/graphics/gpu/GPUTexture.cpp
    1741 platform/graphics/gpu/GPUTextureDescriptor.cpp
     1721platform/graphics/gpu/GPULegacyBuffer.cpp
     1722platform/graphics/gpu/GPULegacyCommandBuffer.cpp
     1723platform/graphics/gpu/GPULegacyCommandQueue.cpp
     1724platform/graphics/gpu/GPULegacyComputeCommandEncoder.cpp
     1725platform/graphics/gpu/GPULegacyComputePipelineState.cpp
     1726platform/graphics/gpu/GPULegacyDepthStencilDescriptor.cpp
     1727platform/graphics/gpu/GPULegacyDepthStencilState.cpp
     1728platform/graphics/gpu/GPULegacyDevice.cpp
     1729platform/graphics/gpu/GPULegacyDrawable.cpp
     1730platform/graphics/gpu/GPULegacyFunction.cpp
     1731platform/graphics/gpu/GPULegacyLibrary.cpp
     1732platform/graphics/gpu/GPULegacyRenderCommandEncoder.cpp
     1733platform/graphics/gpu/GPULegacyRenderPassAttachmentDescriptor.cpp
     1734platform/graphics/gpu/GPULegacyRenderPassColorAttachmentDescriptor.cpp
     1735platform/graphics/gpu/GPULegacyRenderPassDepthAttachmentDescriptor.cpp
     1736platform/graphics/gpu/GPULegacyRenderPassDescriptor.cpp
     1737platform/graphics/gpu/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp
     1738platform/graphics/gpu/GPULegacyRenderPipelineDescriptor.cpp
     1739platform/graphics/gpu/GPULegacyRenderPipelineState.cpp
     1740platform/graphics/gpu/GPULegacyTexture.cpp
     1741platform/graphics/gpu/GPULegacyTextureDescriptor.cpp
    17421742
    17431743platform/graphics/iso/ISOBox.cpp
  • trunk/Source/WebCore/SourcesCocoa.txt

    r237236 r237368  
    346346platform/graphics/mac/WebKitNSImageExtras.mm
    347347
    348 platform/graphics/metal/GPUBufferMetal.mm
    349 platform/graphics/metal/GPUCommandBufferMetal.mm
    350 platform/graphics/metal/GPUCommandQueueMetal.mm
    351 platform/graphics/metal/GPUComputeCommandEncoderMetal.mm
    352 platform/graphics/metal/GPUComputePipelineStateMetal.mm
    353 platform/graphics/metal/GPUDepthStencilDescriptorMetal.mm
    354 platform/graphics/metal/GPUDepthStencilStateMetal.mm
    355 platform/graphics/metal/GPUDeviceMetal.mm
    356 platform/graphics/metal/GPUDrawableMetal.mm
    357 platform/graphics/metal/GPUFunctionMetal.mm
    358 platform/graphics/metal/GPULibraryMetal.mm
    359 platform/graphics/metal/GPURenderCommandEncoderMetal.mm
    360 platform/graphics/metal/GPURenderPassAttachmentDescriptorMetal.mm
    361 platform/graphics/metal/GPURenderPassColorAttachmentDescriptorMetal.mm
    362 platform/graphics/metal/GPURenderPassDepthAttachmentDescriptorMetal.mm
    363 platform/graphics/metal/GPURenderPassDescriptorMetal.mm
    364 platform/graphics/metal/GPURenderPipelineColorAttachmentDescriptorMetal.mm
    365 platform/graphics/metal/GPURenderPipelineDescriptorMetal.mm
    366 platform/graphics/metal/GPURenderPipelineStateMetal.mm
    367 platform/graphics/metal/GPUTextureDescriptorMetal.mm
    368 platform/graphics/metal/GPUTextureMetal.mm
     348platform/graphics/metal/GPULegacyBufferMetal.mm
     349platform/graphics/metal/GPULegacyCommandBufferMetal.mm
     350platform/graphics/metal/GPULegacyCommandQueueMetal.mm
     351platform/graphics/metal/GPULegacyComputeCommandEncoderMetal.mm
     352platform/graphics/metal/GPULegacyComputePipelineStateMetal.mm
     353platform/graphics/metal/GPULegacyDepthStencilDescriptorMetal.mm
     354platform/graphics/metal/GPULegacyDepthStencilStateMetal.mm
     355platform/graphics/metal/GPULegacyDeviceMetal.mm
     356platform/graphics/metal/GPULegacyDrawableMetal.mm
     357platform/graphics/metal/GPULegacyFunctionMetal.mm
     358platform/graphics/metal/GPULegacyLibraryMetal.mm
     359platform/graphics/metal/GPULegacyRenderCommandEncoderMetal.mm
     360platform/graphics/metal/GPULegacyRenderPassAttachmentDescriptorMetal.mm
     361platform/graphics/metal/GPULegacyRenderPassColorAttachmentDescriptorMetal.mm
     362platform/graphics/metal/GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm
     363platform/graphics/metal/GPULegacyRenderPassDescriptorMetal.mm
     364platform/graphics/metal/GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm
     365platform/graphics/metal/GPULegacyRenderPipelineDescriptorMetal.mm
     366platform/graphics/metal/GPULegacyRenderPipelineStateMetal.mm
     367platform/graphics/metal/GPULegacyTextureDescriptorMetal.mm
     368platform/graphics/metal/GPULegacyTextureMetal.mm
    369369
    370370platform/graphics/opengl/Extensions3DOpenGL.cpp
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r237344 r237368  
    910910                314BE3A11B30F6B700141982 /* CSSNamedImageValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A01B30F6B700141982 /* CSSNamedImageValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    911911                314BE3A71B3103FB00141982 /* NamedImageGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */; };
    912                 316BDB861E6E0A2700DE0D5A /* GPUDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB851E6E0A2100DE0D5A /* GPUDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
     912                316BDB861E6E0A2700DE0D5A /* GPULegacyDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB851E6E0A2100DE0D5A /* GPULegacyDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
    913913                316BDB8C1E6E153000DE0D5A /* WebMetalLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */; };
    914                 316BDB951E70C89700DE0D5A /* GPUFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB931E70C89700DE0D5A /* GPUFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
    915                 316BDB9B1E70CBBF00DE0D5A /* GPULibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB991E70CBBF00DE0D5A /* GPULibrary.h */; settings = {ATTRIBUTES = (Private, ); }; };
    916                 316BDBAA1E71FA9300DE0D5A /* GPUBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBA81E71FA9300DE0D5A /* GPUBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
    917                 316BDBB21E7354BB00DE0D5A /* GPUTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBB01E7354BB00DE0D5A /* GPUTexture.h */; };
    918                 316BDBB81E7357CB00DE0D5A /* GPUTextureDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBB61E7357CB00DE0D5A /* GPUTextureDescriptor.h */; };
    919                 316BDBBC1E73880600DE0D5A /* GPUCommandQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBBA1E73880600DE0D5A /* GPUCommandQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    920                 316BDBCD1E75F18400DE0D5A /* GPUDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBCB1E75F17600DE0D5A /* GPUDrawable.h */; };
    921                 316BDBCE1E75F18A00DE0D5A /* GPUCommandBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBC51E75EE2400DE0D5A /* GPUCommandBuffer.h */; };
    922                 316BDBD31E75F7B600DE0D5A /* GPURenderPassDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBD11E75F7AE00DE0D5A /* GPURenderPassDescriptor.h */; };
    923                 316BDBDB1E7612E200DE0D5A /* GPURenderPassColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBD91E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.h */; };
    924                 316BDBDF1E76137500DE0D5A /* GPURenderPassAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBDD1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.h */; };
    925                 316BDBE41E761F0500DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBE31E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h */; };
    926                 316BDBEB1E76244D00DE0D5A /* GPURenderCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBE91E76244400DE0D5A /* GPURenderCommandEncoder.h */; };
    927                 316BDBF01E76292000DE0D5A /* GPUDepthStencilState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBEF1E76291B00DE0D5A /* GPUDepthStencilState.h */; };
    928                 316BDBF71E762AD500DE0D5A /* GPUDepthStencilDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBF51E762ACD00DE0D5A /* GPUDepthStencilDescriptor.h */; };
    929                 316BDBFB1E762D0400DE0D5A /* GPUEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFA1E762D0400DE0D5A /* GPUEnums.h */; };
    930                 316BDC021E762F6400DE0D5A /* GPURenderPipelineDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFD1E762F5700DE0D5A /* GPURenderPipelineDescriptor.h */; };
    931                 316BDC031E762F6900DE0D5A /* GPURenderPipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFF1E762F5700DE0D5A /* GPURenderPipelineState.h */; };
    932                 316BDC0D1E7634D200DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDC091E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h */; };
     914                316BDB951E70C89700DE0D5A /* GPULegacyFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB931E70C89700DE0D5A /* GPULegacyFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
     915                316BDB9B1E70CBBF00DE0D5A /* GPULegacyLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB991E70CBBF00DE0D5A /* GPULegacyLibrary.h */; settings = {ATTRIBUTES = (Private, ); }; };
     916                316BDBAA1E71FA9300DE0D5A /* GPULegacyBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBA81E71FA9300DE0D5A /* GPULegacyBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
     917                316BDBB21E7354BB00DE0D5A /* GPULegacyTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBB01E7354BB00DE0D5A /* GPULegacyTexture.h */; };
     918                316BDBB81E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBB61E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h */; };
     919                316BDBBC1E73880600DE0D5A /* GPULegacyCommandQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBBA1E73880600DE0D5A /* GPULegacyCommandQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
     920                316BDBCD1E75F18400DE0D5A /* GPULegacyDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBCB1E75F17600DE0D5A /* GPULegacyDrawable.h */; };
     921                316BDBCE1E75F18A00DE0D5A /* GPULegacyCommandBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBC51E75EE2400DE0D5A /* GPULegacyCommandBuffer.h */; };
     922                316BDBD31E75F7B600DE0D5A /* GPULegacyRenderPassDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBD11E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.h */; };
     923                316BDBDB1E7612E200DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBD91E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h */; };
     924                316BDBDF1E76137500DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBDD1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h */; };
     925                316BDBE41E761F0500DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBE31E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h */; };
     926                316BDBEB1E76244D00DE0D5A /* GPULegacyRenderCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBE91E76244400DE0D5A /* GPULegacyRenderCommandEncoder.h */; };
     927                316BDBF01E76292000DE0D5A /* GPULegacyDepthStencilState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBEF1E76291B00DE0D5A /* GPULegacyDepthStencilState.h */; };
     928                316BDBF71E762AD500DE0D5A /* GPULegacyDepthStencilDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBF51E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.h */; };
     929                316BDBFB1E762D0400DE0D5A /* GPULegacyEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFA1E762D0400DE0D5A /* GPULegacyEnums.h */; };
     930                316BDC021E762F6400DE0D5A /* GPULegacyRenderPipelineDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFD1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.h */; };
     931                316BDC031E762F6900DE0D5A /* GPULegacyRenderPipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFF1E762F5700DE0D5A /* GPULegacyRenderPipelineState.h */; };
     932                316BDC0D1E7634D200DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDC091E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */; };
    933933                316DCB201E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1A1E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h */; };
    934934                316DCB221E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1C1E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h */; };
     
    26332633                93A8061E1E03B585008A1F26 /* JSDoubleRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A8061A1E03B585008A1F26 /* JSDoubleRange.h */; };
    26342634                93A806201E03B585008A1F26 /* JSLongRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A8061C1E03B585008A1F26 /* JSLongRange.h */; };
    2635                 93A953B020EBD3C900A619F6 /* GPUComputePipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35EC1E8E23E40043E850 /* GPUComputePipelineState.h */; };
    2636                 93A953B420EBD43200A619F6 /* GPUComputeCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35EA1E8E20D90043E850 /* GPUComputeCommandEncoder.h */; };
    2637                 93A953B520EC9C3F00A619F6 /* GPUSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35F61E8E4D0E0043E850 /* GPUSize.h */; };
     2635                93A953B020EBD3C900A619F6 /* GPULegacyComputePipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35EC1E8E23E40043E850 /* GPULegacyComputePipelineState.h */; };
     2636                93A953B420EBD43200A619F6 /* GPULegacyComputeCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35EA1E8E20D90043E850 /* GPULegacyComputeCommandEncoder.h */; };
     2637                93A953B520EC9C3F00A619F6 /* GPULegacySize.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35F61E8E4D0E0043E850 /* GPULegacySize.h */; };
    26382638                93B2D8160F9920D2006AE6B2 /* SuddenTermination.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B2D8150F9920D2006AE6B2 /* SuddenTermination.h */; settings = {ATTRIBUTES = (Private, ); }; };
    26392639                93B6A0E60B0BCA5C00F5027A /* ContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    68596859                314BE3A41B3103FB00141982 /* NamedImageGeneratedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NamedImageGeneratedImage.cpp; sourceTree = "<group>"; };
    68606860                314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NamedImageGeneratedImage.h; sourceTree = "<group>"; };
    6861                 316BDB841E6E0A2100DE0D5A /* GPUDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUDevice.cpp; sourceTree = "<group>"; };
    6862                 316BDB851E6E0A2100DE0D5A /* GPUDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDevice.h; sourceTree = "<group>"; };
    6863                 316BDB881E6E141C00DE0D5A /* GPUDeviceMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDeviceMetal.mm; sourceTree = "<group>"; };
     6861                316BDB841E6E0A2100DE0D5A /* GPULegacyDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDevice.cpp; sourceTree = "<group>"; };
     6862                316BDB851E6E0A2100DE0D5A /* GPULegacyDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyDevice.h; sourceTree = "<group>"; };
     6863                316BDB881E6E141C00DE0D5A /* GPULegacyDeviceMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDeviceMetal.mm; sourceTree = "<group>"; };
    68646864                316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMetalLayer.h; sourceTree = "<group>"; };
    6865                 316BDB921E70C89700DE0D5A /* GPUFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUFunction.cpp; sourceTree = "<group>"; };
    6866                 316BDB931E70C89700DE0D5A /* GPUFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUFunction.h; sourceTree = "<group>"; };
    6867                 316BDB961E70CA2400DE0D5A /* GPUFunctionMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUFunctionMetal.mm; sourceTree = "<group>"; };
    6868                 316BDB981E70CBBF00DE0D5A /* GPULibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULibrary.cpp; sourceTree = "<group>"; };
    6869                 316BDB991E70CBBF00DE0D5A /* GPULibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULibrary.h; sourceTree = "<group>"; };
    6870                 316BDB9C1E70CD9000DE0D5A /* GPULibraryMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULibraryMetal.mm; sourceTree = "<group>"; };
    6871                 316BDBA51E71FA6F00DE0D5A /* GPUBufferMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUBufferMetal.mm; sourceTree = "<group>"; };
    6872                 316BDBA71E71FA9300DE0D5A /* GPUBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUBuffer.cpp; sourceTree = "<group>"; };
    6873                 316BDBA81E71FA9300DE0D5A /* GPUBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUBuffer.h; sourceTree = "<group>"; };
    6874                 316BDBAD1E73549C00DE0D5A /* GPUTextureMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUTextureMetal.mm; sourceTree = "<group>"; };
    6875                 316BDBAF1E7354BB00DE0D5A /* GPUTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUTexture.cpp; sourceTree = "<group>"; };
    6876                 316BDBB01E7354BB00DE0D5A /* GPUTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUTexture.h; sourceTree = "<group>"; };
    6877                 316BDBB31E7357B000DE0D5A /* GPUTextureDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUTextureDescriptorMetal.mm; sourceTree = "<group>"; };
    6878                 316BDBB51E7357CB00DE0D5A /* GPUTextureDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUTextureDescriptor.cpp; sourceTree = "<group>"; };
    6879                 316BDBB61E7357CB00DE0D5A /* GPUTextureDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUTextureDescriptor.h; sourceTree = "<group>"; };
    6880                 316BDBB91E73880600DE0D5A /* GPUCommandQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUCommandQueue.cpp; sourceTree = "<group>"; };
    6881                 316BDBBA1E73880600DE0D5A /* GPUCommandQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUCommandQueue.h; sourceTree = "<group>"; };
    6882                 316BDBBD1E73881300DE0D5A /* GPUCommandQueueMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUCommandQueueMetal.mm; sourceTree = "<group>"; };
    6883                 316BDBC41E75EE2400DE0D5A /* GPUCommandBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUCommandBuffer.cpp; sourceTree = "<group>"; };
    6884                 316BDBC51E75EE2400DE0D5A /* GPUCommandBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUCommandBuffer.h; sourceTree = "<group>"; };
    6885                 316BDBC61E75EE3D00DE0D5A /* GPUCommandBufferMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUCommandBufferMetal.mm; sourceTree = "<group>"; };
    6886                 316BDBC91E75F16200DE0D5A /* GPUDrawableMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDrawableMetal.mm; sourceTree = "<group>"; };
    6887                 316BDBCA1E75F17600DE0D5A /* GPUDrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUDrawable.cpp; sourceTree = "<group>"; };
    6888                 316BDBCB1E75F17600DE0D5A /* GPUDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDrawable.h; sourceTree = "<group>"; };
    6889                 316BDBD01E75F7AE00DE0D5A /* GPURenderPassDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPassDescriptor.cpp; sourceTree = "<group>"; };
    6890                 316BDBD11E75F7AE00DE0D5A /* GPURenderPassDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPassDescriptor.h; sourceTree = "<group>"; };
    6891                 316BDBD41E75F7CA00DE0D5A /* GPURenderPassDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPassDescriptorMetal.mm; sourceTree = "<group>"; };
    6892                 316BDBD61E7612C400DE0D5A /* GPURenderPassColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPassColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
    6893                 316BDBD81E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPassColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
    6894                 316BDBD91E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPassColorAttachmentDescriptor.h; sourceTree = "<group>"; };
    6895                 316BDBDC1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPassAttachmentDescriptor.cpp; sourceTree = "<group>"; };
    6896                 316BDBDD1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPassAttachmentDescriptor.h; sourceTree = "<group>"; };
    6897                 316BDBE01E761CB500DE0D5A /* GPURenderPassAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPassAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
    6898                 316BDBE21E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPassDepthAttachmentDescriptor.cpp; sourceTree = "<group>"; };
    6899                 316BDBE31E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPassDepthAttachmentDescriptor.h; sourceTree = "<group>"; };
    6900                 316BDBE61E761F2700DE0D5A /* GPURenderPassDepthAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPassDepthAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
    6901                 316BDBE81E76244300DE0D5A /* GPURenderCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderCommandEncoder.cpp; sourceTree = "<group>"; };
    6902                 316BDBE91E76244400DE0D5A /* GPURenderCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderCommandEncoder.h; sourceTree = "<group>"; };
    6903                 316BDBEC1E76246B00DE0D5A /* GPURenderCommandEncoderMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderCommandEncoderMetal.mm; sourceTree = "<group>"; };
    6904                 316BDBEE1E76291B00DE0D5A /* GPUDepthStencilState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUDepthStencilState.cpp; sourceTree = "<group>"; };
    6905                 316BDBEF1E76291B00DE0D5A /* GPUDepthStencilState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDepthStencilState.h; sourceTree = "<group>"; };
    6906                 316BDBF21E76293700DE0D5A /* GPUDepthStencilStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDepthStencilStateMetal.mm; sourceTree = "<group>"; };
    6907                 316BDBF41E762ACD00DE0D5A /* GPUDepthStencilDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUDepthStencilDescriptor.cpp; sourceTree = "<group>"; };
    6908                 316BDBF51E762ACD00DE0D5A /* GPUDepthStencilDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDepthStencilDescriptor.h; sourceTree = "<group>"; };
    6909                 316BDBF81E762BEF00DE0D5A /* GPUDepthStencilDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDepthStencilDescriptorMetal.mm; sourceTree = "<group>"; };
    6910                 316BDBFA1E762D0400DE0D5A /* GPUEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUEnums.h; sourceTree = "<group>"; };
    6911                 316BDBFC1E762F5700DE0D5A /* GPURenderPipelineDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPipelineDescriptor.cpp; sourceTree = "<group>"; };
    6912                 316BDBFD1E762F5700DE0D5A /* GPURenderPipelineDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPipelineDescriptor.h; sourceTree = "<group>"; };
    6913                 316BDBFE1E762F5700DE0D5A /* GPURenderPipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPipelineState.cpp; sourceTree = "<group>"; };
    6914                 316BDBFF1E762F5700DE0D5A /* GPURenderPipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPipelineState.h; sourceTree = "<group>"; };
    6915                 316BDC041E762F7E00DE0D5A /* GPURenderPipelineDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPipelineDescriptorMetal.mm; sourceTree = "<group>"; };
    6916                 316BDC051E762F7E00DE0D5A /* GPURenderPipelineStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPipelineStateMetal.mm; sourceTree = "<group>"; };
    6917                 316BDC081E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPipelineColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
    6918                 316BDC091E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPipelineColorAttachmentDescriptor.h; sourceTree = "<group>"; };
    6919                 316BDC0A1E76343600DE0D5A /* GPURenderPipelineColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPipelineColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
     6865                316BDB921E70C89700DE0D5A /* GPULegacyFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyFunction.cpp; sourceTree = "<group>"; };
     6866                316BDB931E70C89700DE0D5A /* GPULegacyFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyFunction.h; sourceTree = "<group>"; };
     6867                316BDB961E70CA2400DE0D5A /* GPULegacyFunctionMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyFunctionMetal.mm; sourceTree = "<group>"; };
     6868                316BDB981E70CBBF00DE0D5A /* GPULegacyLibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyLibrary.cpp; sourceTree = "<group>"; };
     6869                316BDB991E70CBBF00DE0D5A /* GPULegacyLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyLibrary.h; sourceTree = "<group>"; };
     6870                316BDB9C1E70CD9000DE0D5A /* GPULegacyLibraryMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyLibraryMetal.mm; sourceTree = "<group>"; };
     6871                316BDBA51E71FA6F00DE0D5A /* GPULegacyBufferMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyBufferMetal.mm; sourceTree = "<group>"; };
     6872                316BDBA71E71FA9300DE0D5A /* GPULegacyBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyBuffer.cpp; sourceTree = "<group>"; };
     6873                316BDBA81E71FA9300DE0D5A /* GPULegacyBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyBuffer.h; sourceTree = "<group>"; };
     6874                316BDBAF1E7354BB00DE0D5A /* GPULegacyTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyTexture.cpp; sourceTree = "<group>"; };
     6875                316BDBB01E7354BB00DE0D5A /* GPULegacyTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyTexture.h; sourceTree = "<group>"; };
     6876                316BDBB31E7357B000DE0D5A /* GPULegacyTextureDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyTextureDescriptorMetal.mm; sourceTree = "<group>"; };
     6877                316BDBB51E7357CB00DE0D5A /* GPULegacyTextureDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyTextureDescriptor.cpp; sourceTree = "<group>"; };
     6878                316BDBB61E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyTextureDescriptor.h; sourceTree = "<group>"; };
     6879                316BDBB91E73880600DE0D5A /* GPULegacyCommandQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyCommandQueue.cpp; sourceTree = "<group>"; };
     6880                316BDBBA1E73880600DE0D5A /* GPULegacyCommandQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyCommandQueue.h; sourceTree = "<group>"; };
     6881                316BDBBD1E73881300DE0D5A /* GPULegacyCommandQueueMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyCommandQueueMetal.mm; sourceTree = "<group>"; };
     6882                316BDBC41E75EE2400DE0D5A /* GPULegacyCommandBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyCommandBuffer.cpp; sourceTree = "<group>"; };
     6883                316BDBC51E75EE2400DE0D5A /* GPULegacyCommandBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyCommandBuffer.h; sourceTree = "<group>"; };
     6884                316BDBC61E75EE3D00DE0D5A /* GPULegacyCommandBufferMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyCommandBufferMetal.mm; sourceTree = "<group>"; };
     6885                316BDBC91E75F16200DE0D5A /* GPULegacyDrawableMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDrawableMetal.mm; sourceTree = "<group>"; };
     6886                316BDBCA1E75F17600DE0D5A /* GPULegacyDrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDrawable.cpp; sourceTree = "<group>"; };
     6887                316BDBCB1E75F17600DE0D5A /* GPULegacyDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyDrawable.h; sourceTree = "<group>"; };
     6888                316BDBD01E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassDescriptor.cpp; sourceTree = "<group>"; };
     6889                316BDBD11E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassDescriptor.h; sourceTree = "<group>"; };
     6890                316BDBD41E75F7CA00DE0D5A /* GPULegacyRenderPassDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassDescriptorMetal.mm; sourceTree = "<group>"; };
     6891                316BDBD61E7612C400DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
     6892                316BDBD81E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
     6893                316BDBD91E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassColorAttachmentDescriptor.h; sourceTree = "<group>"; };
     6894                316BDBDC1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassAttachmentDescriptor.cpp; sourceTree = "<group>"; };
     6895                316BDBDD1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassAttachmentDescriptor.h; sourceTree = "<group>"; };
     6896                316BDBE01E761CB500DE0D5A /* GPULegacyRenderPassAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
     6897                316BDBE21E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassDepthAttachmentDescriptor.cpp; sourceTree = "<group>"; };
     6898                316BDBE31E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassDepthAttachmentDescriptor.h; sourceTree = "<group>"; };
     6899                316BDBE61E761F2700DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
     6900                316BDBE81E76244300DE0D5A /* GPULegacyRenderCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderCommandEncoder.cpp; sourceTree = "<group>"; };
     6901                316BDBE91E76244400DE0D5A /* GPULegacyRenderCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderCommandEncoder.h; sourceTree = "<group>"; };
     6902                316BDBEC1E76246B00DE0D5A /* GPULegacyRenderCommandEncoderMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderCommandEncoderMetal.mm; sourceTree = "<group>"; };
     6903                316BDBEE1E76291B00DE0D5A /* GPULegacyDepthStencilState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDepthStencilState.cpp; sourceTree = "<group>"; };
     6904                316BDBEF1E76291B00DE0D5A /* GPULegacyDepthStencilState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyDepthStencilState.h; sourceTree = "<group>"; };
     6905                316BDBF21E76293700DE0D5A /* GPULegacyDepthStencilStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDepthStencilStateMetal.mm; sourceTree = "<group>"; };
     6906                316BDBF41E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDepthStencilDescriptor.cpp; sourceTree = "<group>"; };
     6907                316BDBF51E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyDepthStencilDescriptor.h; sourceTree = "<group>"; };
     6908                316BDBF81E762BEF00DE0D5A /* GPULegacyDepthStencilDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDepthStencilDescriptorMetal.mm; sourceTree = "<group>"; };
     6909                316BDBFA1E762D0400DE0D5A /* GPULegacyEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyEnums.h; sourceTree = "<group>"; };
     6910                316BDBFC1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineDescriptor.cpp; sourceTree = "<group>"; };
     6911                316BDBFD1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineDescriptor.h; sourceTree = "<group>"; };
     6912                316BDBFE1E762F5700DE0D5A /* GPULegacyRenderPipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineState.cpp; sourceTree = "<group>"; };
     6913                316BDBFF1E762F5700DE0D5A /* GPULegacyRenderPipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineState.h; sourceTree = "<group>"; };
     6914                316BDC041E762F7E00DE0D5A /* GPULegacyRenderPipelineDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineDescriptorMetal.mm; sourceTree = "<group>"; };
     6915                316BDC051E762F7E00DE0D5A /* GPULegacyRenderPipelineStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineStateMetal.mm; sourceTree = "<group>"; };
     6916                316BDC081E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
     6917                316BDC091E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineColorAttachmentDescriptor.h; sourceTree = "<group>"; };
     6918                316BDC0A1E76343600DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
    69206919                316DCB121E78BE43001B5F87 /* RTCOfferAnswerOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCOfferAnswerOptions.idl; sourceTree = "<group>"; };
    69216920                316DCB171E78C330001B5F87 /* RTCRtpTransceiverDirection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpTransceiverDirection.idl; sourceTree = "<group>"; };
     
    71997198                381E35E71E8E1E0A0043E850 /* WebGPUComputeCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGPUComputeCommandEncoder.h; sourceTree = "<group>"; };
    72007199                381E35E81E8E1E160043E850 /* WebGPUComputeCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUComputeCommandEncoder.cpp; sourceTree = "<group>"; };
    7201                 381E35E91E8E20AC0043E850 /* GPUComputeCommandEncoderMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUComputeCommandEncoderMetal.mm; sourceTree = "<group>"; };
    7202                 381E35EA1E8E20D90043E850 /* GPUComputeCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUComputeCommandEncoder.h; sourceTree = "<group>"; };
    7203                 381E35EB1E8E21990043E850 /* GPUComputeCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUComputeCommandEncoder.cpp; sourceTree = "<group>"; };
    7204                 381E35EC1E8E23E40043E850 /* GPUComputePipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUComputePipelineState.h; sourceTree = "<group>"; };
    7205                 381E35ED1E8E247A0043E850 /* GPUComputePipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUComputePipelineState.cpp; sourceTree = "<group>"; };
    7206                 381E35EE1E8E24CB0043E850 /* GPUComputePipelineStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUComputePipelineStateMetal.mm; sourceTree = "<group>"; };
     7200                381E35E91E8E20AC0043E850 /* GPULegacyComputeCommandEncoderMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyComputeCommandEncoderMetal.mm; sourceTree = "<group>"; };
     7201                381E35EA1E8E20D90043E850 /* GPULegacyComputeCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyComputeCommandEncoder.h; sourceTree = "<group>"; };
     7202                381E35EB1E8E21990043E850 /* GPULegacyComputeCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyComputeCommandEncoder.cpp; sourceTree = "<group>"; };
     7203                381E35EC1E8E23E40043E850 /* GPULegacyComputePipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyComputePipelineState.h; sourceTree = "<group>"; };
     7204                381E35ED1E8E247A0043E850 /* GPULegacyComputePipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyComputePipelineState.cpp; sourceTree = "<group>"; };
     7205                381E35EE1E8E24CB0043E850 /* GPULegacyComputePipelineStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyComputePipelineStateMetal.mm; sourceTree = "<group>"; };
    72077206                381E35EF1E8E3D7F0043E850 /* WebGPUSize.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebGPUSize.idl; sourceTree = "<group>"; };
    72087207                381E35F51E8E4C420043E850 /* WebGPUSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGPUSize.h; sourceTree = "<group>"; };
    7209                 381E35F61E8E4D0E0043E850 /* GPUSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUSize.h; sourceTree = "<group>"; };
     7208                381E35F61E8E4D0E0043E850 /* GPULegacySize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacySize.h; sourceTree = "<group>"; };
    72107209                387AE9581E8E92EF0000DE96 /* JSWebGPUSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGPUSize.cpp; sourceTree = "<group>"; };
    72117210                387AE9591E8E92EF0000DE96 /* JSWebGPUSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGPUSize.h; sourceTree = "<group>"; };
     
    1375313752                D045AD2221682474000A6E9B /* WebMetalCommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalCommandBuffer.h; sourceTree = "<group>"; };
    1375413753                D045AD2321682475000A6E9B /* WebMetalCommandQueue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalCommandQueue.cpp; sourceTree = "<group>"; };
     13754                D0573D42217EB81E00D1BE91 /* GPULegacyTextureMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyTextureMetal.mm; sourceTree = "<group>"; };
    1375513755                D05CED270A40BB2C00C5AF38 /* FormatBlockCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FormatBlockCommand.cpp; sourceTree = "<group>"; };
    1375613756                D05CED280A40BB2C00C5AF38 /* FormatBlockCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FormatBlockCommand.h; sourceTree = "<group>"; };
     
    1791117911                        isa = PBXGroup;
    1791217912                        children = (
    17913                                 316BDBA71E71FA9300DE0D5A /* GPUBuffer.cpp */,
    17914                                 316BDBA81E71FA9300DE0D5A /* GPUBuffer.h */,
    17915                                 316BDBC41E75EE2400DE0D5A /* GPUCommandBuffer.cpp */,
    17916                                 316BDBC51E75EE2400DE0D5A /* GPUCommandBuffer.h */,
    17917                                 316BDBB91E73880600DE0D5A /* GPUCommandQueue.cpp */,
    17918                                 316BDBBA1E73880600DE0D5A /* GPUCommandQueue.h */,
    17919                                 381E35EB1E8E21990043E850 /* GPUComputeCommandEncoder.cpp */,
    17920                                 381E35EA1E8E20D90043E850 /* GPUComputeCommandEncoder.h */,
    17921                                 381E35ED1E8E247A0043E850 /* GPUComputePipelineState.cpp */,
    17922                                 381E35EC1E8E23E40043E850 /* GPUComputePipelineState.h */,
    17923                                 316BDBF41E762ACD00DE0D5A /* GPUDepthStencilDescriptor.cpp */,
    17924                                 316BDBF51E762ACD00DE0D5A /* GPUDepthStencilDescriptor.h */,
    17925                                 316BDBEE1E76291B00DE0D5A /* GPUDepthStencilState.cpp */,
    17926                                 316BDBEF1E76291B00DE0D5A /* GPUDepthStencilState.h */,
    17927                                 316BDB841E6E0A2100DE0D5A /* GPUDevice.cpp */,
    17928                                 316BDB851E6E0A2100DE0D5A /* GPUDevice.h */,
    17929                                 316BDBCA1E75F17600DE0D5A /* GPUDrawable.cpp */,
    17930                                 316BDBCB1E75F17600DE0D5A /* GPUDrawable.h */,
    17931                                 316BDBFA1E762D0400DE0D5A /* GPUEnums.h */,
    17932                                 316BDB921E70C89700DE0D5A /* GPUFunction.cpp */,
    17933                                 316BDB931E70C89700DE0D5A /* GPUFunction.h */,
    17934                                 316BDB981E70CBBF00DE0D5A /* GPULibrary.cpp */,
    17935                                 316BDB991E70CBBF00DE0D5A /* GPULibrary.h */,
    17936                                 316BDBE81E76244300DE0D5A /* GPURenderCommandEncoder.cpp */,
    17937                                 316BDBE91E76244400DE0D5A /* GPURenderCommandEncoder.h */,
    17938                                 316BDBDC1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.cpp */,
    17939                                 316BDBDD1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.h */,
    17940                                 316BDBD81E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.cpp */,
    17941                                 316BDBD91E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.h */,
    17942                                 316BDBE21E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.cpp */,
    17943                                 316BDBE31E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h */,
    17944                                 316BDBD01E75F7AE00DE0D5A /* GPURenderPassDescriptor.cpp */,
    17945                                 316BDBD11E75F7AE00DE0D5A /* GPURenderPassDescriptor.h */,
    17946                                 316BDC081E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.cpp */,
    17947                                 316BDC091E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h */,
    17948                                 316BDBFC1E762F5700DE0D5A /* GPURenderPipelineDescriptor.cpp */,
    17949                                 316BDBFD1E762F5700DE0D5A /* GPURenderPipelineDescriptor.h */,
    17950                                 316BDBFE1E762F5700DE0D5A /* GPURenderPipelineState.cpp */,
    17951                                 316BDBFF1E762F5700DE0D5A /* GPURenderPipelineState.h */,
    17952                                 381E35F61E8E4D0E0043E850 /* GPUSize.h */,
    17953                                 316BDBAF1E7354BB00DE0D5A /* GPUTexture.cpp */,
    17954                                 316BDBB01E7354BB00DE0D5A /* GPUTexture.h */,
    17955                                 316BDBB51E7357CB00DE0D5A /* GPUTextureDescriptor.cpp */,
    17956                                 316BDBB61E7357CB00DE0D5A /* GPUTextureDescriptor.h */,
     17913                                316BDBA71E71FA9300DE0D5A /* GPULegacyBuffer.cpp */,
     17914                                316BDBA81E71FA9300DE0D5A /* GPULegacyBuffer.h */,
     17915                                316BDBC41E75EE2400DE0D5A /* GPULegacyCommandBuffer.cpp */,
     17916                                316BDBC51E75EE2400DE0D5A /* GPULegacyCommandBuffer.h */,
     17917                                316BDBB91E73880600DE0D5A /* GPULegacyCommandQueue.cpp */,
     17918                                316BDBBA1E73880600DE0D5A /* GPULegacyCommandQueue.h */,
     17919                                381E35EB1E8E21990043E850 /* GPULegacyComputeCommandEncoder.cpp */,
     17920                                381E35EA1E8E20D90043E850 /* GPULegacyComputeCommandEncoder.h */,
     17921                                381E35ED1E8E247A0043E850 /* GPULegacyComputePipelineState.cpp */,
     17922                                381E35EC1E8E23E40043E850 /* GPULegacyComputePipelineState.h */,
     17923                                316BDBF41E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.cpp */,
     17924                                316BDBF51E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.h */,
     17925                                316BDBEE1E76291B00DE0D5A /* GPULegacyDepthStencilState.cpp */,
     17926                                316BDBEF1E76291B00DE0D5A /* GPULegacyDepthStencilState.h */,
     17927                                316BDB841E6E0A2100DE0D5A /* GPULegacyDevice.cpp */,
     17928                                316BDB851E6E0A2100DE0D5A /* GPULegacyDevice.h */,
     17929                                316BDBCA1E75F17600DE0D5A /* GPULegacyDrawable.cpp */,
     17930                                316BDBCB1E75F17600DE0D5A /* GPULegacyDrawable.h */,
     17931                                316BDBFA1E762D0400DE0D5A /* GPULegacyEnums.h */,
     17932                                316BDB921E70C89700DE0D5A /* GPULegacyFunction.cpp */,
     17933                                316BDB931E70C89700DE0D5A /* GPULegacyFunction.h */,
     17934                                316BDB981E70CBBF00DE0D5A /* GPULegacyLibrary.cpp */,
     17935                                316BDB991E70CBBF00DE0D5A /* GPULegacyLibrary.h */,
     17936                                316BDBE81E76244300DE0D5A /* GPULegacyRenderCommandEncoder.cpp */,
     17937                                316BDBE91E76244400DE0D5A /* GPULegacyRenderCommandEncoder.h */,
     17938                                316BDBDC1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.cpp */,
     17939                                316BDBDD1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h */,
     17940                                316BDBD81E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.cpp */,
     17941                                316BDBD91E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h */,
     17942                                316BDBE21E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.cpp */,
     17943                                316BDBE31E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h */,
     17944                                316BDBD01E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.cpp */,
     17945                                316BDBD11E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.h */,
     17946                                316BDC081E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.cpp */,
     17947                                316BDC091E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */,
     17948                                316BDBFC1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.cpp */,
     17949                                316BDBFD1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.h */,
     17950                                316BDBFE1E762F5700DE0D5A /* GPULegacyRenderPipelineState.cpp */,
     17951                                316BDBFF1E762F5700DE0D5A /* GPULegacyRenderPipelineState.h */,
     17952                                381E35F61E8E4D0E0043E850 /* GPULegacySize.h */,
     17953                                316BDBAF1E7354BB00DE0D5A /* GPULegacyTexture.cpp */,
     17954                                316BDBB01E7354BB00DE0D5A /* GPULegacyTexture.h */,
     17955                                316BDBB51E7357CB00DE0D5A /* GPULegacyTextureDescriptor.cpp */,
     17956                                316BDBB61E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h */,
    1795717957                                498770D71242C535002226BA /* Texture.cpp */,
    1795817958                                498770D81242C535002226BA /* Texture.h */,
     
    2070020700                        isa = PBXGroup;
    2070120701                        children = (
    20702                                 316BDBA51E71FA6F00DE0D5A /* GPUBufferMetal.mm */,
    20703                                 316BDBC61E75EE3D00DE0D5A /* GPUCommandBufferMetal.mm */,
    20704                                 316BDBBD1E73881300DE0D5A /* GPUCommandQueueMetal.mm */,
    20705                                 381E35E91E8E20AC0043E850 /* GPUComputeCommandEncoderMetal.mm */,
    20706                                 381E35EE1E8E24CB0043E850 /* GPUComputePipelineStateMetal.mm */,
    20707                                 316BDBF81E762BEF00DE0D5A /* GPUDepthStencilDescriptorMetal.mm */,
    20708                                 316BDBF21E76293700DE0D5A /* GPUDepthStencilStateMetal.mm */,
    20709                                 316BDB881E6E141C00DE0D5A /* GPUDeviceMetal.mm */,
    20710                                 316BDBC91E75F16200DE0D5A /* GPUDrawableMetal.mm */,
    20711                                 316BDB961E70CA2400DE0D5A /* GPUFunctionMetal.mm */,
    20712                                 316BDB9C1E70CD9000DE0D5A /* GPULibraryMetal.mm */,
    20713                                 316BDBEC1E76246B00DE0D5A /* GPURenderCommandEncoderMetal.mm */,
    20714                                 316BDBE01E761CB500DE0D5A /* GPURenderPassAttachmentDescriptorMetal.mm */,
    20715                                 316BDBD61E7612C400DE0D5A /* GPURenderPassColorAttachmentDescriptorMetal.mm */,
    20716                                 316BDBE61E761F2700DE0D5A /* GPURenderPassDepthAttachmentDescriptorMetal.mm */,
    20717                                 316BDBD41E75F7CA00DE0D5A /* GPURenderPassDescriptorMetal.mm */,
    20718                                 316BDC0A1E76343600DE0D5A /* GPURenderPipelineColorAttachmentDescriptorMetal.mm */,
    20719                                 316BDC041E762F7E00DE0D5A /* GPURenderPipelineDescriptorMetal.mm */,
    20720                                 316BDC051E762F7E00DE0D5A /* GPURenderPipelineStateMetal.mm */,
    20721                                 316BDBB31E7357B000DE0D5A /* GPUTextureDescriptorMetal.mm */,
    20722                                 316BDBAD1E73549C00DE0D5A /* GPUTextureMetal.mm */,
     20702                                316BDBA51E71FA6F00DE0D5A /* GPULegacyBufferMetal.mm */,
     20703                                316BDBC61E75EE3D00DE0D5A /* GPULegacyCommandBufferMetal.mm */,
     20704                                316BDBBD1E73881300DE0D5A /* GPULegacyCommandQueueMetal.mm */,
     20705                                381E35E91E8E20AC0043E850 /* GPULegacyComputeCommandEncoderMetal.mm */,
     20706                                381E35EE1E8E24CB0043E850 /* GPULegacyComputePipelineStateMetal.mm */,
     20707                                316BDBF81E762BEF00DE0D5A /* GPULegacyDepthStencilDescriptorMetal.mm */,
     20708                                316BDBF21E76293700DE0D5A /* GPULegacyDepthStencilStateMetal.mm */,
     20709                                316BDB881E6E141C00DE0D5A /* GPULegacyDeviceMetal.mm */,
     20710                                316BDBC91E75F16200DE0D5A /* GPULegacyDrawableMetal.mm */,
     20711                                316BDB961E70CA2400DE0D5A /* GPULegacyFunctionMetal.mm */,
     20712                                316BDB9C1E70CD9000DE0D5A /* GPULegacyLibraryMetal.mm */,
     20713                                316BDBEC1E76246B00DE0D5A /* GPULegacyRenderCommandEncoderMetal.mm */,
     20714                                316BDBE01E761CB500DE0D5A /* GPULegacyRenderPassAttachmentDescriptorMetal.mm */,
     20715                                316BDBD61E7612C400DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptorMetal.mm */,
     20716                                316BDBE61E761F2700DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm */,
     20717                                316BDBD41E75F7CA00DE0D5A /* GPULegacyRenderPassDescriptorMetal.mm */,
     20718                                316BDC0A1E76343600DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm */,
     20719                                316BDC041E762F7E00DE0D5A /* GPULegacyRenderPipelineDescriptorMetal.mm */,
     20720                                316BDC051E762F7E00DE0D5A /* GPULegacyRenderPipelineStateMetal.mm */,
     20721                                316BDBB31E7357B000DE0D5A /* GPULegacyTextureDescriptorMetal.mm */,
     20722                                D0573D42217EB81E00D1BE91 /* GPULegacyTextureMetal.mm */,
    2072320723                        );
    2072420724                        path = metal;
     
    2854428544                                0873B86B136064EA00A522C2 /* GlyphPage.h in Headers */,
    2854528545                                311518FC1E78C15F00EC514A /* GPUBasedCanvasRenderingContext.h in Headers */,
    28546                                 316BDBAA1E71FA9300DE0D5A /* GPUBuffer.h in Headers */,
    28547                                 316BDBCE1E75F18A00DE0D5A /* GPUCommandBuffer.h in Headers */,
    28548                                 316BDBBC1E73880600DE0D5A /* GPUCommandQueue.h in Headers */,
    28549                                 93A953B420EBD43200A619F6 /* GPUComputeCommandEncoder.h in Headers */,
    28550                                 93A953B020EBD3C900A619F6 /* GPUComputePipelineState.h in Headers */,
    28551                                 316BDBF71E762AD500DE0D5A /* GPUDepthStencilDescriptor.h in Headers */,
    28552                                 316BDBF01E76292000DE0D5A /* GPUDepthStencilState.h in Headers */,
    28553                                 316BDB861E6E0A2700DE0D5A /* GPUDevice.h in Headers */,
    28554                                 316BDBCD1E75F18400DE0D5A /* GPUDrawable.h in Headers */,
    28555                                 316BDBFB1E762D0400DE0D5A /* GPUEnums.h in Headers */,
    28556                                 316BDB951E70C89700DE0D5A /* GPUFunction.h in Headers */,
    28557                                 316BDB9B1E70CBBF00DE0D5A /* GPULibrary.h in Headers */,
    28558                                 316BDBEB1E76244D00DE0D5A /* GPURenderCommandEncoder.h in Headers */,
    28559                                 316BDBDF1E76137500DE0D5A /* GPURenderPassAttachmentDescriptor.h in Headers */,
    28560                                 316BDBDB1E7612E200DE0D5A /* GPURenderPassColorAttachmentDescriptor.h in Headers */,
    28561                                 316BDBE41E761F0500DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h in Headers */,
    28562                                 316BDBD31E75F7B600DE0D5A /* GPURenderPassDescriptor.h in Headers */,
    28563                                 316BDC0D1E7634D200DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h in Headers */,
    28564                                 316BDC021E762F6400DE0D5A /* GPURenderPipelineDescriptor.h in Headers */,
    28565                                 316BDC031E762F6900DE0D5A /* GPURenderPipelineState.h in Headers */,
    28566                                 93A953B520EC9C3F00A619F6 /* GPUSize.h in Headers */,
    28567                                 316BDBB21E7354BB00DE0D5A /* GPUTexture.h in Headers */,
    28568                                 316BDBB81E7357CB00DE0D5A /* GPUTextureDescriptor.h in Headers */,
     28546                                316BDBAA1E71FA9300DE0D5A /* GPULegacyBuffer.h in Headers */,
     28547                                316BDBCE1E75F18A00DE0D5A /* GPULegacyCommandBuffer.h in Headers */,
     28548                                316BDBBC1E73880600DE0D5A /* GPULegacyCommandQueue.h in Headers */,
     28549                                93A953B420EBD43200A619F6 /* GPULegacyComputeCommandEncoder.h in Headers */,
     28550                                93A953B020EBD3C900A619F6 /* GPULegacyComputePipelineState.h in Headers */,
     28551                                316BDBF71E762AD500DE0D5A /* GPULegacyDepthStencilDescriptor.h in Headers */,
     28552                                316BDBF01E76292000DE0D5A /* GPULegacyDepthStencilState.h in Headers */,
     28553                                316BDB861E6E0A2700DE0D5A /* GPULegacyDevice.h in Headers */,
     28554                                316BDBCD1E75F18400DE0D5A /* GPULegacyDrawable.h in Headers */,
     28555                                316BDBFB1E762D0400DE0D5A /* GPULegacyEnums.h in Headers */,
     28556                                316BDB951E70C89700DE0D5A /* GPULegacyFunction.h in Headers */,
     28557                                316BDB9B1E70CBBF00DE0D5A /* GPULegacyLibrary.h in Headers */,
     28558                                316BDBEB1E76244D00DE0D5A /* GPULegacyRenderCommandEncoder.h in Headers */,
     28559                                316BDBDF1E76137500DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h in Headers */,
     28560                                316BDBDB1E7612E200DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h in Headers */,
     28561                                316BDBE41E761F0500DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h in Headers */,
     28562                                316BDBD31E75F7B600DE0D5A /* GPULegacyRenderPassDescriptor.h in Headers */,
     28563                                316BDC0D1E7634D200DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h in Headers */,
     28564                                316BDC021E762F6400DE0D5A /* GPULegacyRenderPipelineDescriptor.h in Headers */,
     28565                                316BDC031E762F6900DE0D5A /* GPULegacyRenderPipelineState.h in Headers */,
     28566                                93A953B520EC9C3F00A619F6 /* GPULegacySize.h in Headers */,
     28567                                316BDBB21E7354BB00DE0D5A /* GPULegacyTexture.h in Headers */,
     28568                                316BDBB81E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h in Headers */,
    2856928569                                BC53C5F50DA56B920021EB5D /* Gradient.h in Headers */,
    2857028570                                B22279640D00BF220071B782 /* GradientAttributes.h in Headers */,
  • trunk/Source/WebCore/html/canvas/WebMetalBuffer.cpp

    r236954 r237368  
    3131namespace WebCore {
    3232
    33 RefPtr<WebMetalBuffer> WebMetalBuffer::create(GPUBuffer&& buffer)
     33RefPtr<WebMetalBuffer> WebMetalBuffer::create(GPULegacyBuffer&& buffer)
    3434{
    3535    // FIXME: Consider returning null rather than a buffer with length 0 and contents null when creation fails.
     
    3737}
    3838
    39 WebMetalBuffer::WebMetalBuffer(GPUBuffer&& buffer)
     39WebMetalBuffer::WebMetalBuffer(GPULegacyBuffer&& buffer)
    4040    : m_buffer { WTFMove(buffer) }
    4141{
  • trunk/Source/WebCore/html/canvas/WebMetalBuffer.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUBuffer.h"
     30#include "GPULegacyBuffer.h"
    3131#include <wtf/RefCounted.h>
    3232#include <wtf/RefPtr.h>
     
    3636class WebMetalBuffer : public RefCounted<WebMetalBuffer> {
    3737public:
    38     static RefPtr<WebMetalBuffer> create(GPUBuffer&&);
     38    static RefPtr<WebMetalBuffer> create(GPULegacyBuffer&&);
    3939
    4040    unsigned length() const { return m_buffer.length(); }
    4141    JSC::ArrayBuffer& contents() const { return *m_buffer.contents(); }
    4242
    43     const GPUBuffer& buffer() const { return m_buffer; }
     43    const GPULegacyBuffer& buffer() const { return m_buffer; }
    4444
    4545private:
    46     explicit WebMetalBuffer(GPUBuffer&&);
     46    explicit WebMetalBuffer(GPULegacyBuffer&&);
    4747
    48     GPUBuffer m_buffer;
     48    GPULegacyBuffer m_buffer;
    4949};
    5050
  • trunk/Source/WebCore/html/canvas/WebMetalCommandBuffer.cpp

    r236954 r237368  
    3030#if ENABLE(WEBMETAL)
    3131
    32 #include "GPUCommandBuffer.h"
    33 #include "GPUCommandQueue.h"
     32#include "GPULegacyCommandBuffer.h"
     33#include "GPULegacyCommandQueue.h"
    3434#include "Logging.h"
    3535#include "WebMetalComputeCommandEncoder.h"
     
    4040namespace WebCore {
    4141
    42 Ref<WebMetalCommandBuffer> WebMetalCommandBuffer::create(const GPUCommandQueue& queue)
     42Ref<WebMetalCommandBuffer> WebMetalCommandBuffer::create(const GPULegacyCommandQueue& queue)
    4343{
    4444    return adoptRef(*new WebMetalCommandBuffer(queue));
    4545}
    4646
    47 WebMetalCommandBuffer::WebMetalCommandBuffer(const GPUCommandQueue& queue)
     47WebMetalCommandBuffer::WebMetalCommandBuffer(const GPULegacyCommandQueue& queue)
    4848    : m_buffer { queue, [this] () { m_completed.resolve(); } }
    4949{
     
    7070Ref<WebMetalRenderCommandEncoder> WebMetalCommandBuffer::createRenderCommandEncoderWithDescriptor(WebMetalRenderPassDescriptor& descriptor)
    7171{
    72     return WebMetalRenderCommandEncoder::create(GPURenderCommandEncoder { m_buffer, descriptor.descriptor() });
     72    return WebMetalRenderCommandEncoder::create(GPULegacyRenderCommandEncoder { m_buffer, descriptor.descriptor() });
    7373}
    7474
    7575Ref<WebMetalComputeCommandEncoder> WebMetalCommandBuffer::createComputeCommandEncoder()
    7676{
    77     return WebMetalComputeCommandEncoder::create(GPUComputeCommandEncoder { m_buffer });
     77    return WebMetalComputeCommandEncoder::create(GPULegacyComputeCommandEncoder { m_buffer });
    7878}
    7979
  • trunk/Source/WebCore/html/canvas/WebMetalCommandBuffer.h

    r236954 r237368  
    3030
    3131#include "DOMPromiseProxy.h"
    32 #include "GPUCommandBuffer.h"
     32#include "GPULegacyCommandBuffer.h"
    3333#include <wtf/Ref.h>
    3434#include <wtf/RefCounted.h>
     
    4444public:
    4545    ~WebMetalCommandBuffer();
    46     static Ref<WebMetalCommandBuffer> create(const GPUCommandQueue&);
     46    static Ref<WebMetalCommandBuffer> create(const GPULegacyCommandQueue&);
    4747
    4848    void commit();
     
    5454    DOMPromiseProxy<IDLVoid>& completed();
    5555
    56     const GPUCommandBuffer& buffer() const { return m_buffer; }
     56    const GPULegacyCommandBuffer& buffer() const { return m_buffer; }
    5757
    5858private:
    59     explicit WebMetalCommandBuffer(const GPUCommandQueue&);
     59    explicit WebMetalCommandBuffer(const GPULegacyCommandQueue&);
    6060
    61     GPUCommandBuffer m_buffer;
     61    GPULegacyCommandBuffer m_buffer;
    6262    DOMPromiseProxy<IDLVoid> m_completed;
    6363};
  • trunk/Source/WebCore/html/canvas/WebMetalCommandQueue.cpp

    r236954 r237368  
    3333namespace WebCore {
    3434
    35 Ref<WebMetalCommandQueue> WebMetalCommandQueue::create(GPUCommandQueue&& queue)
     35Ref<WebMetalCommandQueue> WebMetalCommandQueue::create(GPULegacyCommandQueue&& queue)
    3636{
    3737    return adoptRef(*new WebMetalCommandQueue(WTFMove(queue)));
    3838}
    3939
    40 WebMetalCommandQueue::WebMetalCommandQueue(GPUCommandQueue&& queue)
     40WebMetalCommandQueue::WebMetalCommandQueue(GPULegacyCommandQueue&& queue)
    4141    : m_queue { WTFMove(queue) }
    4242{
  • trunk/Source/WebCore/html/canvas/WebMetalCommandQueue.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUCommandQueue.h"
     30#include "GPULegacyCommandQueue.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3939public:
    4040    ~WebMetalCommandQueue();
    41     static Ref<WebMetalCommandQueue> create(GPUCommandQueue&&);
     41    static Ref<WebMetalCommandQueue> create(GPULegacyCommandQueue&&);
    4242
    4343    String label() const { return m_queue.label(); }
     
    4747
    4848private:
    49     explicit WebMetalCommandQueue(GPUCommandQueue&&);
     49    explicit WebMetalCommandQueue(GPULegacyCommandQueue&&);
    5050
    51     GPUCommandQueue m_queue;
     51    GPULegacyCommandQueue m_queue;
    5252};
    5353
  • trunk/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.cpp

    r236954 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #include "GPUCommandBuffer.h"
    32 #include "GPUComputeCommandEncoder.h"
    33 #include "GPUSize.h"
     31#include "GPULegacyCommandBuffer.h"
     32#include "GPULegacyComputeCommandEncoder.h"
     33#include "GPULegacySize.h"
    3434#include "WebMetalBuffer.h"
    3535#include "WebMetalCommandBuffer.h"
     
    3838namespace WebCore {
    3939
    40 static inline GPUSize GPUSizeMake(WebMetalSize size)
     40static inline GPULegacySize GPULegacySizeMake(WebMetalSize size)
    4141{
    4242    return { size.width, size.height, size.depth };
    4343}
    4444
    45 Ref<WebMetalComputeCommandEncoder> WebMetalComputeCommandEncoder::create(GPUComputeCommandEncoder&& encoder)
     45Ref<WebMetalComputeCommandEncoder> WebMetalComputeCommandEncoder::create(GPULegacyComputeCommandEncoder&& encoder)
    4646{
    4747    return adoptRef(*new WebMetalComputeCommandEncoder(WTFMove(encoder)));
    4848}
    4949   
    50 WebMetalComputeCommandEncoder::WebMetalComputeCommandEncoder(GPUComputeCommandEncoder&& encoder)
     50WebMetalComputeCommandEncoder::WebMetalComputeCommandEncoder(GPULegacyComputeCommandEncoder&& encoder)
    5151    : m_encoder { WTFMove(encoder) }
    5252{
     
    6565void WebMetalComputeCommandEncoder::dispatch(WebMetalSize threadgroupsPerGrid, WebMetalSize threadsPerThreadgroup)
    6666{
    67     m_encoder.dispatch(GPUSizeMake(threadgroupsPerGrid), GPUSizeMake(threadsPerThreadgroup));
     67    m_encoder.dispatch(GPULegacySizeMake(threadgroupsPerGrid), GPULegacySizeMake(threadsPerThreadgroup));
    6868}
    6969
  • trunk/Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUComputeCommandEncoder.h"
     30#include "GPULegacyComputeCommandEncoder.h"
    3131#include "WebMetalSize.h"
    3232#include <wtf/Ref.h>
     
    4040class WebMetalComputeCommandEncoder : public RefCounted<WebMetalComputeCommandEncoder> {
    4141public:
    42     static Ref<WebMetalComputeCommandEncoder> create(GPUComputeCommandEncoder&&);
     42    static Ref<WebMetalComputeCommandEncoder> create(GPULegacyComputeCommandEncoder&&);
    4343
    4444    void setComputePipelineState(WebMetalComputePipelineState&);
     
    4848
    4949private:
    50     explicit WebMetalComputeCommandEncoder(GPUComputeCommandEncoder&&);
     50    explicit WebMetalComputeCommandEncoder(GPULegacyComputeCommandEncoder&&);
    5151
    52     GPUComputeCommandEncoder m_encoder;
     52    GPULegacyComputeCommandEncoder m_encoder;
    5353};
    5454
  • trunk/Source/WebCore/html/canvas/WebMetalComputePipelineState.cpp

    r236954 r237368  
    3131namespace WebCore {
    3232
    33 Ref<WebMetalComputePipelineState> WebMetalComputePipelineState::create(GPUComputePipelineState&& state)
     33Ref<WebMetalComputePipelineState> WebMetalComputePipelineState::create(GPULegacyComputePipelineState&& state)
    3434{
    3535    return adoptRef(*new WebMetalComputePipelineState(WTFMove(state)));
    3636}
    3737
    38 WebMetalComputePipelineState::WebMetalComputePipelineState(GPUComputePipelineState&& state)
     38WebMetalComputePipelineState::WebMetalComputePipelineState(GPULegacyComputePipelineState&& state)
    3939    : m_state { WTFMove(state) }
    4040{
  • trunk/Source/WebCore/html/canvas/WebMetalComputePipelineState.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUComputePipelineState.h"
     30#include "GPULegacyComputePipelineState.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3838class WebMetalComputePipelineState : public RefCounted<WebMetalComputePipelineState> {
    3939public:
    40     static Ref<WebMetalComputePipelineState> create(GPUComputePipelineState&&);
     40    static Ref<WebMetalComputePipelineState> create(GPULegacyComputePipelineState&&);
    4141
    42     GPUComputePipelineState& state() { return m_state; }
     42    GPULegacyComputePipelineState& state() { return m_state; }
    4343
    4444private:
    45     explicit WebMetalComputePipelineState(GPUComputePipelineState&&);
     45    explicit WebMetalComputePipelineState(GPULegacyComputePipelineState&&);
    4646
    47     GPUComputePipelineState m_state;
     47    GPULegacyComputePipelineState m_state;
    4848};
    4949
  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.cpp

    r236954 r237368  
    5454{
    5555    m_depthCompareFunction = newDepthCompareFunction;
    56     m_descriptor.setDepthCompareFunction(toGPUCompareFunction(m_depthCompareFunction));
     56    m_descriptor.setDepthCompareFunction(toGPULegacyCompareFunction(m_depthCompareFunction));
    5757}
    5858
  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUDepthStencilDescriptor.h"
     30#include "GPULegacyDepthStencilDescriptor.h"
    3131#include "WebMetalEnums.h"
    3232#include <wtf/Ref.h>
     
    4646    void setDepthCompareFunction(CompareFunction);
    4747
    48     GPUDepthStencilDescriptor& descriptor() { return m_descriptor; }
     48    GPULegacyDepthStencilDescriptor& descriptor() { return m_descriptor; }
    4949
    5050private:
     
    5757
    5858    WebMetalCompareFunction m_depthCompareFunction { WebMetalCompareFunction::Always };
    59     GPUDepthStencilDescriptor m_descriptor;
     59    GPULegacyDepthStencilDescriptor m_descriptor;
    6060};
    6161
  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilState.cpp

    r236954 r237368  
    3434namespace WebCore {
    3535
    36 Ref<WebMetalDepthStencilState> WebMetalDepthStencilState::create(GPUDepthStencilState&& state)
     36Ref<WebMetalDepthStencilState> WebMetalDepthStencilState::create(GPULegacyDepthStencilState&& state)
    3737{
    3838    return adoptRef(*new WebMetalDepthStencilState(WTFMove(state)));
    3939}
    4040
    41 WebMetalDepthStencilState::WebMetalDepthStencilState(GPUDepthStencilState&& state)
     41WebMetalDepthStencilState::WebMetalDepthStencilState(GPULegacyDepthStencilState&& state)
    4242    : m_state { WTFMove(state) }
    4343{
  • trunk/Source/WebCore/html/canvas/WebMetalDepthStencilState.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUDepthStencilState.h"
     30#include "GPULegacyDepthStencilState.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3636class WebMetalDepthStencilState : public RefCounted<WebMetalDepthStencilState> {
    3737public:
    38     static Ref<WebMetalDepthStencilState> create(GPUDepthStencilState&&);
     38    static Ref<WebMetalDepthStencilState> create(GPULegacyDepthStencilState&&);
    3939
    4040    String label() const;
    4141    void setLabel(const String&);
    4242
    43     GPUDepthStencilState& state() { return m_state; }
     43    GPULegacyDepthStencilState& state() { return m_state; }
    4444
    4545private:
    46     explicit WebMetalDepthStencilState(GPUDepthStencilState&&);
     46    explicit WebMetalDepthStencilState(GPULegacyDepthStencilState&&);
    4747
    48     GPUDepthStencilState m_state;
     48    GPULegacyDepthStencilState m_state;
    4949};
    5050   
  • trunk/Source/WebCore/html/canvas/WebMetalDrawable.cpp

    r236954 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #include "GPUTexture.h"
     31#include "GPULegacyTexture.h"
    3232#include "WebMetalTexture.h"
    3333
    3434namespace WebCore {
    3535
    36 Ref<WebMetalDrawable> WebMetalDrawable::create(GPUDrawable&& drawable)
     36Ref<WebMetalDrawable> WebMetalDrawable::create(GPULegacyDrawable&& drawable)
    3737{
    3838    return adoptRef(*new WebMetalDrawable(WTFMove(drawable)));
    3939}
    4040
    41 WebMetalDrawable::WebMetalDrawable(GPUDrawable&& drawable)
     41WebMetalDrawable::WebMetalDrawable(GPULegacyDrawable&& drawable)
    4242    : m_drawable { WTFMove(drawable) }
    43     , m_texture { WebMetalTexture::create(GPUTexture { m_drawable }) }
     43    , m_texture { WebMetalTexture::create(GPULegacyTexture { m_drawable }) }
    4444{
    4545}
  • trunk/Source/WebCore/html/canvas/WebMetalDrawable.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUDrawable.h"
     30#include "GPULegacyDrawable.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3939public:
    4040    ~WebMetalDrawable();
    41     static Ref<WebMetalDrawable> create(GPUDrawable&&);
     41    static Ref<WebMetalDrawable> create(GPULegacyDrawable&&);
    4242
    43     GPUDrawable& drawable() { return m_drawable; }
     43    GPULegacyDrawable& drawable() { return m_drawable; }
    4444    WebMetalTexture& texture() { return m_texture.get(); }
    4545
    4646private:
    47     explicit WebMetalDrawable(GPUDrawable&&);
     47    explicit WebMetalDrawable(GPULegacyDrawable&&);
    4848
    49     GPUDrawable m_drawable;
     49    GPULegacyDrawable m_drawable;
    5050    Ref<WebMetalTexture> m_texture;
    5151};
  • trunk/Source/WebCore/html/canvas/WebMetalEnums.cpp

    r236954 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #include "GPUEnums.h"
     31#include "GPULegacyEnums.h"
    3232#include <wtf/text/WTFString.h>
    3333
     
    8080}
    8181
    82 GPUCompareFunction toGPUCompareFunction(const WebMetalCompareFunction value)
     82GPULegacyCompareFunction toGPULegacyCompareFunction(const WebMetalCompareFunction value)
    8383{
    8484    if (value == WebMetalCompareFunction::Never)
    85         return GPUCompareFunction::Never;
     85        return GPULegacyCompareFunction::Never;
    8686    if (value == WebMetalCompareFunction::Less)
    87         return GPUCompareFunction::Less;
     87        return GPULegacyCompareFunction::Less;
    8888    if (value == WebMetalCompareFunction::Equal)
    89         return GPUCompareFunction::Equal;
     89        return GPULegacyCompareFunction::Equal;
    9090    if (value == WebMetalCompareFunction::Lessequal)
    91         return GPUCompareFunction::LessEqual;
     91        return GPULegacyCompareFunction::LessEqual;
    9292    if (value == WebMetalCompareFunction::Greater)
    93         return GPUCompareFunction::Greater;
     93        return GPULegacyCompareFunction::Greater;
    9494    if (value == WebMetalCompareFunction::Notequal)
    95         return GPUCompareFunction::NotEqual;
     95        return GPULegacyCompareFunction::NotEqual;
    9696    if (value == WebMetalCompareFunction::Greaterequal)
    97         return GPUCompareFunction::GreaterEqual;
     97        return GPULegacyCompareFunction::GreaterEqual;
    9898    if (value == WebMetalCompareFunction::Always)
    99         return GPUCompareFunction::Always;
     99        return GPULegacyCompareFunction::Always;
    100100   
    101101    ASSERT_NOT_REACHED();
    102     return GPUCompareFunction::Never;
     102    return GPULegacyCompareFunction::Never;
    103103}
    104104
  • trunk/Source/WebCore/html/canvas/WebMetalEnums.h

    r236954 r237368  
    3333namespace WebCore {
    3434
    35 enum class GPUCompareFunction;
     35enum class GPULegacyCompareFunction;
    3636
    3737enum class WebMetalCompareFunction {
     
    4848std::optional<WebMetalCompareFunction> toWebMetalCompareFunction(const String&);
    4949String web3DCompareFunctionName(WebMetalCompareFunction);
    50 GPUCompareFunction toGPUCompareFunction(WebMetalCompareFunction);
     50GPULegacyCompareFunction toGPULegacyCompareFunction(WebMetalCompareFunction);
    5151
    5252} // namespace WebCore
  • trunk/Source/WebCore/html/canvas/WebMetalFunction.cpp

    r236954 r237368  
    3333namespace WebCore {
    3434
    35 Ref<WebMetalFunction> WebMetalFunction::create(GPUFunction&& function)
     35Ref<WebMetalFunction> WebMetalFunction::create(GPULegacyFunction&& function)
    3636{
    3737    return adoptRef(*new WebMetalFunction(WTFMove(function)));
    3838}
    3939
    40 WebMetalFunction::WebMetalFunction(GPUFunction&& function)
     40WebMetalFunction::WebMetalFunction(GPULegacyFunction&& function)
    4141    : m_function { WTFMove(function) }
    4242{
  • trunk/Source/WebCore/html/canvas/WebMetalFunction.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUFunction.h"
     30#include "GPULegacyFunction.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3737class WebMetalFunction : public RefCounted<WebMetalFunction> {
    3838public:
    39     static Ref<WebMetalFunction> create(GPUFunction&&);
     39    static Ref<WebMetalFunction> create(GPULegacyFunction&&);
    4040
    4141    String name() const { return m_function.name(); }
    42     const GPUFunction& function() const { return m_function; }
     42    const GPULegacyFunction& function() const { return m_function; }
    4343
    4444private:
    45     explicit WebMetalFunction(GPUFunction&&);
     45    explicit WebMetalFunction(GPULegacyFunction&&);
    4646
    47     GPUFunction m_function;
     47    GPULegacyFunction m_function;
    4848};
    4949   
  • trunk/Source/WebCore/html/canvas/WebMetalLibrary.cpp

    r236954 r237368  
    3333namespace WebCore {
    3434
    35 Ref<WebMetalLibrary> WebMetalLibrary::create(GPULibrary&& library, const String& sourceCode)
     35Ref<WebMetalLibrary> WebMetalLibrary::create(GPULegacyLibrary&& library, const String& sourceCode)
    3636{
    3737    return adoptRef(*new WebMetalLibrary(WTFMove(library), sourceCode));
    3838}
    3939
    40 WebMetalLibrary::WebMetalLibrary(GPULibrary&& library, const String& sourceCode)
     40WebMetalLibrary::WebMetalLibrary(GPULegacyLibrary&& library, const String& sourceCode)
    4141    : m_sourceCode { sourceCode }
    4242    , m_library { WTFMove(library) }
     
    5151RefPtr<WebMetalFunction> WebMetalLibrary::functionWithName(const String& name) const
    5252{
    53     GPUFunction function { m_library, name };
     53    GPULegacyFunction function { m_library, name };
    5454    if (!function)
    5555        return nullptr;
  • trunk/Source/WebCore/html/canvas/WebMetalLibrary.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPULibrary.h"
     30#include "GPULegacyLibrary.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3838class WebMetalLibrary : public RefCounted<WebMetalLibrary> {
    3939public:
    40     static Ref<WebMetalLibrary> create(GPULibrary&&, const String& sourceCode);
     40    static Ref<WebMetalLibrary> create(GPULegacyLibrary&&, const String& sourceCode);
    4141
    4242    const String& sourceCode() const { return m_sourceCode; }
     
    5050
    5151private:
    52     WebMetalLibrary(GPULibrary&&, const String& sourceCode);
     52    WebMetalLibrary(GPULegacyLibrary&&, const String& sourceCode);
    5353
    5454    String m_sourceCode;
    55     GPULibrary m_library;
     55    GPULegacyLibrary m_library;
    5656};
    5757
  • trunk/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.cpp

    r236954 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #include "GPUCommandBuffer.h"
    32 #include "GPURenderPassDescriptor.h"
     31#include "GPULegacyCommandBuffer.h"
     32#include "GPULegacyRenderPassDescriptor.h"
    3333#include "WebMetalBuffer.h"
    3434#include "WebMetalCommandBuffer.h"
     
    3939namespace WebCore {
    4040
    41 Ref<WebMetalRenderCommandEncoder> WebMetalRenderCommandEncoder::create(GPURenderCommandEncoder&& encoder)
     41Ref<WebMetalRenderCommandEncoder> WebMetalRenderCommandEncoder::create(GPULegacyRenderCommandEncoder&& encoder)
    4242{
    4343    return adoptRef(*new WebMetalRenderCommandEncoder(WTFMove(encoder)));
    4444}
    4545
    46 WebMetalRenderCommandEncoder::WebMetalRenderCommandEncoder(GPURenderCommandEncoder&& encoder)
     46WebMetalRenderCommandEncoder::WebMetalRenderCommandEncoder(GPULegacyRenderCommandEncoder&& encoder)
    4747    : m_encoder { WTFMove(encoder) }
    4848{
  • trunk/Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderCommandEncoder.h"
     30#include "GPULegacyRenderCommandEncoder.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    4141public:
    4242    ~WebMetalRenderCommandEncoder();
    43     static Ref<WebMetalRenderCommandEncoder> create(GPURenderCommandEncoder&&);
     43    static Ref<WebMetalRenderCommandEncoder> create(GPULegacyRenderCommandEncoder&&);
    4444
    4545    void setRenderPipelineState(WebMetalRenderPipelineState&);
     
    5050    void endEncoding();
    5151
    52     GPURenderCommandEncoder& encoder() { return m_encoder; }
     52    GPULegacyRenderCommandEncoder& encoder() { return m_encoder; }
    5353
    5454private:
    55     explicit WebMetalRenderCommandEncoder(GPURenderCommandEncoder&&);
     55    explicit WebMetalRenderCommandEncoder(GPULegacyRenderCommandEncoder&&);
    5656
    57     GPURenderCommandEncoder m_encoder;
     57    GPULegacyRenderCommandEncoder m_encoder;
    5858};
    5959
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp

    r236954 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #include "GPURenderPassAttachmentDescriptor.h"
    32 #include "GPUTexture.h"
     31#include "GPULegacyRenderPassAttachmentDescriptor.h"
     32#include "GPULegacyTexture.h"
    3333#include "WebMetalTexture.h"
    3434
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.h

    r237344 r237368  
    3333namespace WebCore {
    3434
    35 class GPURenderPassAttachmentDescriptor;
     35class GPULegacyRenderPassAttachmentDescriptor;
    3636class WebMetalTexture;
    3737
     
    5555
    5656private:
    57     virtual const GPURenderPassAttachmentDescriptor& descriptor() const = 0;
     57    virtual const GPULegacyRenderPassAttachmentDescriptor& descriptor() const = 0;
    5858
    5959    RefPtr<WebMetalTexture> m_texture;
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp

    r236954 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #include "GPUTexture.h"
     31#include "GPULegacyTexture.h"
    3232#include "WebMetalTexture.h"
    3333#include <wtf/Vector.h>
     
    3535namespace WebCore {
    3636
    37 Ref<WebMetalRenderPassColorAttachmentDescriptor> WebMetalRenderPassColorAttachmentDescriptor::create(GPURenderPassColorAttachmentDescriptor&& descriptor)
     37Ref<WebMetalRenderPassColorAttachmentDescriptor> WebMetalRenderPassColorAttachmentDescriptor::create(GPULegacyRenderPassColorAttachmentDescriptor&& descriptor)
    3838{
    3939    return adoptRef(*new WebMetalRenderPassColorAttachmentDescriptor(WTFMove(descriptor)));
    4040}
    4141
    42 WebMetalRenderPassColorAttachmentDescriptor::WebMetalRenderPassColorAttachmentDescriptor(GPURenderPassColorAttachmentDescriptor&& descriptor)
     42WebMetalRenderPassColorAttachmentDescriptor::WebMetalRenderPassColorAttachmentDescriptor(GPULegacyRenderPassColorAttachmentDescriptor&& descriptor)
    4343    : m_descriptor { WTFMove(descriptor) }
    4444{
     
    4747WebMetalRenderPassColorAttachmentDescriptor::~WebMetalRenderPassColorAttachmentDescriptor() = default;
    4848
    49 const GPURenderPassAttachmentDescriptor& WebMetalRenderPassColorAttachmentDescriptor::descriptor() const
     49const GPULegacyRenderPassAttachmentDescriptor& WebMetalRenderPassColorAttachmentDescriptor::descriptor() const
    5050{
    5151    return m_descriptor;
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderPassColorAttachmentDescriptor.h"
     30#include "GPULegacyRenderPassColorAttachmentDescriptor.h"
    3131#include "WebMetalRenderPassAttachmentDescriptor.h"
    3232
     
    3636public:
    3737    virtual ~WebMetalRenderPassColorAttachmentDescriptor();
    38     static Ref<WebMetalRenderPassColorAttachmentDescriptor> create(GPURenderPassColorAttachmentDescriptor&&);
     38    static Ref<WebMetalRenderPassColorAttachmentDescriptor> create(GPULegacyRenderPassColorAttachmentDescriptor&&);
    3939
    4040    Vector<float> clearColor() const;
     
    4242
    4343private:
    44     explicit WebMetalRenderPassColorAttachmentDescriptor(GPURenderPassColorAttachmentDescriptor&&);
     44    explicit WebMetalRenderPassColorAttachmentDescriptor(GPULegacyRenderPassColorAttachmentDescriptor&&);
    4545
    46     const GPURenderPassAttachmentDescriptor& descriptor() const final;
     46    const GPULegacyRenderPassAttachmentDescriptor& descriptor() const final;
    4747    bool isColorAttachmentDescriptor() const final { return true; }
    4848
    49     GPURenderPassColorAttachmentDescriptor m_descriptor;
     49    GPULegacyRenderPassColorAttachmentDescriptor m_descriptor;
    5050};
    5151   
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp

    r236954 r237368  
    3333namespace WebCore {
    3434
    35 Ref<WebMetalRenderPassDepthAttachmentDescriptor> WebMetalRenderPassDepthAttachmentDescriptor::create(GPURenderPassDepthAttachmentDescriptor&& descriptor)
     35Ref<WebMetalRenderPassDepthAttachmentDescriptor> WebMetalRenderPassDepthAttachmentDescriptor::create(GPULegacyRenderPassDepthAttachmentDescriptor&& descriptor)
    3636{
    3737    return adoptRef(*new WebMetalRenderPassDepthAttachmentDescriptor(WTFMove(descriptor)));
    3838}
    3939
    40 WebMetalRenderPassDepthAttachmentDescriptor::WebMetalRenderPassDepthAttachmentDescriptor(GPURenderPassDepthAttachmentDescriptor&& descriptor)
     40WebMetalRenderPassDepthAttachmentDescriptor::WebMetalRenderPassDepthAttachmentDescriptor(GPULegacyRenderPassDepthAttachmentDescriptor&& descriptor)
    4141    : m_descriptor { WTFMove(descriptor) }
    4242{
     
    5555}
    5656
    57 const GPURenderPassAttachmentDescriptor& WebMetalRenderPassDepthAttachmentDescriptor::descriptor() const
     57const GPULegacyRenderPassAttachmentDescriptor& WebMetalRenderPassDepthAttachmentDescriptor::descriptor() const
    5858{
    5959    return m_descriptor;
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderPassDepthAttachmentDescriptor.h"
     30#include "GPULegacyRenderPassDepthAttachmentDescriptor.h"
    3131#include "WebMetalRenderPassAttachmentDescriptor.h"
    3232
     
    3636public:
    3737    virtual ~WebMetalRenderPassDepthAttachmentDescriptor();
    38     static Ref<WebMetalRenderPassDepthAttachmentDescriptor> create(GPURenderPassDepthAttachmentDescriptor&&);
     38    static Ref<WebMetalRenderPassDepthAttachmentDescriptor> create(GPULegacyRenderPassDepthAttachmentDescriptor&&);
    3939
    4040    double clearDepth() const;
     
    4242
    4343private:
    44     explicit WebMetalRenderPassDepthAttachmentDescriptor(GPURenderPassDepthAttachmentDescriptor&&);
     44    explicit WebMetalRenderPassDepthAttachmentDescriptor(GPULegacyRenderPassDepthAttachmentDescriptor&&);
    4545
    46     const GPURenderPassAttachmentDescriptor& descriptor() const final;
     46    const GPULegacyRenderPassAttachmentDescriptor& descriptor() const final;
    4747    bool isColorAttachmentDescriptor() const final { return false; }
    4848
    49     GPURenderPassDepthAttachmentDescriptor m_descriptor;
     49    GPULegacyRenderPassDepthAttachmentDescriptor m_descriptor;
    5050};
    5151   
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderPassDescriptor.h"
     30#include "GPULegacyRenderPassDescriptor.h"
    3131#include "WebMetalRenderPassColorAttachmentDescriptor.h"
    3232#include "WebMetalRenderPassDepthAttachmentDescriptor.h"
     
    4545    const Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>>& colorAttachments();
    4646
    47     const GPURenderPassDescriptor& descriptor() const { return m_descriptor; }
     47    const GPULegacyRenderPassDescriptor& descriptor() const { return m_descriptor; }
    4848
    4949private:
     
    5353    RefPtr<WebMetalRenderPassDepthAttachmentDescriptor> m_depthAttachment;
    5454
    55     GPURenderPassDescriptor m_descriptor;
     55    GPULegacyRenderPassDescriptor m_descriptor;
    5656};
    5757   
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp

    r236954 r237368  
    3131namespace WebCore {
    3232
    33 Ref<WebMetalRenderPipelineColorAttachmentDescriptor> WebMetalRenderPipelineColorAttachmentDescriptor::create(GPURenderPipelineColorAttachmentDescriptor&& descriptor)
     33Ref<WebMetalRenderPipelineColorAttachmentDescriptor> WebMetalRenderPipelineColorAttachmentDescriptor::create(GPULegacyRenderPipelineColorAttachmentDescriptor&& descriptor)
    3434{
    3535    return adoptRef(*new WebMetalRenderPipelineColorAttachmentDescriptor(WTFMove(descriptor)));
    3636}
    3737
    38 WebMetalRenderPipelineColorAttachmentDescriptor::WebMetalRenderPipelineColorAttachmentDescriptor(GPURenderPipelineColorAttachmentDescriptor&& descriptor)
     38WebMetalRenderPipelineColorAttachmentDescriptor::WebMetalRenderPipelineColorAttachmentDescriptor(GPULegacyRenderPipelineColorAttachmentDescriptor&& descriptor)
    3939    : m_descriptor { WTFMove(descriptor) }
    4040{
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderPipelineColorAttachmentDescriptor.h"
     30#include "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3636class WebMetalRenderPipelineColorAttachmentDescriptor : public RefCounted<WebMetalRenderPipelineColorAttachmentDescriptor> {
    3737public:
    38     static Ref<WebMetalRenderPipelineColorAttachmentDescriptor> create(GPURenderPipelineColorAttachmentDescriptor&&);
     38    static Ref<WebMetalRenderPipelineColorAttachmentDescriptor> create(GPULegacyRenderPipelineColorAttachmentDescriptor&&);
    3939
    4040    unsigned pixelFormat() const;
     
    4242
    4343private:
    44     explicit WebMetalRenderPipelineColorAttachmentDescriptor(GPURenderPipelineColorAttachmentDescriptor&&);
     44    explicit WebMetalRenderPipelineColorAttachmentDescriptor(GPULegacyRenderPipelineColorAttachmentDescriptor&&);
    4545
    46     GPURenderPipelineColorAttachmentDescriptor m_descriptor;
     46    GPULegacyRenderPipelineColorAttachmentDescriptor m_descriptor;
    4747};
    4848   
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.cpp

    r236954 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #include "GPUFunction.h"
    32 #include "GPURenderPipelineColorAttachmentDescriptor.h"
     31#include "GPULegacyFunction.h"
     32#include "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
    3333#include "WebMetalFunction.h"
    3434#include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderPipelineDescriptor.h"
     30#include "GPULegacyRenderPipelineDescriptor.h"
    3131#include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
    3232#include <wtf/Ref.h>
     
    3636namespace WebCore {
    3737
    38 class GPUFunction;
    39 class GPURenderPipelineDescriptor;
     38class GPULegacyFunction;
     39class GPULegacyRenderPipelineDescriptor;
    4040class WebMetalFunction;
    4141class WebMetalRenderPipelineColorAttachmentDescriptor;
     
    5959    void reset();
    6060
    61     const GPURenderPipelineDescriptor& descriptor() { return m_descriptor; }
     61    const GPULegacyRenderPipelineDescriptor& descriptor() { return m_descriptor; }
    6262
    6363private:
     
    6969    Vector<RefPtr<WebMetalRenderPipelineColorAttachmentDescriptor>> m_colorAttachments;
    7070
    71     GPURenderPipelineDescriptor m_descriptor;
     71    GPULegacyRenderPipelineDescriptor m_descriptor;
    7272};
    7373
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineState.cpp

    r236954 r237368  
    3131namespace WebCore {
    3232
    33 Ref<WebMetalRenderPipelineState> WebMetalRenderPipelineState::create(GPURenderPipelineState&& state)
     33Ref<WebMetalRenderPipelineState> WebMetalRenderPipelineState::create(GPULegacyRenderPipelineState&& state)
    3434{
    3535    return adoptRef(*new WebMetalRenderPipelineState(WTFMove(state)));
    3636}
    3737
    38 WebMetalRenderPipelineState::WebMetalRenderPipelineState(GPURenderPipelineState&& state)
     38WebMetalRenderPipelineState::WebMetalRenderPipelineState(GPULegacyRenderPipelineState&& state)
    3939    : m_state { WTFMove(state) }
    4040{
  • trunk/Source/WebCore/html/canvas/WebMetalRenderPipelineState.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderPipelineState.h"
     30#include "GPULegacyRenderPipelineState.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3636class WebMetalRenderPipelineState : public RefCounted<WebMetalRenderPipelineState> {
    3737public:
    38     static Ref<WebMetalRenderPipelineState> create(GPURenderPipelineState&&);
     38    static Ref<WebMetalRenderPipelineState> create(GPULegacyRenderPipelineState&&);
    3939
    4040    String label() const;
    4141    void setLabel(const String&);
    4242
    43     const GPURenderPipelineState& state() const { return m_state; }
     43    const GPULegacyRenderPipelineState& state() const { return m_state; }
    4444
    4545private:
    46     explicit WebMetalRenderPipelineState(GPURenderPipelineState&&);
     46    explicit WebMetalRenderPipelineState(GPULegacyRenderPipelineState&&);
    4747
    48     GPURenderPipelineState m_state;
     48    GPULegacyRenderPipelineState m_state;
    4949};
    5050   
  • trunk/Source/WebCore/html/canvas/WebMetalRenderingContext.cpp

    r236954 r237368  
    3232#include "Document.h"
    3333#include "FrameView.h"
    34 #include "GPUDevice.h"
     34#include "GPULegacyDevice.h"
    3535#include "InspectorInstrumentation.h"
    3636#include "WebMetalBuffer.h"
     
    7373std::unique_ptr<WebMetalRenderingContext> WebMetalRenderingContext::create(CanvasBase& canvas)
    7474{
    75     GPUDevice device;
     75    GPULegacyDevice device;
    7676
    7777    if (!device) {
     
    8888}
    8989
    90 WebMetalRenderingContext::WebMetalRenderingContext(CanvasBase& canvas, GPUDevice&& device)
     90WebMetalRenderingContext::WebMetalRenderingContext(CanvasBase& canvas, GPULegacyDevice&& device)
    9191    : GPUBasedCanvasRenderingContext(canvas)
    9292    , m_device(WTFMove(device))
     
    154154Ref<WebMetalLibrary> WebMetalRenderingContext::createLibrary(const String& sourceCode)
    155155{
    156     return WebMetalLibrary::create(GPULibrary { m_device, sourceCode }, sourceCode);
     156    return WebMetalLibrary::create(GPULegacyLibrary { m_device, sourceCode }, sourceCode);
    157157}
    158158
    159159Ref<WebMetalRenderPipelineState> WebMetalRenderingContext::createRenderPipelineState(WebMetalRenderPipelineDescriptor& descriptor)
    160160{
    161     return WebMetalRenderPipelineState::create(GPURenderPipelineState { m_device, descriptor.descriptor() });
     161    return WebMetalRenderPipelineState::create(GPULegacyRenderPipelineState { m_device, descriptor.descriptor() });
    162162}
    163163
    164164Ref<WebMetalDepthStencilState> WebMetalRenderingContext::createDepthStencilState(WebMetalDepthStencilDescriptor& descriptor)
    165165{
    166     return WebMetalDepthStencilState::create(GPUDepthStencilState { m_device, descriptor.descriptor() });
     166    return WebMetalDepthStencilState::create(GPULegacyDepthStencilState { m_device, descriptor.descriptor() });
    167167}
    168168
    169169Ref<WebMetalComputePipelineState> WebMetalRenderingContext::createComputePipelineState(WebMetalFunction& function)
    170170{
    171     return WebMetalComputePipelineState::create(GPUComputePipelineState { m_device, function.function() });
     171    return WebMetalComputePipelineState::create(GPULegacyComputePipelineState { m_device, function.function() });
    172172}
    173173
    174174Ref<WebMetalCommandQueue> WebMetalRenderingContext::createCommandQueue()
    175175{
    176     return WebMetalCommandQueue::create(GPUCommandQueue { m_device });
     176    return WebMetalCommandQueue::create(GPULegacyCommandQueue { m_device });
    177177}
    178178
    179179Ref<WebMetalDrawable> WebMetalRenderingContext::nextDrawable()
    180180{
    181     return WebMetalDrawable::create(GPUDrawable { m_device });
     181    return WebMetalDrawable::create(GPULegacyDrawable { m_device });
    182182}
    183183
    184184RefPtr<WebMetalBuffer> WebMetalRenderingContext::createBuffer(JSC::ArrayBufferView& data)
    185185{
    186     return WebMetalBuffer::create(GPUBuffer { m_device, data });
     186    return WebMetalBuffer::create(GPULegacyBuffer { m_device, data });
    187187}
    188188
    189189Ref<WebMetalTexture> WebMetalRenderingContext::createTexture(WebMetalTextureDescriptor& descriptor)
    190190{
    191     return WebMetalTexture::create(GPUTexture { m_device, descriptor.descriptor() });
     191    return WebMetalTexture::create(GPULegacyTexture { m_device, descriptor.descriptor() });
    192192}
    193193
  • trunk/Source/WebCore/html/canvas/WebMetalRenderingContext.h

    r236954 r237368  
    3030
    3131#include "GPUBasedCanvasRenderingContext.h"
    32 #include "GPUDevice.h"
     32#include "GPULegacyDevice.h"
    3333
    3434namespace JSC {
     
    6767    Ref<WebMetalTexture> createTexture(WebMetalTextureDescriptor&);
    6868
    69     const GPUDevice& device() const { return m_device; }
     69    const GPULegacyDevice& device() const { return m_device; }
    7070
    7171private:
    72     WebMetalRenderingContext(CanvasBase&, GPUDevice&&);
     72    WebMetalRenderingContext(CanvasBase&, GPULegacyDevice&&);
    7373
    7474    bool hasPendingActivity() const final;
     
    8686    PlatformLayer* platformLayer() const final;
    8787
    88     GPUDevice m_device;
     88    GPULegacyDevice m_device;
    8989};
    9090
  • trunk/Source/WebCore/html/canvas/WebMetalTexture.cpp

    r236954 r237368  
    3131namespace WebCore {
    3232
    33 Ref<WebMetalTexture> WebMetalTexture::create(GPUTexture&& texture)
     33Ref<WebMetalTexture> WebMetalTexture::create(GPULegacyTexture&& texture)
    3434{
    3535    return adoptRef(*new WebMetalTexture(WTFMove(texture)));
    3636}
    3737
    38 WebMetalTexture::WebMetalTexture(GPUTexture&& texture)
     38WebMetalTexture::WebMetalTexture(GPULegacyTexture&& texture)
    3939    : m_texture { WTFMove(texture) }
    4040{
  • trunk/Source/WebCore/html/canvas/WebMetalTexture.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUTexture.h"
     30#include "GPULegacyTexture.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    3434namespace WebCore {
    3535
    36 class GPUTextureDescriptor;
     36class GPULegacyTextureDescriptor;
    3737
    3838class WebMetalTexture : public RefCounted<WebMetalTexture> {
    3939public:
    40     static Ref<WebMetalTexture> create(GPUTexture&&);
     40    static Ref<WebMetalTexture> create(GPULegacyTexture&&);
    4141
    4242    unsigned width() const { return m_texture.width(); }
    4343    unsigned height() const { return m_texture.height(); }
    4444
    45     const GPUTexture& texture() const { return m_texture; }
     45    const GPULegacyTexture& texture() const { return m_texture; }
    4646
    4747private:
    48     explicit WebMetalTexture(GPUTexture&&);
     48    explicit WebMetalTexture(GPULegacyTexture&&);
    4949
    50     GPUTexture m_texture;
     50    GPULegacyTexture m_texture;
    5151};
    5252   
  • trunk/Source/WebCore/html/canvas/WebMetalTextureDescriptor.h

    r236954 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPUTextureDescriptor.h"
     30#include "GPULegacyTextureDescriptor.h"
    3131#include <wtf/Ref.h>
    3232#include <wtf/RefCounted.h>
     
    5656    void setUsage(unsigned);
    5757
    58     const GPUTextureDescriptor& descriptor() { return m_descriptor; }
     58    const GPULegacyTextureDescriptor& descriptor() { return m_descriptor; }
    5959
    6060private:
    6161    WebMetalTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
    6262
    63     GPUTextureDescriptor m_descriptor;
     63    GPULegacyTextureDescriptor m_descriptor;
    6464};
    6565
  • trunk/Source/WebCore/platform/graphics/cocoa/WebMetalLayer.h

    r237266 r237368  
    3232
    3333namespace WebCore {
    34 class GPUDevice;
     34class GPULegacyDevice;
    3535}
    3636
     
    4040@interface WebMetalLayer : CALayer { // FIXME: WebMetal - Disable WebMetal on iOS simulator?
    4141#endif
    42     WebCore::GPUDevice* _context;
     42    WebCore::GPULegacyDevice* _context;
    4343    float _devicePixelRatio;
    4444}
    4545
    46 @property (nonatomic) WebCore::GPUDevice* context;
     46@property (nonatomic) WebCore::GPULegacyDevice* context;
    4747
    48 - (id)initWithGPUDevice:(WebCore::GPUDevice*)context;
     48- (id)initWithGPUDevice:(WebCore::GPULegacyDevice*)context;
    4949
    5050- (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace;
  • trunk/Source/WebCore/platform/graphics/cocoa/WebMetalLayer.mm

    r236954 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDevice.h"
     31#import "GPULegacyDevice.h"
    3232#import "GraphicsContextCG.h"
    3333#import "GraphicsLayer.h"
     
    3939@synthesize context=_context;
    4040
    41 - (id)initWithGPUDevice:(WebCore::GPUDevice*)context
     41- (id)initWithGPUDevice:(WebCore::GPULegacyDevice*)context
    4242{
    4343    self = [super init];
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyBuffer.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUBuffer.h"
     27#include "GPULegacyBuffer.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3434namespace WebCore {
    3535
    36 GPUBuffer::~GPUBuffer()
     36GPULegacyBuffer::~GPULegacyBuffer()
    3737{
    3838    LOG(WebMetal, "GPUBuffer::~GPUBuffer()");
    3939}
    4040
    41 unsigned GPUBuffer::length() const
     41unsigned GPULegacyBuffer::length() const
    4242{
    4343    return m_contents ? m_contents->byteLength() : 0;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyBuffer.h

    r237367 r237368  
    4040namespace WebCore {
    4141
    42 class GPUDevice;
     42class GPULegacyDevice;
    4343
    44 class GPUBuffer {
     44class GPULegacyBuffer {
    4545public:
    46     WEBCORE_EXPORT GPUBuffer(const GPUDevice&, const JSC::ArrayBufferView&);
    47     WEBCORE_EXPORT ~GPUBuffer();
     46    WEBCORE_EXPORT GPULegacyBuffer(const GPULegacyDevice&, const JSC::ArrayBufferView&);
     47    WEBCORE_EXPORT ~GPULegacyBuffer();
    4848
    4949    WEBCORE_EXPORT unsigned length() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyCommandBuffer.cpp

    r237367 r237368  
    2626
    2727#include "config.h"
    28 #include "GPUCommandBuffer.h"
     28#include "GPULegacyCommandBuffer.h"
    2929
    3030#if ENABLE(WEBMETAL)
     
    3434namespace WebCore {
    3535
    36 GPUCommandBuffer::~GPUCommandBuffer()
     36GPULegacyCommandBuffer::~GPULegacyCommandBuffer()
    3737{
    3838    LOG(WebMetal, "GPUCommandBuffer::~GPUCommandBuffer()");
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyCommandBuffer.h

    r237367 r237368  
    3636namespace WebCore {
    3737
    38 class GPUCommandQueue;
    39 class GPUDrawable;
     38class GPULegacyCommandQueue;
     39class GPULegacyDrawable;
    4040
    41 class GPUCommandBuffer {
     41class GPULegacyCommandBuffer {
    4242public:
    43     explicit GPUCommandBuffer(const GPUCommandQueue&, Function<void()>&& completedCallback);
    44     ~GPUCommandBuffer();
     43    explicit GPULegacyCommandBuffer(const GPULegacyCommandQueue&, Function<void()>&& completedCallback);
     44    ~GPULegacyCommandBuffer();
    4545
    4646    void commit() const;
    47     void presentDrawable(GPUDrawable&) const;
     47    void presentDrawable(GPULegacyDrawable&) const;
    4848
    4949#if USE(METAL)
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyCommandQueue.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUDepthStencilState.h"
     27#include "GPULegacyCommandQueue.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUDepthStencilState::~GPUDepthStencilState()
     35GPULegacyCommandQueue::~GPULegacyCommandQueue()
    3636{
    37     LOG(WebMetal, "GPUDepthStencilState::~GPUDepthStencilState()");
     37    LOG(WebMetal, "GPULegacyCommandQueue::~GPULegacyCommandQueue()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyCommandQueue.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUDevice;
     36class GPULegacyDevice;
    3737
    38 class GPUCommandQueue {
     38class GPULegacyCommandQueue {
    3939public:
    40     WEBCORE_EXPORT explicit GPUCommandQueue(const GPUDevice&);
    41     WEBCORE_EXPORT ~GPUCommandQueue();
     40    WEBCORE_EXPORT explicit GPULegacyCommandQueue(const GPULegacyDevice&);
     41    WEBCORE_EXPORT ~GPULegacyCommandQueue();
    4242
    4343    WEBCORE_EXPORT String label() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyComputeCommandEncoder.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUComputeCommandEncoder.h"
     27#include "GPULegacyComputeCommandEncoder.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434   
    35 GPUComputeCommandEncoder::~GPUComputeCommandEncoder()
     35GPULegacyComputeCommandEncoder::~GPULegacyComputeCommandEncoder()
    3636{
    37     LOG(WebMetal, "GPUComputeCommandEncoder::~GPUComputeCommandEncoder()");
     37    LOG(WebMetal, "GPULegacyComputeCommandEncoder::~GPULegacyComputeCommandEncoder()");
    3838}
    3939   
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyComputeCommandEncoder.h

    r237367 r237368  
    3434namespace WebCore {
    3535   
    36 class GPUBuffer;
    37 class GPUCommandBuffer;
    38 class GPUComputePipelineState;
     36class GPULegacyBuffer;
     37class GPULegacyCommandBuffer;
     38class GPULegacyComputePipelineState;
    3939
    40 struct GPUSize;
     40struct GPULegacySize;
    4141
    42 class GPUComputeCommandEncoder {
     42class GPULegacyComputeCommandEncoder {
    4343public:
    44     explicit GPUComputeCommandEncoder(const GPUCommandBuffer&);
    45     ~GPUComputeCommandEncoder();
     44    explicit GPULegacyComputeCommandEncoder(const GPULegacyCommandBuffer&);
     45    ~GPULegacyComputeCommandEncoder();
    4646
    47     void setComputePipelineState(const GPUComputePipelineState&) const;
    48     void setBuffer(const GPUBuffer&, unsigned, unsigned) const;
    49     void dispatch(GPUSize, GPUSize) const;
     47    void setComputePipelineState(const GPULegacyComputePipelineState&) const;
     48    void setBuffer(const GPULegacyBuffer&, unsigned, unsigned) const;
     49    void dispatch(GPULegacySize, GPULegacySize) const;
    5050    void endEncoding() const;
    5151
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyComputePipelineState.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUComputePipelineState.h"
     27#include "GPULegacyComputePipelineState.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434   
    35 GPUComputePipelineState::~GPUComputePipelineState()
     35GPULegacyComputePipelineState::~GPULegacyComputePipelineState()
    3636{
    37     LOG(WebMetal, "GPUComputePipelineState::~GPUComputePipelineState()");
     37    LOG(WebMetal, "GPULegacyComputePipelineState::~GPULegacyComputePipelineState()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyComputePipelineState.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUDevice;
    37 class GPUFunction;
     36class GPULegacyDevice;
     37class GPULegacyFunction;
    3838
    39 class GPUComputePipelineState {
     39class GPULegacyComputePipelineState {
    4040public:
    41     GPUComputePipelineState() = default;
    42     GPUComputePipelineState(const GPUDevice&, const GPUFunction&);
    43     ~GPUComputePipelineState();
     41    GPULegacyComputePipelineState() = default;
     42    GPULegacyComputePipelineState(const GPULegacyDevice&, const GPULegacyFunction&);
     43    ~GPULegacyComputePipelineState();
    4444
    4545#if USE(METAL)
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilDescriptor.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUDepthStencilDescriptor.h"
     27#include "GPULegacyDepthStencilDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()
     35GPULegacyDepthStencilDescriptor::~GPULegacyDepthStencilDescriptor()
    3636{
    3737    LOG(WebMetal, "GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()");
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilDescriptor.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 enum class GPUCompareFunction;
     36enum class GPULegacyCompareFunction;
    3737
    38 class GPUDepthStencilDescriptor {
     38class GPULegacyDepthStencilDescriptor {
    3939public:
    40     GPUDepthStencilDescriptor();
    41     ~GPUDepthStencilDescriptor();
     40    GPULegacyDepthStencilDescriptor();
     41    ~GPULegacyDepthStencilDescriptor();
    4242
    4343    bool depthWriteEnabled() const;
    4444    void setDepthWriteEnabled(bool) const;
    4545
    46     GPUCompareFunction depthCompareFunction() const;
    47     void setDepthCompareFunction(GPUCompareFunction) const;
     46    GPULegacyCompareFunction depthCompareFunction() const;
     47    void setDepthCompareFunction(GPULegacyCompareFunction) const;
    4848
    4949#if USE(METAL)
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilState.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUDepthStencilState.h"
     27#include "GPULegacyDepthStencilState.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUDepthStencilState::~GPUDepthStencilState()
     35GPULegacyDepthStencilState::~GPULegacyDepthStencilState()
    3636{
    37     LOG(WebMetal, "GPUDepthStencilState::~GPUDepthStencilState()");
     37    LOG(WebMetal, "GPULegacyDepthStencilState::~GPULegacyDepthStencilState()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilState.h

    r237367 r237368  
    3535namespace WebCore {
    3636
    37 class GPUDevice;
    38 class GPUDepthStencilDescriptor;
     37class GPULegacyDevice;
     38class GPULegacyDepthStencilDescriptor;
    3939
    40 class GPUDepthStencilState {
     40class GPULegacyDepthStencilState {
    4141public:
    42     GPUDepthStencilState() = default;
    43     GPUDepthStencilState(const GPUDevice&, const GPUDepthStencilDescriptor&);
    44     ~GPUDepthStencilState();
     42    GPULegacyDepthStencilState() = default;
     43    GPULegacyDepthStencilState(const GPULegacyDevice&, const GPULegacyDepthStencilDescriptor&);
     44    ~GPULegacyDepthStencilState();
    4545
    4646    String label() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyDevice.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUDevice.h"
     27#include "GPULegacyDevice.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUDevice::~GPUDevice()
     35GPULegacyDevice::~GPULegacyDevice()
    3636{
    37     LOG(WebMetal, "GPUDevice::~GPUDevice()");
     37    LOG(WebMetal, "GPULegacyDevice::~GPULegacyDevice()");
    3838    disconnect();
    3939}
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyDevice.h

    r237367 r237368  
    3737namespace WebCore {
    3838
    39 class GPUDevice {
     39class GPULegacyDevice {
    4040public:
    41     WEBCORE_EXPORT GPUDevice();
    42     WEBCORE_EXPORT ~GPUDevice();
     41    WEBCORE_EXPORT GPULegacyDevice();
     42    WEBCORE_EXPORT ~GPULegacyDevice();
    4343
    4444    WEBCORE_EXPORT bool operator!() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyDrawable.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUCommandQueue.h"
     27#include "GPULegacyDrawable.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUCommandQueue::~GPUCommandQueue()
     35GPULegacyDrawable::~GPULegacyDrawable()
    3636{
    37     LOG(WebMetal, "GPUCommandQueue::~GPUCommandQueue()");
     37    LOG(WebMetal, "GPULegacyDrawable::~GPULegacyDrawable()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyDrawable.h

    r237367 r237368  
    3535namespace WebCore {
    3636
    37 class GPUDevice;
     37class GPULegacyDevice;
    3838
    39 class GPUDrawable {
     39class GPULegacyDrawable {
    4040public:
    41     explicit GPUDrawable(const GPUDevice&);
    42     ~GPUDrawable();
     41    explicit GPULegacyDrawable(const GPULegacyDevice&);
     42    ~GPULegacyDrawable();
    4343
    4444    void release();
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyEnums.h

    r237367 r237368  
    3030namespace WebCore {
    3131
    32 enum class GPUCompareFunction {
     32enum class GPULegacyCompareFunction {
    3333    Never = 0,
    3434    Less = 1,
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyFunction.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUDrawable.h"
     27#include "GPULegacyFunction.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUDrawable::~GPUDrawable()
     35GPULegacyFunction::~GPULegacyFunction()
    3636{
    37     LOG(WebMetal, "GPUDrawable::~GPUDrawable()");
     37    LOG(WebMetal, "GPULegacyFunction::~GPULegacyFunction()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyFunction.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPULibrary;
     36class GPULegacyLibrary;
    3737
    38 class GPUFunction {
     38class GPULegacyFunction {
    3939public:
    40     WEBCORE_EXPORT GPUFunction(const GPULibrary&, const String& name);
    41     WEBCORE_EXPORT ~GPUFunction();
     40    WEBCORE_EXPORT GPULegacyFunction(const GPULegacyLibrary&, const String& name);
     41    WEBCORE_EXPORT ~GPULegacyFunction();
    4242
    4343    bool operator!() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyLibrary.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUCommandQueue.h"
     27#include "GPULegacyLibrary.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUCommandQueue::~GPUCommandQueue()
     35GPULegacyLibrary::~GPULegacyLibrary()
    3636{
    37     LOG(WebMetal, "GPUCommandQueue::~GPUCommandQueue()");
     37    LOG(WebMetal, "GPULegacyLibrary::~GPULegacyLibrary()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyLibrary.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUDevice;
     36class GPULegacyDevice;
    3737
    38 class GPULibrary {
     38class GPULegacyLibrary {
    3939public:
    40     WEBCORE_EXPORT GPULibrary(const GPUDevice&, const String& sourceCode);
    41     WEBCORE_EXPORT ~GPULibrary();
     40    WEBCORE_EXPORT GPULegacyLibrary(const GPULegacyDevice&, const String& sourceCode);
     41    WEBCORE_EXPORT ~GPULegacyLibrary();
    4242
    4343    WEBCORE_EXPORT String label() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderCommandEncoder.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUDepthStencilState.h"
     27#include "GPULegacyRenderCommandEncoder.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUDepthStencilState::~GPUDepthStencilState()
     35GPULegacyRenderCommandEncoder::~GPULegacyRenderCommandEncoder()
    3636{
    37     LOG(WebMetal, "GPUDepthStencilState::~GPUDepthStencilState()");
     37    LOG(WebMetal, "GPULegacyRenderCommandEncoder::~GPULegacyRenderCommandEncoder()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderCommandEncoder.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUBuffer;
    37 class GPUCommandBuffer;
    38 class GPUDepthStencilState;
    39 class GPURenderPassDescriptor;
    40 class GPURenderPipelineState;
     36class GPULegacyBuffer;
     37class GPULegacyCommandBuffer;
     38class GPULegacyDepthStencilState;
     39class GPULegacyRenderPassDescriptor;
     40class GPULegacyRenderPipelineState;
    4141
    42 class GPURenderCommandEncoder {
     42class GPULegacyRenderCommandEncoder {
    4343public:
    44     GPURenderCommandEncoder(const GPUCommandBuffer&, const GPURenderPassDescriptor&);
    45     ~GPURenderCommandEncoder();
     44    GPULegacyRenderCommandEncoder(const GPULegacyCommandBuffer&, const GPULegacyRenderPassDescriptor&);
     45    ~GPULegacyRenderCommandEncoder();
    4646
    47     void setRenderPipelineState(const GPURenderPipelineState&) const;
    48     void setDepthStencilState(const GPUDepthStencilState&) const;
    49     void setVertexBuffer(const GPUBuffer&, unsigned offset, unsigned index) const;
    50     void setFragmentBuffer(const GPUBuffer&, unsigned offset, unsigned index) const;
     47    void setRenderPipelineState(const GPULegacyRenderPipelineState&) const;
     48    void setDepthStencilState(const GPULegacyDepthStencilState&) const;
     49    void setVertexBuffer(const GPULegacyBuffer&, unsigned offset, unsigned index) const;
     50    void setFragmentBuffer(const GPULegacyBuffer&, unsigned offset, unsigned index) const;
    5151    void drawPrimitives(unsigned type, unsigned start, unsigned count) const;
    5252    void endEncoding() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassAttachmentDescriptor.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUDepthStencilDescriptor.h"
     27#include "GPULegacyRenderPassAttachmentDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
     31#include "GPULegacyTexture.h"
    3132#include "Logging.h"
    3233
    3334namespace WebCore {
    3435
    35 GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()
     36GPULegacyRenderPassAttachmentDescriptor::~GPULegacyRenderPassAttachmentDescriptor()
    3637{
    37     LOG(WebMetal, "GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()");
     38    LOG(WebMetal, "GPULegacyRenderPassAttachmentDescriptor::~GPULegacyRenderPassAttachmentDescriptor()");
    3839}
    3940
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassAttachmentDescriptor.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUTexture;
     36class GPULegacyTexture;
    3737
    38 class GPURenderPassAttachmentDescriptor {
     38class GPULegacyRenderPassAttachmentDescriptor {
    3939public:
    40     ~GPURenderPassAttachmentDescriptor();
     40    ~GPULegacyRenderPassAttachmentDescriptor();
    4141
    4242    unsigned loadAction() const;
     
    4646    void setStoreAction(unsigned) const;
    4747
    48     void setTexture(const GPUTexture&) const;
     48    void setTexture(const GPULegacyTexture&) const;
    4949
    5050#if USE(METAL)
     
    5454#if USE(METAL)
    5555protected:
    56     explicit GPURenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor *);
     56    explicit GPULegacyRenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor *);
    5757
    5858private:
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassColorAttachmentDescriptor.cpp

    r237367 r237368  
    11/*
    22 * Copyright (C) 2017 Apple Inc. All rights reserved.
    3  * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    2625
    2726#include "config.h"
    28 #include "GPUCommandBuffer.h"
     27#include "GPULegacyRenderPassColorAttachmentDescriptor.h"
    2928
    3029#if ENABLE(WEBMETAL)
     
    3433namespace WebCore {
    3534
    36 GPUCommandBuffer::~GPUCommandBuffer()
     35GPULegacyRenderPassColorAttachmentDescriptor::~GPULegacyRenderPassColorAttachmentDescriptor()
    3736{
    38     LOG(WebMetal, "GPUCommandBuffer::~GPUCommandBuffer()");
     37    LOG(WebMetal, "GPULegacyRenderPassColorAttachmentDescriptor::~GPULegacyRenderPassColorAttachmentDescriptor()");
    3938}
    4039
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassColorAttachmentDescriptor.h

    r237367 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderPassAttachmentDescriptor.h"
     30#include "GPULegacyRenderPassAttachmentDescriptor.h"
    3131
    3232OBJC_CLASS MTLRenderPassColorAttachmentDescriptor;
     
    3434namespace WebCore {
    3535
    36 class GPURenderPassColorAttachmentDescriptor : public GPURenderPassAttachmentDescriptor {
     36class GPULegacyRenderPassColorAttachmentDescriptor : public GPULegacyRenderPassAttachmentDescriptor {
    3737public:
    3838#if USE(METAL)
    39     GPURenderPassColorAttachmentDescriptor(MTLRenderPassColorAttachmentDescriptor *);
     39    GPULegacyRenderPassColorAttachmentDescriptor(MTLRenderPassColorAttachmentDescriptor *);
    4040#endif
    41     ~GPURenderPassColorAttachmentDescriptor();
     41    ~GPULegacyRenderPassColorAttachmentDescriptor();
    4242
    4343    Vector<float> clearColor() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassDepthAttachmentDescriptor.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPURenderPassDepthAttachmentDescriptor.h"
     27#include "GPULegacyRenderPassDepthAttachmentDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor()
     35GPULegacyRenderPassDepthAttachmentDescriptor::~GPULegacyRenderPassDepthAttachmentDescriptor()
    3636{
    3737    LOG(WebMetal, "GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor()");
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassDepthAttachmentDescriptor.h

    r237367 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #include "GPURenderPassAttachmentDescriptor.h"
     30#include "GPULegacyRenderPassAttachmentDescriptor.h"
    3131
    3232OBJC_CLASS MTLRenderPassDepthAttachmentDescriptor;
     
    3434namespace WebCore {
    3535
    36 class GPURenderPassDepthAttachmentDescriptor : public GPURenderPassAttachmentDescriptor {
     36class GPULegacyRenderPassDepthAttachmentDescriptor : public GPULegacyRenderPassAttachmentDescriptor {
    3737public:
    3838#if USE(METAL)
    39     GPURenderPassDepthAttachmentDescriptor(MTLRenderPassDepthAttachmentDescriptor *);
     39    GPULegacyRenderPassDepthAttachmentDescriptor(MTLRenderPassDepthAttachmentDescriptor *);
    4040#endif
    41     ~GPURenderPassDepthAttachmentDescriptor();
     41    ~GPULegacyRenderPassDepthAttachmentDescriptor();
    4242
    4343    double clearDepth() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassDescriptor.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPURenderPassDescriptor.h"
     27#include "GPULegacyRenderPassDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #include "GPURenderPassDepthAttachmentDescriptor.h"
     31#include "GPULegacyRenderPassDepthAttachmentDescriptor.h"
    3232#include "Logging.h"
    3333
    3434namespace WebCore {
    3535
    36 GPURenderPassDescriptor::~GPURenderPassDescriptor()
     36GPULegacyRenderPassDescriptor::~GPULegacyRenderPassDescriptor()
    3737{
    3838    LOG(WebMetal, "GPURenderPassDescriptor::~GPURenderPassDescriptor()");
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassDescriptor.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPURenderPassColorAttachmentDescriptor;
    37 class GPURenderPassDepthAttachmentDescriptor;
     36class GPULegacyRenderPassColorAttachmentDescriptor;
     37class GPULegacyRenderPassDepthAttachmentDescriptor;
    3838
    39 class GPURenderPassDescriptor {
     39class GPULegacyRenderPassDescriptor {
    4040public:
    41     GPURenderPassDescriptor();
    42     ~GPURenderPassDescriptor();
     41    GPULegacyRenderPassDescriptor();
     42    ~GPULegacyRenderPassDescriptor();
    4343
    44     Vector<GPURenderPassColorAttachmentDescriptor> colorAttachments() const;
    45     GPURenderPassDepthAttachmentDescriptor depthAttachment() const;
     44    Vector<GPULegacyRenderPassColorAttachmentDescriptor> colorAttachments() const;
     45    GPULegacyRenderPassDepthAttachmentDescriptor depthAttachment() const;
    4646
    4747#if USE(METAL)
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp

    r237367 r237368  
    11/*
    22 * Copyright (C) 2017 Apple Inc. All rights reserved.
    3  * Copyright (C) 2017 Yuichiro Kikura (y.kikura@gmail.com)
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    2625
    2726#include "config.h"
    28 #include "GPUCommandBuffer.h"
     27#include "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
    2928
    3029#if ENABLE(WEBMETAL)
     
    3433namespace WebCore {
    3534
    36 GPUCommandBuffer::~GPUCommandBuffer()
     35GPULegacyRenderPipelineColorAttachmentDescriptor::~GPULegacyRenderPipelineColorAttachmentDescriptor()
    3736{
    38     LOG(WebMetal, "GPUCommandBuffer::~GPUCommandBuffer()");
     37    LOG(WebMetal, "GPULegacyRenderPipelineColorAttachmentDescriptor::~GPULegacyRenderPipelineColorAttachmentDescriptor()");
    3938}
    4039
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineColorAttachmentDescriptor.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPURenderPipelineColorAttachmentDescriptor {
     36class GPULegacyRenderPipelineColorAttachmentDescriptor {
    3737public:
    3838#if USE(METAL)
    39     GPURenderPipelineColorAttachmentDescriptor(MTLRenderPipelineColorAttachmentDescriptor *);
     39    GPULegacyRenderPipelineColorAttachmentDescriptor(MTLRenderPipelineColorAttachmentDescriptor *);
    4040#endif
    41     ~GPURenderPipelineColorAttachmentDescriptor();
     41    ~GPULegacyRenderPipelineColorAttachmentDescriptor();
    4242
    4343    unsigned pixelFormat() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineDescriptor.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPURenderPipelineDescriptor.h"
     27#include "GPULegacyRenderPipelineDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor()
     35GPULegacyRenderPipelineDescriptor::~GPULegacyRenderPipelineDescriptor()
    3636{
    3737    LOG(WebMetal, "GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor()");
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineDescriptor.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUFunction;
    37 class GPURenderPipelineColorAttachmentDescriptor;
     36class GPULegacyFunction;
     37class GPULegacyRenderPipelineColorAttachmentDescriptor;
    3838
    39 class GPURenderPipelineDescriptor {
     39class GPULegacyRenderPipelineDescriptor {
    4040public:
    41     GPURenderPipelineDescriptor();
    42     ~GPURenderPipelineDescriptor();
     41    GPULegacyRenderPipelineDescriptor();
     42    ~GPULegacyRenderPipelineDescriptor();
    4343
    44     void setVertexFunction(const GPUFunction&) const;
    45     void setFragmentFunction(const GPUFunction&) const;
     44    void setVertexFunction(const GPULegacyFunction&) const;
     45    void setFragmentFunction(const GPULegacyFunction&) const;
    4646
    4747    unsigned depthAttachmentPixelFormat() const;
    4848    void setDepthAttachmentPixelFormat(unsigned) const;
    4949
    50     Vector<GPURenderPipelineColorAttachmentDescriptor> colorAttachments() const;
     50    Vector<GPULegacyRenderPipelineColorAttachmentDescriptor> colorAttachments() const;
    5151
    5252    void reset() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineState.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUDepthStencilState.h"
     27#include "GPULegacyRenderPipelineState.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUDepthStencilState::~GPUDepthStencilState()
     35GPULegacyRenderPipelineState::~GPULegacyRenderPipelineState()
    3636{
    37     LOG(WebMetal, "GPUDepthStencilState::~GPUDepthStencilState()");
     37    LOG(WebMetal, "GPULegacyRenderPipelineState::~GPULegacyRenderPipelineState()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineState.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUDevice;
    37 class GPURenderPipelineDescriptor;
     36class GPULegacyDevice;
     37class GPULegacyRenderPipelineDescriptor;
    3838
    39 class GPURenderPipelineState {
     39class GPULegacyRenderPipelineState {
    4040public:
    41     GPURenderPipelineState() = default;
    42     GPURenderPipelineState(const GPUDevice&, const GPURenderPipelineDescriptor&);
    43     ~GPURenderPipelineState();
     41    GPULegacyRenderPipelineState() = default;
     42    GPULegacyRenderPipelineState(const GPULegacyDevice&, const GPULegacyRenderPipelineDescriptor&);
     43    ~GPULegacyRenderPipelineState();
    4444
    4545    String label() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacySize.h

    r237367 r237368  
    3030namespace WebCore {
    3131   
    32 struct GPUSize {
     32struct GPULegacySize {
    3333    unsigned width;
    3434    unsigned height;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyTexture.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUFunction.h"
     27#include "GPULegacyTexture.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUFunction::~GPUFunction()
     35GPULegacyTexture::~GPULegacyTexture()
    3636{
    37     LOG(WebMetal, "GPUFunction::~GPUFunction()");
     37    LOG(WebMetal, "GPULegacyTexture::~GPULegacyTexture()");
    3838}
    3939
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyTexture.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUDevice;
    37 class GPUDrawable;
    38 class GPUTextureDescriptor;
     36class GPULegacyDevice;
     37class GPULegacyDrawable;
     38class GPULegacyTextureDescriptor;
    3939
    40 class GPUTexture {
     40class GPULegacyTexture {
    4141public:
    42     GPUTexture(const GPUDevice&, const GPUTextureDescriptor&);
    43     explicit GPUTexture(const GPUDrawable&);
    44     ~GPUTexture();
     42    GPULegacyTexture(const GPULegacyDevice&, const GPULegacyTextureDescriptor&);
     43    explicit GPULegacyTexture(const GPULegacyDrawable&);
     44    ~GPULegacyTexture();
    4545
    4646    unsigned width() const;
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyTextureDescriptor.cpp

    r237367 r237368  
    2525
    2626#include "config.h"
    27 #include "GPUTextureDescriptor.h"
     27#include "GPULegacyTextureDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3333namespace WebCore {
    3434
    35 GPUTextureDescriptor::~GPUTextureDescriptor()
     35GPULegacyTextureDescriptor::~GPULegacyTextureDescriptor()
    3636{
    3737    LOG(WebMetal, "GPUTextureDescriptor::~GPUTextureDescriptor()");
  • trunk/Source/WebCore/platform/graphics/gpu/GPULegacyTextureDescriptor.h

    r237367 r237368  
    3434namespace WebCore {
    3535
    36 class GPUTextureDescriptor {
     36class GPULegacyTextureDescriptor {
    3737public:
    38     GPUTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
    39     ~GPUTextureDescriptor();
     38    GPULegacyTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
     39    ~GPULegacyTextureDescriptor();
    4040
    4141    unsigned width() const;
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyBufferMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUBuffer.h"
     27#import "GPULegacyBuffer.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDevice.h"
     31#import "GPULegacyDevice.h"
    3232#import "Logging.h"
    3333#import <JavaScriptCore/ArrayBufferView.h>
     
    3838namespace WebCore {
    3939
    40 GPUBuffer::GPUBuffer(const GPUDevice& device, const JSC::ArrayBufferView& data)
     40GPULegacyBuffer::GPULegacyBuffer(const GPULegacyDevice& device, const JSC::ArrayBufferView& data)
    4141{
    4242    LOG(WebMetal, "GPUBuffer::GPUBuffer()");
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyCommandBufferMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUCommandBuffer.h"
     27#import "GPULegacyCommandBuffer.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUCommandQueue.h"
    32 #import "GPUDrawable.h"
     31#import "GPULegacyCommandQueue.h"
     32#import "GPULegacyDrawable.h"
    3333#import "Logging.h"
    3434#import <Metal/Metal.h>
     
    3838namespace WebCore {
    3939
    40 GPUCommandBuffer::GPUCommandBuffer(const GPUCommandQueue& queue, Function<void()>&& completedCallback)
     40GPULegacyCommandBuffer::GPULegacyCommandBuffer(const GPULegacyCommandQueue& queue, Function<void()>&& completedCallback)
    4141    : m_metal { [queue.metal() commandBuffer] }
    4242{
     
    4848}
    4949
    50 void GPUCommandBuffer::presentDrawable(GPUDrawable& drawable) const
     50void GPULegacyCommandBuffer::presentDrawable(GPULegacyDrawable& drawable) const
    5151{
    5252    if (!m_metal || !drawable.metal())
     
    5757}
    5858
    59 void GPUCommandBuffer::commit() const
     59void GPULegacyCommandBuffer::commit() const
    6060{
    6161    [m_metal commit];
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyCommandQueueMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUCommandQueue.h"
     27#import "GPULegacyCommandQueue.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDevice.h"
     31#import "GPULegacyDevice.h"
    3232#import "Logging.h"
    3333#import <Metal/Metal.h>
     
    3939static NSString * const commandQueueLabelPrefix = @"com.apple.WebKit.";
    4040
    41 GPUCommandQueue::GPUCommandQueue(const GPUDevice& device)
     41GPULegacyCommandQueue::GPULegacyCommandQueue(const GPULegacyDevice& device)
    4242    : m_metal { adoptNS([device.metal() newCommandQueue]) }
    4343{
    44     LOG(WebMetal, "GPUCommandQueue::GPUCommandQueue()");
     44    LOG(WebMetal, "GPULegacyCommandQueue::GPULegacyCommandQueue()");
    4545
    4646    [m_metal setLabel:commandQueueDefaultLabel];
    4747}
    4848
    49 String GPUCommandQueue::label() const
     49String GPULegacyCommandQueue::label() const
    5050{
    5151    if (!m_metal)
     
    6161}
    6262
    63 void GPUCommandQueue::setLabel(const String& label) const
     63void GPULegacyCommandQueue::setLabel(const String& label) const
    6464{
    6565    if (label.isEmpty())
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyComputeCommandEncoderMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUComputeCommandEncoder.h"
     27#import "GPULegacyComputeCommandEncoder.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUBuffer.h"
    32 #import "GPUCommandBuffer.h"
    33 #import "GPUComputePipelineState.h"
    34 #import "GPUSize.h"
     31#import "GPULegacyBuffer.h"
     32#import "GPULegacyCommandBuffer.h"
     33#import "GPULegacyComputePipelineState.h"
     34#import "GPULegacySize.h"
    3535#import "Logging.h"
    3636#import <Metal/Metal.h>
     
    3838namespace WebCore {
    3939
    40 static inline MTLSize MTLSizeMake(GPUSize size)
     40static inline MTLSize MTLSizeMake(GPULegacySize size)
    4141{
    4242    return { size.width, size.height, size.depth };
    4343}
    4444
    45 GPUComputeCommandEncoder::GPUComputeCommandEncoder(const GPUCommandBuffer& buffer)
     45GPULegacyComputeCommandEncoder::GPULegacyComputeCommandEncoder(const GPULegacyCommandBuffer& buffer)
    4646    : m_metal { [buffer.metal() computeCommandEncoder] }
    4747{
    48     LOG(WebMetal, "GPUComputeCommandEncoder::GPUComputeCommandEncoder()");
     48    LOG(WebMetal, "GPULegacyComputeCommandEncoder::GPULegacyComputeCommandEncoder()");
    4949}
    5050
    51 void GPUComputeCommandEncoder::setComputePipelineState(const GPUComputePipelineState& computePipelineState) const
     51void GPULegacyComputeCommandEncoder::setComputePipelineState(const GPULegacyComputePipelineState& computePipelineState) const
    5252{
    5353    if (!computePipelineState.metal())
     
    5757}
    5858   
    59 void GPUComputeCommandEncoder::setBuffer(const GPUBuffer& buffer, unsigned offset, unsigned index) const
     59void GPULegacyComputeCommandEncoder::setBuffer(const GPULegacyBuffer& buffer, unsigned offset, unsigned index) const
    6060{
    6161    if (!buffer.metal())
     
    6565}
    6666   
    67 void GPUComputeCommandEncoder::dispatch(GPUSize threadgroupsPerGrid, GPUSize threadsPerThreadgroup) const
     67void GPULegacyComputeCommandEncoder::dispatch(GPULegacySize threadgroupsPerGrid, GPULegacySize threadsPerThreadgroup) const
    6868{
    6969    [m_metal dispatchThreadgroups:MTLSizeMake(threadgroupsPerGrid) threadsPerThreadgroup:MTLSizeMake(threadsPerThreadgroup)];
    7070}
    7171
    72 void GPUComputeCommandEncoder::endEncoding() const
     72void GPULegacyComputeCommandEncoder::endEncoding() const
    7373{
    7474    [m_metal endEncoding];
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyComputePipelineStateMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUComputePipelineState.h"
     27#import "GPULegacyComputePipelineState.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDevice.h"
    32 #import "GPUFunction.h"
     31#import "GPULegacyDevice.h"
     32#import "GPULegacyFunction.h"
    3333#import "Logging.h"
    3434#import <Metal/Metal.h>
     
    3636namespace WebCore {
    3737
    38 GPUComputePipelineState::GPUComputePipelineState(const GPUDevice& device, const GPUFunction& function)
     38GPULegacyComputePipelineState::GPULegacyComputePipelineState(const GPULegacyDevice& device, const GPULegacyFunction& function)
    3939{
    40     LOG(WebMetal, "GPUComputePipelineState::GPUComputePipelineState()");
     40    LOG(WebMetal, "GPULegacyComputePipelineState::GPULegacyComputePipelineState()");
    4141
    4242    if (!function.metal())
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyDepthStencilDescriptorMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUDepthStencilDescriptor.h"
     27#import "GPULegacyDepthStencilDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUEnums.h"
     31#import "GPULegacyEnums.h"
    3232#import "Logging.h"
    3333#import <Metal/Metal.h>
     
    3535namespace WebCore {
    3636
    37 GPUDepthStencilDescriptor::GPUDepthStencilDescriptor()
     37GPULegacyDepthStencilDescriptor::GPULegacyDepthStencilDescriptor()
    3838    : m_metal { adoptNS([MTLDepthStencilDescriptor new]) }
    3939{
     
    4141}
    4242
    43 bool GPUDepthStencilDescriptor::depthWriteEnabled() const
     43bool GPULegacyDepthStencilDescriptor::depthWriteEnabled() const
    4444{
    4545    return [m_metal isDepthWriteEnabled];
    4646}
    4747
    48 void GPUDepthStencilDescriptor::setDepthWriteEnabled(bool newDepthWriteEnabled) const
     48void GPULegacyDepthStencilDescriptor::setDepthWriteEnabled(bool newDepthWriteEnabled) const
    4949{
    5050    [m_metal setDepthWriteEnabled:newDepthWriteEnabled];
    5151}
    5252
    53 GPUCompareFunction GPUDepthStencilDescriptor::depthCompareFunction() const
     53GPULegacyCompareFunction GPULegacyDepthStencilDescriptor::depthCompareFunction() const
    5454{
    55     return static_cast<GPUCompareFunction>([m_metal depthCompareFunction]);
     55    return static_cast<GPULegacyCompareFunction>([m_metal depthCompareFunction]);
    5656}
    5757
    58 void GPUDepthStencilDescriptor::setDepthCompareFunction(GPUCompareFunction newFunction) const
     58void GPULegacyDepthStencilDescriptor::setDepthCompareFunction(GPULegacyCompareFunction newFunction) const
    5959{
    6060    // FIXME: Do we need to check if the function value is in range before casting to MTLCompareFunction?
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyDepthStencilStateMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUDepthStencilState.h"
     27#import "GPULegacyDepthStencilState.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDepthStencilDescriptor.h"
    32 #import "GPUDevice.h"
     31#import "GPULegacyDepthStencilDescriptor.h"
     32#import "GPULegacyDevice.h"
    3333#import "Logging.h"
    3434#import <Metal/Metal.h>
     
    3737namespace WebCore {
    3838
    39 GPUDepthStencilState::GPUDepthStencilState(const GPUDevice& device, const GPUDepthStencilDescriptor& descriptor)
     39GPULegacyDepthStencilState::GPULegacyDepthStencilState(const GPULegacyDevice& device, const GPULegacyDepthStencilDescriptor& descriptor)
    4040    : m_metal { adoptNS([device.metal() newDepthStencilStateWithDescriptor:descriptor.metal()]) }
    4141{
    42     LOG(WebMetal, "GPUDepthStencilState::GPUDepthStencilState()");
     42    LOG(WebMetal, "GPULegacyDepthStencilState::GPULegacyDepthStencilState()");
    4343}
    4444
    45 String GPUDepthStencilState::label() const
     45String GPULegacyDepthStencilState::label() const
    4646{
    4747    if (!m_metal)
     
    5151}
    5252
    53 void GPUDepthStencilState::setLabel(const String&) const
     53void GPULegacyDepthStencilState::setLabel(const String&) const
    5454{
    5555    // FIXME: The MTLDepthStencilState protocol does not allow setting the label.
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyDeviceMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUDevice.h"
     27#import "GPULegacyDevice.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3737namespace WebCore {
    3838
    39 GPUDevice::GPUDevice()
     39GPULegacyDevice::GPULegacyDevice()
    4040    : m_metal { adoptNS(MTLCreateSystemDefaultDevice()) }
    4141{
    4242
    4343    if (!m_metal) {
    44         LOG(WebMetal, "GPUDevice::GPUDevice -- could not create the device. This usually means Metal is not available on this hardware.");
     44        LOG(WebMetal, "GPULegacyDevice::GPULegacyDevice -- could not create the device. This usually means Metal is not available on this hardware.");
    4545        return;
    4646    }
    4747
    48     LOG(WebMetal, "GPUDevice::GPUDevice Metal device is %p", m_metal.get());
     48    LOG(WebMetal, "GPULegacyDevice::GPULegacyDevice Metal device is %p", m_metal.get());
    4949
    5050    BEGIN_BLOCK_OBJC_EXCEPTIONS
     
    6262}
    6363
    64 void GPUDevice::disconnect()
     64void GPULegacyDevice::disconnect()
    6565{
    6666    m_layer.get().context = nullptr;
     
    6868}
    6969
    70 void GPUDevice::reshape(int width, int height) const
     70void GPULegacyDevice::reshape(int width, int height) const
    7171{
    7272    [m_layer setBounds:CGRectMake(0, 0, width, height)];
     
    7676}
    7777
    78 CALayer *GPUDevice::platformLayer() const
     78CALayer *GPULegacyDevice::platformLayer() const
    7979{
    8080    return m_layer.get();
    8181}
    8282
    83 bool GPUDevice::operator!() const
     83bool GPULegacyDevice::operator!() const
    8484{
    8585    return !m_metal;
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyDrawableMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUDrawable.h"
     27#import "GPULegacyDrawable.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDevice.h"
     31#import "GPULegacyDevice.h"
    3232#import "Logging.h"
    3333#import "WebMetalLayer.h"
     
    3535namespace WebCore {
    3636
    37 GPUDrawable::GPUDrawable(const GPUDevice& device)
     37GPULegacyDrawable::GPULegacyDrawable(const GPULegacyDevice& device)
    3838    : m_metal { [device.layer() nextDrawable] }
    3939{
    40     LOG(WebMetal, "GPUDrawable::GPUDrawable()");
     40    LOG(WebMetal, "GPULegacyDrawable::GPULegacyDrawable()");
    4141}
    4242
    43 void GPUDrawable::release()
     43void GPULegacyDrawable::release()
    4444{
    45     LOG(WebMetal, "GPUDrawable::release()");
     45    LOG(WebMetal, "GPULegacyDrawable::release()");
    4646    m_metal = nil;
    4747}
    4848   
    49 MTLDrawable *GPUDrawable::metal() const
     49MTLDrawable *GPULegacyDrawable::metal() const
    5050{
    5151    return m_metal.get();
    5252}
    5353
    54 MTLTexture *GPUDrawable::texture() const
     54MTLTexture *GPULegacyDrawable::texture() const
    5555{
    5656    if (![m_metal conformsToProtocol:@protocol(CAMetalDrawable)]) {
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyFunctionMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUFunction.h"
     27#import "GPULegacyFunction.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPULibrary.h"
     31#import "GPULegacyLibrary.h"
    3232#import "Logging.h"
    3333#import <Metal/Metal.h>
     
    3636namespace WebCore {
    3737
    38 GPUFunction::GPUFunction(const GPULibrary& library, const String& name)
     38GPULegacyFunction::GPULegacyFunction(const GPULegacyLibrary& library, const String& name)
    3939    : m_metal { adoptNS([library.metal() newFunctionWithName:name]) }
    4040{
    41     LOG(WebMetal, "GPUFunction::GPUFunction()");
     41    LOG(WebMetal, "GPULegacyFunction::GPULegacyFunction()");
    4242}
    4343
    44 String GPUFunction::name() const
     44String GPULegacyFunction::name() const
    4545{
    4646    if (!m_metal)
     
    5050}
    5151
    52 bool GPUFunction::operator!() const
     52bool GPULegacyFunction::operator!() const
    5353{
    5454    return !m_metal;
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyLibraryMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPULibrary.h"
     27#import "GPULegacyLibrary.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDevice.h"
     31#import "GPULegacyDevice.h"
    3232#import "Logging.h"
    3333#import <Metal/Metal.h>
     
    3737namespace WebCore {
    3838
    39 GPULibrary::GPULibrary(const GPUDevice& device, const String& sourceCode)
     39GPULegacyLibrary::GPULegacyLibrary(const GPULegacyDevice& device, const String& sourceCode)
    4040{
    41     LOG(WebMetal, "GPULibrary::GPULibrary()");
     41    LOG(WebMetal, "GPULegacyLibrary::GPULegacyLibrary()");
    4242
    4343    if (!device.metal())
     
    5050}
    5151
    52 String GPULibrary::label() const
     52String GPULegacyLibrary::label() const
    5353{
    5454    if (!m_metal)
     
    5858}
    5959
    60 void GPULibrary::setLabel(const String& label) const
     60void GPULegacyLibrary::setLabel(const String& label) const
    6161{
    6262    ASSERT(m_metal);
     
    6464}
    6565
    66 Vector<String> GPULibrary::functionNames() const
     66Vector<String> GPULegacyLibrary::functionNames() const
    6767{
    6868    auto array = [m_metal functionNames];
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyRenderCommandEncoderMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPURenderCommandEncoder.h"
     27#import "GPULegacyRenderCommandEncoder.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUBuffer.h"
    32 #import "GPUCommandBuffer.h"
    33 #import "GPUDepthStencilState.h"
    34 #import "GPURenderPassDescriptor.h"
    35 #import "GPURenderPipelineState.h"
     31#import "GPULegacyBuffer.h"
     32#import "GPULegacyCommandBuffer.h"
     33#import "GPULegacyDepthStencilState.h"
     34#import "GPULegacyRenderPassDescriptor.h"
     35#import "GPULegacyRenderPipelineState.h"
    3636#import "Logging.h"
    3737#import <Metal/Metal.h>
     
    3939namespace WebCore {
    4040
    41 GPURenderCommandEncoder::GPURenderCommandEncoder(const GPUCommandBuffer& buffer, const GPURenderPassDescriptor& descriptor)
     41GPULegacyRenderCommandEncoder::GPULegacyRenderCommandEncoder(const GPULegacyCommandBuffer& buffer, const GPULegacyRenderPassDescriptor& descriptor)
    4242{
    43     LOG(WebMetal, "GPURenderCommandEncoder::GPURenderCommandEncoder()");
     43    LOG(WebMetal, "GPULegacyRenderCommandEncoder::GPULegacyRenderCommandEncoder()");
    4444
    4545    if (!descriptor.metal())
     
    4949}
    5050
    51 void GPURenderCommandEncoder::setRenderPipelineState(const GPURenderPipelineState& renderPipelineState) const
     51void GPULegacyRenderCommandEncoder::setRenderPipelineState(const GPULegacyRenderPipelineState& renderPipelineState) const
    5252{
    5353    if (!renderPipelineState.metal())
     
    5757}
    5858
    59 void GPURenderCommandEncoder::setDepthStencilState(const GPUDepthStencilState& depthStencilState) const
     59void GPULegacyRenderCommandEncoder::setDepthStencilState(const GPULegacyDepthStencilState& depthStencilState) const
    6060{
    6161    if (!depthStencilState.metal())
     
    6565}
    6666
    67 void GPURenderCommandEncoder::setVertexBuffer(const GPUBuffer& buffer, unsigned offset, unsigned index) const
     67void GPULegacyRenderCommandEncoder::setVertexBuffer(const GPULegacyBuffer& buffer, unsigned offset, unsigned index) const
    6868{
    6969    if (!buffer.metal())
     
    7373}
    7474
    75 void GPURenderCommandEncoder::setFragmentBuffer(const GPUBuffer& buffer, unsigned offset, unsigned index) const
     75void GPULegacyRenderCommandEncoder::setFragmentBuffer(const GPULegacyBuffer& buffer, unsigned offset, unsigned index) const
    7676{
    7777    if (!buffer.metal())
     
    8181}
    8282
    83 void GPURenderCommandEncoder::drawPrimitives(unsigned type, unsigned start, unsigned count) const
     83void GPULegacyRenderCommandEncoder::drawPrimitives(unsigned type, unsigned start, unsigned count) const
    8484{
    8585    // FIXME: Why do we need a specially optimized path for count of 0?
     
    9090}
    9191
    92 void GPURenderCommandEncoder::endEncoding() const
     92void GPULegacyRenderCommandEncoder::endEncoding() const
    9393{
    9494    [m_metal endEncoding];
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyRenderPassAttachmentDescriptorMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPURenderPassAttachmentDescriptor.h"
     27#import "GPULegacyRenderPassAttachmentDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUTexture.h"
     31#import "GPULegacyTexture.h"
    3232#import "Logging.h"
    3333
     
    3636namespace WebCore {
    3737
    38 GPURenderPassAttachmentDescriptor::GPURenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor *metal)
     38GPULegacyRenderPassAttachmentDescriptor::GPULegacyRenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor *metal)
    3939    : m_metal { metal }
    4040{
    41     LOG(WebMetal, "GPURenderPassAttachmentDescriptor::GPURenderPassAttachmentDescriptor()");
     41    LOG(WebMetal, "GPULegacyRenderPassAttachmentDescriptor::GPULegacyRenderPassAttachmentDescriptor()");
    4242}
    4343
    44 unsigned GPURenderPassAttachmentDescriptor::loadAction() const
     44unsigned GPULegacyRenderPassAttachmentDescriptor::loadAction() const
    4545{
    4646    return [m_metal loadAction];
    4747}
    4848
    49 void GPURenderPassAttachmentDescriptor::setLoadAction(unsigned newLoadAction) const
     49void GPULegacyRenderPassAttachmentDescriptor::setLoadAction(unsigned newLoadAction) const
    5050{
    5151    // FIXME: Should this range check for legitimate values?
     
    5353}
    5454
    55 unsigned GPURenderPassAttachmentDescriptor::storeAction() const
     55unsigned GPULegacyRenderPassAttachmentDescriptor::storeAction() const
    5656{
    5757    return [m_metal storeAction];
    5858}
    5959
    60 void GPURenderPassAttachmentDescriptor::setStoreAction(unsigned newStoreAction) const
     60void GPULegacyRenderPassAttachmentDescriptor::setStoreAction(unsigned newStoreAction) const
    6161{
    6262    // FIXME: Should this range check for legitimate values?
     
    6464}
    6565
    66 void GPURenderPassAttachmentDescriptor::setTexture(const GPUTexture& texture) const
     66void GPULegacyRenderPassAttachmentDescriptor::setTexture(const GPULegacyTexture& texture) const
    6767{
    6868    [m_metal setTexture:texture.metal()];
    6969}
    7070
    71 MTLRenderPassAttachmentDescriptor *GPURenderPassAttachmentDescriptor::metal() const
     71MTLRenderPassAttachmentDescriptor *GPULegacyRenderPassAttachmentDescriptor::metal() const
    7272{
    7373    return m_metal.get();
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyRenderPassColorAttachmentDescriptorMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPURenderPassColorAttachmentDescriptor.h"
     27#import "GPULegacyRenderPassColorAttachmentDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3636namespace WebCore {
    3737
    38 GPURenderPassColorAttachmentDescriptor::GPURenderPassColorAttachmentDescriptor(MTLRenderPassColorAttachmentDescriptor *metal)
    39     : GPURenderPassAttachmentDescriptor { metal }
     38GPULegacyRenderPassColorAttachmentDescriptor::GPULegacyRenderPassColorAttachmentDescriptor(MTLRenderPassColorAttachmentDescriptor *metal)
     39    : GPULegacyRenderPassAttachmentDescriptor { metal }
    4040{
    41     LOG(WebMetal, "GPURenderPassColorAttachmentDescriptor::GPURenderPassColorAttachmentDescriptor()");
     41    LOG(WebMetal, "GPULegacyRenderPassColorAttachmentDescriptor::GPULegacyRenderPassColorAttachmentDescriptor()");
    4242}
    4343
    44 Vector<float> GPURenderPassColorAttachmentDescriptor::clearColor() const
     44Vector<float> GPULegacyRenderPassColorAttachmentDescriptor::clearColor() const
    4545{
    4646    auto* metal = this->metal();
     
    5252}
    5353
    54 void GPURenderPassColorAttachmentDescriptor::setClearColor(const Vector<float>& newClearColor) const
     54void GPULegacyRenderPassColorAttachmentDescriptor::setClearColor(const Vector<float>& newClearColor) const
    5555{
    5656    if (newClearColor.size() != 4)
     
    6060}
    6161
    62 MTLRenderPassColorAttachmentDescriptor *GPURenderPassColorAttachmentDescriptor::metal() const
     62MTLRenderPassColorAttachmentDescriptor *GPULegacyRenderPassColorAttachmentDescriptor::metal() const
    6363{
    64     return static_cast<MTLRenderPassColorAttachmentDescriptor *>(GPURenderPassAttachmentDescriptor::metal());
     64    return static_cast<MTLRenderPassColorAttachmentDescriptor *>(GPULegacyRenderPassAttachmentDescriptor::metal());
    6565}
    6666
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPURenderPassDepthAttachmentDescriptor.h"
     27#import "GPULegacyRenderPassDepthAttachmentDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPURenderPassAttachmentDescriptor.h"
     31#import "GPULegacyRenderPassAttachmentDescriptor.h"
    3232#import "Logging.h"
    3333#import <Metal/Metal.h>
     
    3535namespace WebCore {
    3636
    37 GPURenderPassDepthAttachmentDescriptor::GPURenderPassDepthAttachmentDescriptor(MTLRenderPassDepthAttachmentDescriptor *metal)
    38     : GPURenderPassAttachmentDescriptor { metal }
     37GPULegacyRenderPassDepthAttachmentDescriptor::GPULegacyRenderPassDepthAttachmentDescriptor(MTLRenderPassDepthAttachmentDescriptor *metal)
     38    : GPULegacyRenderPassAttachmentDescriptor { metal }
    3939{
    4040    LOG(WebMetal, "GPURenderPassDepthAttachmentDescriptor::GPURenderPassDepthAttachmentDescriptor()");
    4141}
    4242
    43 double GPURenderPassDepthAttachmentDescriptor::clearDepth() const
     43double GPULegacyRenderPassDepthAttachmentDescriptor::clearDepth() const
    4444{
    4545    auto* metal = this->metal();
     
    5050}
    5151
    52 void GPURenderPassDepthAttachmentDescriptor::setClearDepth(double newClearDepth) const
     52void GPULegacyRenderPassDepthAttachmentDescriptor::setClearDepth(double newClearDepth) const
    5353{
    5454    [metal() setClearDepth:newClearDepth];
    5555}
    5656
    57 MTLRenderPassDepthAttachmentDescriptor *GPURenderPassDepthAttachmentDescriptor::metal() const
     57MTLRenderPassDepthAttachmentDescriptor *GPULegacyRenderPassDepthAttachmentDescriptor::metal() const
    5858{
    59     return static_cast<MTLRenderPassDepthAttachmentDescriptor *>(GPURenderPassAttachmentDescriptor::metal());
     59    return static_cast<MTLRenderPassDepthAttachmentDescriptor *>(GPULegacyRenderPassAttachmentDescriptor::metal());
    6060}
    6161
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyRenderPassDescriptorMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPURenderPassDescriptor.h"
     27#import "GPULegacyRenderPassDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPURenderPassColorAttachmentDescriptor.h"
    32 #import "GPURenderPassDepthAttachmentDescriptor.h"
     31#import "GPULegacyRenderPassColorAttachmentDescriptor.h"
     32#import "GPULegacyRenderPassDepthAttachmentDescriptor.h"
    3333#import "Logging.h"
    3434#import <Metal/Metal.h>
     
    3737namespace WebCore {
    3838
    39 GPURenderPassDescriptor::GPURenderPassDescriptor()
     39GPULegacyRenderPassDescriptor::GPULegacyRenderPassDescriptor()
    4040    : m_metal { adoptNS([MTLRenderPassDescriptor new]) }
    4141{
     
    4343}
    4444
    45 Vector<GPURenderPassColorAttachmentDescriptor> GPURenderPassDescriptor::colorAttachments() const
     45Vector<GPULegacyRenderPassColorAttachmentDescriptor> GPULegacyRenderPassDescriptor::colorAttachments() const
    4646{
    4747    if (!m_metal)
     
    5252}
    5353
    54 GPURenderPassDepthAttachmentDescriptor GPURenderPassDescriptor::depthAttachment() const
     54GPULegacyRenderPassDepthAttachmentDescriptor GPULegacyRenderPassDescriptor::depthAttachment() const
    5555{
    5656    return [m_metal depthAttachment];
    5757}
    5858
    59 MTLRenderPassDescriptor *GPURenderPassDescriptor::metal() const
     59MTLRenderPassDescriptor *GPULegacyRenderPassDescriptor::metal() const
    6060{
    6161    return m_metal.get();
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPURenderPipelineColorAttachmentDescriptor.h"
     27#import "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3434namespace WebCore {
    3535
    36 GPURenderPipelineColorAttachmentDescriptor::GPURenderPipelineColorAttachmentDescriptor(MTLRenderPipelineColorAttachmentDescriptor *metal)
     36GPULegacyRenderPipelineColorAttachmentDescriptor::GPULegacyRenderPipelineColorAttachmentDescriptor(MTLRenderPipelineColorAttachmentDescriptor *metal)
    3737    : m_metal { metal }
    3838{
    39     LOG(WebMetal, "GPURenderPipelineColorAttachmentDescriptor::GPURenderPipelineColorAttachmentDescriptor()");
     39    LOG(WebMetal, "GPULegacyRenderPipelineColorAttachmentDescriptor::GPULegacyRenderPipelineColorAttachmentDescriptor()");
    4040}
    4141
    42 unsigned GPURenderPipelineColorAttachmentDescriptor::pixelFormat() const
     42unsigned GPULegacyRenderPipelineColorAttachmentDescriptor::pixelFormat() const
    4343{
    4444    return [m_metal pixelFormat];
    4545}
    4646
    47 void GPURenderPipelineColorAttachmentDescriptor::setPixelFormat(unsigned newPixelFormat) const
     47void GPULegacyRenderPipelineColorAttachmentDescriptor::setPixelFormat(unsigned newPixelFormat) const
    4848{
    4949    // FIXME: Should we check for enumeration values out of range before calling the method?
     
    5151}
    5252
    53 MTLRenderPipelineColorAttachmentDescriptor *GPURenderPipelineColorAttachmentDescriptor::metal() const
     53MTLRenderPipelineColorAttachmentDescriptor *GPULegacyRenderPipelineColorAttachmentDescriptor::metal() const
    5454{
    5555    return m_metal.get();
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyRenderPipelineDescriptorMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPURenderPipelineDescriptor.h"
     27#import "GPULegacyRenderPipelineDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUFunction.h"
    32 #import "GPURenderPipelineColorAttachmentDescriptor.h"
     31#import "GPULegacyFunction.h"
     32#import "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
    3333#import "Logging.h"
    3434#import <Metal/Metal.h>
     
    3737namespace WebCore {
    3838
    39 GPURenderPipelineDescriptor::GPURenderPipelineDescriptor()
     39GPULegacyRenderPipelineDescriptor::GPULegacyRenderPipelineDescriptor()
    4040    : m_metal { adoptNS([MTLRenderPipelineDescriptor new]) }
    4141{
     
    4343}
    4444
    45 unsigned GPURenderPipelineDescriptor::depthAttachmentPixelFormat() const
     45unsigned GPULegacyRenderPipelineDescriptor::depthAttachmentPixelFormat() const
    4646{
    4747    return [m_metal depthAttachmentPixelFormat];
    4848}
    4949
    50 void GPURenderPipelineDescriptor::setDepthAttachmentPixelFormat(unsigned newPixelFormat) const
     50void GPULegacyRenderPipelineDescriptor::setDepthAttachmentPixelFormat(unsigned newPixelFormat) const
    5151{
    5252    [m_metal setDepthAttachmentPixelFormat:static_cast<MTLPixelFormat>(newPixelFormat)];
    5353}
    5454
    55 void GPURenderPipelineDescriptor::setVertexFunction(const GPUFunction& newFunction) const
     55void GPULegacyRenderPipelineDescriptor::setVertexFunction(const GPULegacyFunction& newFunction) const
    5656{
    5757    [m_metal setVertexFunction:newFunction.metal()];
    5858}
    5959
    60 void GPURenderPipelineDescriptor::setFragmentFunction(const GPUFunction& newFunction) const
     60void GPULegacyRenderPipelineDescriptor::setFragmentFunction(const GPULegacyFunction& newFunction) const
    6161{
    6262    [m_metal setFragmentFunction:newFunction.metal()];
    6363}
    6464
    65 Vector<GPURenderPipelineColorAttachmentDescriptor> GPURenderPipelineDescriptor::colorAttachments() const
     65Vector<GPULegacyRenderPipelineColorAttachmentDescriptor> GPULegacyRenderPipelineDescriptor::colorAttachments() const
    6666{
    6767    // FIXME: Why is it always OK to return exactly one attachment?
     
    6969}
    7070
    71 void GPURenderPipelineDescriptor::reset() const
     71void GPULegacyRenderPipelineDescriptor::reset() const
    7272{
    7373    [m_metal reset];
    7474}
    7575
    76 MTLRenderPipelineDescriptor *GPURenderPipelineDescriptor::metal() const
     76MTLRenderPipelineDescriptor *GPULegacyRenderPipelineDescriptor::metal() const
    7777{
    7878    return m_metal.get();
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyRenderPipelineStateMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPURenderPipelineState.h"
     27#import "GPULegacyRenderPipelineState.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDevice.h"
    32 #import "GPURenderPipelineDescriptor.h"
     31#import "GPULegacyDevice.h"
     32#import "GPULegacyRenderPipelineDescriptor.h"
    3333#import "Logging.h"
    3434#import <Metal/Metal.h>
     
    3737namespace WebCore {
    3838
    39 GPURenderPipelineState::GPURenderPipelineState(const GPUDevice& device, const GPURenderPipelineDescriptor& descriptor)
     39GPULegacyRenderPipelineState::GPULegacyRenderPipelineState(const GPULegacyDevice& device, const GPULegacyRenderPipelineDescriptor& descriptor)
    4040    : m_metal { adoptNS([device.metal() newRenderPipelineStateWithDescriptor:descriptor.metal() error:nil]) }
    4141{
    42     LOG(WebMetal, "GPURenderPipelineState::GPURenderPipelineState()");
     42    LOG(WebMetal, "GPULegacyRenderPipelineState::GPULegacyRenderPipelineState()");
    4343}
    4444
    45 String GPURenderPipelineState::label() const
     45String GPULegacyRenderPipelineState::label() const
    4646{
    4747    if (!m_metal)
     
    5050}
    5151
    52 void GPURenderPipelineState::setLabel(const String&) const
     52void GPULegacyRenderPipelineState::setLabel(const String&) const
    5353{
    5454    // FIXME: The MTLRenderPipelineState protocol does not allow setting the label.
     
    5757}
    5858   
    59 MTLRenderPipelineState *GPURenderPipelineState::metal() const
     59MTLRenderPipelineState *GPULegacyRenderPipelineState::metal() const
    6060{
    6161    return m_metal.get();
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyTextureDescriptorMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUTextureDescriptor.h"
     27#import "GPULegacyTextureDescriptor.h"
    2828
    2929#if ENABLE(WEBMETAL)
     
    3434namespace WebCore {
    3535
    36 GPUTextureDescriptor::GPUTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
     36GPULegacyTextureDescriptor::GPULegacyTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
    3737    : m_metal { [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:static_cast<MTLPixelFormat>(pixelFormat) width:width height:height mipmapped:mipmapped] }
    3838{
     
    4040}
    4141
    42 unsigned GPUTextureDescriptor::width() const
     42unsigned GPULegacyTextureDescriptor::width() const
    4343{
    4444    return [m_metal width];
    4545}
    4646
    47 void GPUTextureDescriptor::setWidth(unsigned newWidth) const
     47void GPULegacyTextureDescriptor::setWidth(unsigned newWidth) const
    4848{
    4949    ASSERT(m_metal);
     
    5151}
    5252
    53 unsigned GPUTextureDescriptor::height() const
     53unsigned GPULegacyTextureDescriptor::height() const
    5454{
    5555    return [m_metal height];
    5656}
    5757
    58 void GPUTextureDescriptor::setHeight(unsigned newHeight) const
     58void GPULegacyTextureDescriptor::setHeight(unsigned newHeight) const
    5959{
    6060    ASSERT(m_metal);
     
    6262}
    6363
    64 unsigned GPUTextureDescriptor::sampleCount() const
     64unsigned GPULegacyTextureDescriptor::sampleCount() const
    6565{
    6666    return [m_metal sampleCount];
    6767}
    6868
    69 void GPUTextureDescriptor::setSampleCount(unsigned newSampleCount) const
     69void GPULegacyTextureDescriptor::setSampleCount(unsigned newSampleCount) const
    7070{
    7171    ASSERT(m_metal);
     
    7373}
    7474
    75 unsigned GPUTextureDescriptor::textureType() const
     75unsigned GPULegacyTextureDescriptor::textureType() const
    7676{
    7777    return [m_metal textureType];
    7878}
    7979
    80 void GPUTextureDescriptor::setTextureType(unsigned newTextureType) const
     80void GPULegacyTextureDescriptor::setTextureType(unsigned newTextureType) const
    8181{
    8282    ASSERT(m_metal);
     
    8484}
    8585
    86 unsigned GPUTextureDescriptor::storageMode() const
     86unsigned GPULegacyTextureDescriptor::storageMode() const
    8787{
    8888    return [m_metal storageMode];
    8989}
    9090
    91 void GPUTextureDescriptor::setStorageMode(unsigned newStorageMode) const
     91void GPULegacyTextureDescriptor::setStorageMode(unsigned newStorageMode) const
    9292{
    9393    [m_metal setStorageMode:static_cast<MTLStorageMode>(newStorageMode)];
    9494}
    9595
    96 unsigned GPUTextureDescriptor::usage() const
     96unsigned GPULegacyTextureDescriptor::usage() const
    9797{
    9898    return [m_metal usage];
    9999}
    100100
    101 void GPUTextureDescriptor::setUsage(unsigned newUsage) const
     101void GPULegacyTextureDescriptor::setUsage(unsigned newUsage) const
    102102{
    103103    ASSERT(m_metal);
     
    105105}
    106106
    107 MTLTextureDescriptor *GPUTextureDescriptor::metal() const
     107MTLTextureDescriptor *GPULegacyTextureDescriptor::metal() const
    108108{
    109109    return m_metal.get();
  • trunk/Source/WebCore/platform/graphics/metal/GPULegacyTextureMetal.mm

    r237367 r237368  
    2525
    2626#import "config.h"
    27 #import "GPUTexture.h"
     27#import "GPULegacyTexture.h"
    2828
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUDevice.h"
    32 #import "GPUDrawable.h"
    33 #import "GPUTextureDescriptor.h"
     31#import "GPULegacyDevice.h"
     32#import "GPULegacyDrawable.h"
     33#import "GPULegacyTextureDescriptor.h"
    3434#import "Logging.h"
    3535#import <Metal/Metal.h>
     
    3737namespace WebCore {
    3838
    39 GPUTexture::GPUTexture(const GPUDevice& device, const GPUTextureDescriptor& descriptor)
     39GPULegacyTexture::GPULegacyTexture(const GPULegacyDevice& device, const GPULegacyTextureDescriptor& descriptor)
    4040{
    4141    LOG(WebMetal, "GPUTexture::GPUTexture()");
     
    4747}
    4848
    49 GPUTexture::GPUTexture(const GPUDrawable& other)
     49GPULegacyTexture::GPULegacyTexture(const GPULegacyDrawable& other)
    5050    : m_metal { other.texture() }
    5151{
     
    5353}
    5454
    55 unsigned GPUTexture::width() const
     55unsigned GPULegacyTexture::width() const
    5656{
    5757    return m_metal.get().width;
    5858}
    5959
    60 unsigned GPUTexture::height() const
     60unsigned GPULegacyTexture::height() const
    6161{
    6262    return m_metal.get().height;
    6363}
    6464
    65 MTLTexture *GPUTexture::metal() const
     65MTLTexture *GPULegacyTexture::metal() const
    6666{
    6767    return m_metal.get();
  • trunk/Tools/ChangeLog

    r237355 r237368  
     12018-10-23  Justin Fan  <justin_fan@apple.com>
     2
     3        [WebGPU] Rename old GPU* implementation files to GPULegacy* for WebMetal
     4        https://bugs.webkit.org/show_bug.cgi?id=190817
     5
     6        Reviewed by Dean Jackson.
     7
     8        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     9        * TestWebKitAPI/Tests/WebCore/mac/GPULegacyBuffer.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUBuffer.mm.
     10        (TestWebKitAPI::TEST_F):
     11        * TestWebKitAPI/Tests/WebCore/mac/GPULegacyCommandQueue.mm: Copied from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUFunction.mm.
     12        (TestWebKitAPI::TEST_F):
     13        * TestWebKitAPI/Tests/WebCore/mac/GPULegacyDevice.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm.
     14        (TestWebKitAPI::TEST_F):
     15        * TestWebKitAPI/Tests/WebCore/mac/GPULegacyFunction.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUFunction.mm.
     16        (TestWebKitAPI::TEST_F):
     17        * TestWebKitAPI/Tests/WebCore/mac/GPULegacyLibrary.mm: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPULibrary.mm.
     18        (TestWebKitAPI::TEST_F):
     19        * TestWebKitAPI/Tests/WebCore/mac/GPULegacyTest.h: Renamed from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUTest.h.
     20
    1212018-10-23  Chris Dumez  <cdumez@apple.com>
    222
  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r237118 r237368  
    125125                2EFF06D71D8AF34A0004BB30 /* WKWebViewCandidateTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EFF06D61D8AF34A0004BB30 /* WKWebViewCandidateTests.mm */; };
    126126                315118101DB1AE4000176304 /* ExtendedColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3151180F1DB1ADD500176304 /* ExtendedColor.cpp */; };
    127                 315231CA1EB3B3C700A22A16 /* GPUCommandQueue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 315231C91EB3B3C700A22A16 /* GPUCommandQueue.mm */; };
    128                 3162AE9C1E6F2FF5000E4DBC /* GPUDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3162AE9B1E6F2FCE000E4DBC /* GPUDevice.mm */; };
    129                 316BDBA11E70D71B00DE0D5A /* GPULibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBA01E70D6D800DE0D5A /* GPULibrary.mm */; };
    130                 316BDBA41E70EF6800DE0D5A /* GPUFunction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBA31E70EF5D00DE0D5A /* GPUFunction.mm */; };
    131                 316BDBAC1E7207F100DE0D5A /* GPUBuffer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBAB1E7207F100DE0D5A /* GPUBuffer.mm */; };
     127                315231CA1EB3B3C700A22A16 /* GPULegacyCommandQueue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 315231C91EB3B3C700A22A16 /* GPULegacyCommandQueue.mm */; };
     128                3162AE9C1E6F2FF5000E4DBC /* GPULegacyDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3162AE9B1E6F2FCE000E4DBC /* GPULegacyDevice.mm */; };
     129                316BDBA11E70D71B00DE0D5A /* GPULegacyLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBA01E70D6D800DE0D5A /* GPULegacyLibrary.mm */; };
     130                316BDBA41E70EF6800DE0D5A /* GPULegacyFunction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBA31E70EF5D00DE0D5A /* GPULegacyFunction.mm */; };
     131                316BDBAC1E7207F100DE0D5A /* GPULegacyBuffer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBAB1E7207F100DE0D5A /* GPULegacyBuffer.mm */; };
    132132                33BE5AF9137B5AAE00705813 /* MouseMoveAfterCrash_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33BE5AF8137B5AAE00705813 /* MouseMoveAfterCrash_Bundle.cpp */; };
    133133                33DC8912141955FE00747EF7 /* simple-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 33DC890E1419539300747EF7 /* simple-iframe.html */; };
     
    13821382                2EFF06D61D8AF34A0004BB30 /* WKWebViewCandidateTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewCandidateTests.mm; sourceTree = "<group>"; };
    13831383                3151180F1DB1ADD500176304 /* ExtendedColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtendedColor.cpp; sourceTree = "<group>"; };
    1384                 315231C91EB3B3C700A22A16 /* GPUCommandQueue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUCommandQueue.mm; sourceTree = "<group>"; };
    1385                 3162AE9B1E6F2FCE000E4DBC /* GPUDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDevice.mm; sourceTree = "<group>"; };
    1386                 316BDBA01E70D6D800DE0D5A /* GPULibrary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULibrary.mm; sourceTree = "<group>"; };
    1387                 316BDBA21E70DEE500DE0D5A /* GPUTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUTest.h; sourceTree = "<group>"; };
    1388                 316BDBA31E70EF5D00DE0D5A /* GPUFunction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUFunction.mm; sourceTree = "<group>"; };
    1389                 316BDBAB1E7207F100DE0D5A /* GPUBuffer.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = GPUBuffer.mm; sourceTree = "<group>"; };
     1384                315231C91EB3B3C700A22A16 /* GPULegacyCommandQueue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyCommandQueue.mm; sourceTree = "<group>"; };
     1385                3162AE9B1E6F2FCE000E4DBC /* GPULegacyDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDevice.mm; sourceTree = "<group>"; };
     1386                316BDBA01E70D6D800DE0D5A /* GPULegacyLibrary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyLibrary.mm; sourceTree = "<group>"; };
     1387                316BDBA21E70DEE500DE0D5A /* GPULegacyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyTest.h; sourceTree = "<group>"; };
     1388                316BDBA31E70EF5D00DE0D5A /* GPULegacyFunction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyFunction.mm; sourceTree = "<group>"; };
     1389                316BDBAB1E7207F100DE0D5A /* GPULegacyBuffer.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = GPULegacyBuffer.mm; sourceTree = "<group>"; };
    13901390                333B9CE11277F23100FEFCE3 /* PreventEmptyUserAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreventEmptyUserAgent.cpp; sourceTree = "<group>"; };
    13911391                33BE5AF4137B5A6C00705813 /* MouseMoveAfterCrash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseMoveAfterCrash.cpp; sourceTree = "<group>"; };
     
    25062506                        isa = PBXGroup;
    25072507                        children = (
    2508                                 316BDBAB1E7207F100DE0D5A /* GPUBuffer.mm */,
    2509                                 315231C91EB3B3C700A22A16 /* GPUCommandQueue.mm */,
    2510                                 3162AE9B1E6F2FCE000E4DBC /* GPUDevice.mm */,
    2511                                 316BDBA31E70EF5D00DE0D5A /* GPUFunction.mm */,
    2512                                 316BDBA01E70D6D800DE0D5A /* GPULibrary.mm */,
    2513                                 316BDBA21E70DEE500DE0D5A /* GPUTest.h */,
     2508                                316BDBAB1E7207F100DE0D5A /* GPULegacyBuffer.mm */,
     2509                                315231C91EB3B3C700A22A16 /* GPULegacyCommandQueue.mm */,
     2510                                3162AE9B1E6F2FCE000E4DBC /* GPULegacyDevice.mm */,
     2511                                316BDBA31E70EF5D00DE0D5A /* GPULegacyFunction.mm */,
     2512                                316BDBA01E70D6D800DE0D5A /* GPULegacyLibrary.mm */,
     2513                                316BDBA21E70DEE500DE0D5A /* GPULegacyTest.h */,
    25142514                        );
    25152515                        path = mac;
     
    38503850                                07CE1CF31F06A7E000BF89F5 /* GetUserMediaNavigation.mm in Sources */,
    38513851                                07E499911F9E56DF002F1EF3 /* GetUserMediaReprompt.mm in Sources */,
    3852                                 316BDBAC1E7207F100DE0D5A /* GPUBuffer.mm in Sources */,
    3853                                 315231CA1EB3B3C700A22A16 /* GPUCommandQueue.mm in Sources */,
    3854                                 3162AE9C1E6F2FF5000E4DBC /* GPUDevice.mm in Sources */,
    3855                                 316BDBA41E70EF6800DE0D5A /* GPUFunction.mm in Sources */,
    3856                                 316BDBA11E70D71B00DE0D5A /* GPULibrary.mm in Sources */,
     3852                                316BDBAC1E7207F100DE0D5A /* GPULegacyBuffer.mm in Sources */,
     3853                                315231CA1EB3B3C700A22A16 /* GPULegacyCommandQueue.mm in Sources */,
     3854                                3162AE9C1E6F2FF5000E4DBC /* GPULegacyDevice.mm in Sources */,
     3855                                316BDBA41E70EF6800DE0D5A /* GPULegacyFunction.mm in Sources */,
     3856                                316BDBA11E70D71B00DE0D5A /* GPULegacyLibrary.mm in Sources */,
    38573857                                8E4A85371E1D1AB200F53B0F /* GridPosition.cpp in Sources */,
    38583858                                7CCE7EFA1A411AE600447C4C /* HitTestResultNodeHandle.cpp in Sources */,
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyBuffer.mm

    r237367 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #import "GPUTest.h"
     30#import "GPULegacyTest.h"
    3131#import <JavaScriptCore/ArrayBuffer.h>
    3232#import <JavaScriptCore/ArrayBufferView.h>
     
    3636#import <JavaScriptCore/TypedArrays.h>
    3737#import <Metal/Metal.h>
    38 #import <WebCore/GPUBuffer.h>
    39 #import <WebCore/GPUDevice.h>
     38#import <WebCore/GPULegacyBuffer.h>
     39#import <WebCore/GPULegacyDevice.h>
    4040
    4141using namespace WebCore;
     
    4343namespace TestWebKitAPI {
    4444
    45 TEST_F(GPU, BufferCreate)
     45TEST_F(GPULegacy, BufferCreate)
    4646{
    47     GPUDevice device;
     47    GPULegacyDevice device;
    4848
    4949    // Not all hardware supports Metal, so it is possible
     
    6060    memset(data, 1, bufferView->byteLength());
    6161
    62     GPUBuffer buffer { device, bufferView.get() };
     62    GPULegacyBuffer buffer { device, bufferView.get() };
    6363    EXPECT_EQ(1024U, buffer.length());
    6464
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyCommandQueue.mm

    r237367 r237368  
    2424 */
    2525
    26 
    2726#import "config.h"
    2827
    2928#if ENABLE(WEBMETAL)
    3029
    31 #import "GPUTest.h"
     30#import "GPULegacyTest.h"
    3231#import "PlatformUtilities.h"
    3332#import <Metal/Metal.h>
    34 #import <WebCore/GPUDevice.h>
    35 #import <WebCore/GPUFunction.h>
    36 #import <WebCore/GPULibrary.h>
     33#import <WebCore/GPULegacyCommandQueue.h>
     34#import <WebCore/GPULegacyDevice.h>
    3735
    3836using namespace WebCore;
     
    4038namespace TestWebKitAPI {
    4139
    42 TEST_F(GPU, FunctionAccessByName)
     40TEST_F(GPULegacy, CommandQueueCreate)
    4341{
    44     GPUDevice device;
     42    GPULegacyDevice device;
    4543
    4644    // Not all hardware supports Metal, so it is possible
     
    5048        return;
    5149
    52     EXPECT_NOT_NULL(device.metal());
     50    GPULegacyCommandQueue commandQueue { device };
     51    EXPECT_WK_STREQ("", commandQueue.label());
    5352
    54     GPULibrary library { device, librarySourceCode() };
     53    EXPECT_NOT_NULL(commandQueue.metal());
    5554
    56     GPUFunction vertexFunction { library, "vertex_main"_s };
    57     EXPECT_NOT_NULL(vertexFunction.metal());
    58     EXPECT_WK_STREQ("vertex_main", vertexFunction.name());
     55    // If you haven't set a label, we just use the prefix.
     56    EXPECT_STREQ("com.apple.WebKit", commandQueue.metal().label.UTF8String);
    5957
    60     GPUFunction fragmentFunction { library, "fragment_main"_s };
    61     EXPECT_NOT_NULL(fragmentFunction.metal());
    62     EXPECT_WK_STREQ("fragment_main", fragmentFunction.name());
     58    commandQueue.setLabel("this.is.a.test"_s);
    6359
    64     GPUFunction nonexistentFunction { library, "name_that_is_not_in_library"_s };
    65     EXPECT_NULL(nonexistentFunction.metal());
     60    // The WebKit API doesn't prefix.
     61    EXPECT_WK_STREQ("this.is.a.test", commandQueue.label());
     62
     63    // But the underlying Metal object label will have one.
     64    EXPECT_STREQ("com.apple.WebKit.this.is.a.test", commandQueue.metal().label.UTF8String);
    6665}
    6766
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyDevice.mm

    r237367 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #import "GPUTest.h"
     30#import "GPULegacyTest.h"
    3131#import <Metal/Metal.h>
    32 #import <WebCore/GPUDevice.h>
     32#import <WebCore/GPULegacyDevice.h>
    3333
    3434using namespace WebCore;
     
    3636namespace TestWebKitAPI {
    3737
    38 TEST_F(GPU, DeviceCreate)
     38TEST_F(GPULegacy, DeviceCreate)
    3939{
    40     GPUDevice device;
     40    GPULegacyDevice device;
    4141
    4242    // Not all hardware supports Metal, so it is possible
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyFunction.mm

    r237367 r237368  
    2929#if ENABLE(WEBMETAL)
    3030
    31 #import "GPUTest.h"
     31#import "GPULegacyTest.h"
    3232#import "PlatformUtilities.h"
    3333#import <Metal/Metal.h>
    34 #import <WebCore/GPUDevice.h>
    35 #import <WebCore/GPUFunction.h>
    36 #import <WebCore/GPULibrary.h>
     34#import <WebCore/GPULegacyDevice.h>
     35#import <WebCore/GPULegacyFunction.h>
     36#import <WebCore/GPULegacyLibrary.h>
    3737
    3838using namespace WebCore;
     
    4040namespace TestWebKitAPI {
    4141
    42 TEST_F(GPU, FunctionAccessByName)
     42TEST_F(GPULegacy, FunctionAccessByName)
    4343{
    44     GPUDevice device;
     44    GPULegacyDevice device;
    4545
    4646    // Not all hardware supports Metal, so it is possible
     
    5252    EXPECT_NOT_NULL(device.metal());
    5353
    54     GPULibrary library { device, librarySourceCode() };
     54    GPULegacyLibrary library { device, librarySourceCode() };
    5555
    56     GPUFunction vertexFunction { library, "vertex_main"_s };
     56    GPULegacyFunction vertexFunction { library, "vertex_main"_s };
    5757    EXPECT_NOT_NULL(vertexFunction.metal());
    5858    EXPECT_WK_STREQ("vertex_main", vertexFunction.name());
    5959
    60     GPUFunction fragmentFunction { library, "fragment_main"_s };
     60    GPULegacyFunction fragmentFunction { library, "fragment_main"_s };
    6161    EXPECT_NOT_NULL(fragmentFunction.metal());
    6262    EXPECT_WK_STREQ("fragment_main", fragmentFunction.name());
    6363
    64     GPUFunction nonexistentFunction { library, "name_that_is_not_in_library"_s };
     64    GPULegacyFunction nonexistentFunction { library, "name_that_is_not_in_library"_s };
    6565    EXPECT_NULL(nonexistentFunction.metal());
    6666}
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyLibrary.mm

    r237367 r237368  
    2828#if ENABLE(WEBMETAL)
    2929
    30 #import "GPUTest.h"
     30#import "GPULegacyTest.h"
    3131#import "PlatformUtilities.h"
    3232#import <Metal/Metal.h>
    33 #import <WebCore/GPUDevice.h>
    34 #import <WebCore/GPULibrary.h>
     33#import <WebCore/GPULegacyDevice.h>
     34#import <WebCore/GPULegacyLibrary.h>
    3535
    3636using namespace WebCore;
     
    3838namespace TestWebKitAPI {
    3939
    40 TEST_F(GPU, LibraryCreate)
     40TEST_F(GPULegacy, LibraryCreate)
    4141{
    42     GPUDevice device;
     42    GPULegacyDevice device;
    4343
    4444    // Not all hardware supports Metal, so it is possible
     
    5050    EXPECT_NOT_NULL(device.metal());
    5151
    52     GPULibrary library { device, librarySourceCode() };
     52    GPULegacyLibrary library { device, librarySourceCode() };
    5353    EXPECT_NOT_NULL(library.metal());
    5454}
    5555
    56 TEST_F(GPU, LibrarySetLabel)
     56TEST_F(GPULegacy, LibrarySetLabel)
    5757{
    58     GPUDevice device;
     58    GPULegacyDevice device;
    5959    if (!device)
    6060        return;
    6161
    62     GPULibrary library { device, librarySourceCode() };
     62    GPULegacyLibrary library { device, librarySourceCode() };
    6363    EXPECT_NOT_NULL(library.metal());
    6464
     
    6767}
    6868
    69 TEST_F(GPU, LibraryFunctionNames)
     69TEST_F(GPULegacy, LibraryFunctionNames)
    7070{
    71     GPUDevice device;
     71    GPULegacyDevice device;
    7272    if (!device)
    7373        return;
    7474
    75     GPULibrary library { device, librarySourceCode() };
     75    GPULegacyLibrary library { device, librarySourceCode() };
    7676    EXPECT_NOT_NULL(library.metal());
    7777
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyTest.h

    r237367 r237368  
    3232namespace TestWebKitAPI {
    3333
    34 class GPU : public testing::Test {
     34class GPULegacy : public testing::Test {
    3535public:
    3636    void SetUp() final
Note: See TracChangeset for help on using the changeset viewer.