[WebGPU] Rename old GPU* implementation files to GPULegacy* for WebMetal
authorjustin_fan@apple.com <justin_fan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Oct 2018 22:05:27 +0000 (22:05 +0000)
committerjustin_fan@apple.com <justin_fan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Oct 2018 22:05:27 +0000 (22:05 +0000)
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.

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

128 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Sources.txt
Source/WebCore/SourcesCocoa.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/html/canvas/WebMetalBuffer.cpp
Source/WebCore/html/canvas/WebMetalBuffer.h
Source/WebCore/html/canvas/WebMetalCommandBuffer.cpp
Source/WebCore/html/canvas/WebMetalCommandBuffer.h
Source/WebCore/html/canvas/WebMetalCommandQueue.cpp
Source/WebCore/html/canvas/WebMetalCommandQueue.h
Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.cpp
Source/WebCore/html/canvas/WebMetalComputeCommandEncoder.h
Source/WebCore/html/canvas/WebMetalComputePipelineState.cpp
Source/WebCore/html/canvas/WebMetalComputePipelineState.h
Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.cpp
Source/WebCore/html/canvas/WebMetalDepthStencilDescriptor.h
Source/WebCore/html/canvas/WebMetalDepthStencilState.cpp
Source/WebCore/html/canvas/WebMetalDepthStencilState.h
Source/WebCore/html/canvas/WebMetalDrawable.cpp
Source/WebCore/html/canvas/WebMetalDrawable.h
Source/WebCore/html/canvas/WebMetalEnums.cpp
Source/WebCore/html/canvas/WebMetalEnums.h
Source/WebCore/html/canvas/WebMetalFunction.cpp
Source/WebCore/html/canvas/WebMetalFunction.h
Source/WebCore/html/canvas/WebMetalLibrary.cpp
Source/WebCore/html/canvas/WebMetalLibrary.h
Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.cpp
Source/WebCore/html/canvas/WebMetalRenderCommandEncoder.h
Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.cpp
Source/WebCore/html/canvas/WebMetalRenderPassAttachmentDescriptor.h
Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.cpp
Source/WebCore/html/canvas/WebMetalRenderPassColorAttachmentDescriptor.h
Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.cpp
Source/WebCore/html/canvas/WebMetalRenderPassDepthAttachmentDescriptor.h
Source/WebCore/html/canvas/WebMetalRenderPassDescriptor.h
Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.cpp
Source/WebCore/html/canvas/WebMetalRenderPipelineColorAttachmentDescriptor.h
Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.cpp
Source/WebCore/html/canvas/WebMetalRenderPipelineDescriptor.h
Source/WebCore/html/canvas/WebMetalRenderPipelineState.cpp
Source/WebCore/html/canvas/WebMetalRenderPipelineState.h
Source/WebCore/html/canvas/WebMetalRenderingContext.cpp
Source/WebCore/html/canvas/WebMetalRenderingContext.h
Source/WebCore/html/canvas/WebMetalTexture.cpp
Source/WebCore/html/canvas/WebMetalTexture.h
Source/WebCore/html/canvas/WebMetalTextureDescriptor.h
Source/WebCore/platform/graphics/cocoa/WebMetalLayer.h
Source/WebCore/platform/graphics/cocoa/WebMetalLayer.mm
Source/WebCore/platform/graphics/gpu/GPULegacyBuffer.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUBuffer.cpp with 93% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyBuffer.h [moved from Source/WebCore/platform/graphics/gpu/GPUBuffer.h with 91% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyCommandBuffer.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.cpp with 94% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyCommandBuffer.h [moved from Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.h with 86% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyCommandQueue.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUDepthStencilState.cpp with 90% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyCommandQueue.h [moved from Source/WebCore/platform/graphics/gpu/GPUCommandQueue.h with 91% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyComputeCommandEncoder.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUComputeCommandEncoder.cpp with 88% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyComputeCommandEncoder.h [moved from Source/WebCore/platform/graphics/gpu/GPUComputeCommandEncoder.h with 77% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyComputePipelineState.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUComputePipelineState.cpp with 88% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyComputePipelineState.h [moved from Source/WebCore/platform/graphics/gpu/GPUComputePipelineState.h with 86% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilDescriptor.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUDepthStencilDescriptor.cpp with 93% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilDescriptor.h [moved from Source/WebCore/platform/graphics/gpu/GPUDepthStencilDescriptor.h with 86% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilState.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilState.h [moved from Source/WebCore/platform/graphics/gpu/GPUDepthStencilState.h with 86% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyDevice.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUDevice.cpp with 92% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyDevice.h [moved from Source/WebCore/platform/graphics/gpu/GPUDevice.h with 95% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyDrawable.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUDrawable.cpp with 91% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyDrawable.h [moved from Source/WebCore/platform/graphics/gpu/GPUDrawable.h with 93% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyEnums.h [moved from Source/WebCore/platform/graphics/gpu/GPUEnums.h with 97% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyFunction.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/gpu/GPULegacyFunction.h [moved from Source/WebCore/platform/graphics/gpu/GPUFunction.h with 90% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyLibrary.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUFunction.cpp with 91% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyLibrary.h [moved from Source/WebCore/platform/graphics/gpu/GPULibrary.h with 91% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderCommandEncoder.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderCommandEncoder.h [moved from Source/WebCore/platform/graphics/gpu/GPURenderCommandEncoder.h with 71% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassAttachmentDescriptor.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassAttachmentDescriptor.h [moved from Source/WebCore/platform/graphics/gpu/GPURenderPassAttachmentDescriptor.h with 87% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassColorAttachmentDescriptor.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassColorAttachmentDescriptor.h [moved from Source/WebCore/platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.h with 84% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassDepthAttachmentDescriptor.cpp [moved from Source/WebCore/platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.cpp with 91% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassDepthAttachmentDescriptor.h [moved from Source/WebCore/platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.h with 84% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassDescriptor.cpp [moved from Source/WebCore/platform/graphics/gpu/GPURenderPassDescriptor.cpp with 90% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassDescriptor.h [moved from Source/WebCore/platform/graphics/gpu/GPURenderPassDescriptor.h with 81% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineColorAttachmentDescriptor.h [moved from Source/WebCore/platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.h with 89% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineDescriptor.cpp [moved from Source/WebCore/platform/graphics/gpu/GPURenderPipelineDescriptor.cpp with 92% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineDescriptor.h [moved from Source/WebCore/platform/graphics/gpu/GPURenderPipelineDescriptor.h with 81% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineState.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineState.h [moved from Source/WebCore/platform/graphics/gpu/GPURenderPipelineState.h with 85% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacySize.h [moved from Source/WebCore/platform/graphics/gpu/GPUSize.h with 98% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyTexture.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUCommandQueue.cpp with 91% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyTexture.h [moved from Source/WebCore/platform/graphics/gpu/GPUTexture.h with 86% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyTextureDescriptor.cpp [moved from Source/WebCore/platform/graphics/gpu/GPUTextureDescriptor.cpp with 93% similarity]
Source/WebCore/platform/graphics/gpu/GPULegacyTextureDescriptor.h [moved from Source/WebCore/platform/graphics/gpu/GPUTextureDescriptor.h with 92% similarity]
Source/WebCore/platform/graphics/gpu/GPULibrary.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/GPURenderCommandEncoder.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/GPURenderPipelineState.cpp [deleted file]
Source/WebCore/platform/graphics/gpu/GPUTexture.cpp [deleted file]
Source/WebCore/platform/graphics/metal/GPULegacyBufferMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUBufferMetal.mm with 94% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyCommandBufferMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUCommandBufferMetal.mm with 85% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyCommandQueueMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm with 87% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyComputeCommandEncoderMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUComputeCommandEncoderMetal.mm with 70% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyComputePipelineStateMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUComputePipelineStateMetal.mm with 83% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyDepthStencilDescriptorMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUDepthStencilDescriptorMetal.mm with 77% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyDepthStencilStateMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUDepthStencilStateMetal.mm with 81% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyDeviceMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUDeviceMetal.mm with 83% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyDrawableMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUDrawableMetal.mm with 82% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyFunctionMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUFunctionMetal.mm with 85% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyLibraryMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPULibraryMetal.mm with 86% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyRenderCommandEncoderMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPURenderCommandEncoderMetal.mm with 67% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyRenderPassAttachmentDescriptorMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPURenderPassAttachmentDescriptorMetal.mm with 70% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyRenderPassColorAttachmentDescriptorMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPURenderPassColorAttachmentDescriptorMetal.mm with 74% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPURenderPassDepthAttachmentDescriptorMetal.mm with 74% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyRenderPassDescriptorMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPURenderPassDescriptorMetal.mm with 79% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPURenderPipelineColorAttachmentDescriptorMetal.mm with 73% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyRenderPipelineDescriptorMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPURenderPipelineDescriptorMetal.mm with 71% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyRenderPipelineStateMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPURenderPipelineStateMetal.mm with 79% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyTextureDescriptorMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUTextureDescriptorMetal.mm with 70% similarity]
Source/WebCore/platform/graphics/metal/GPULegacyTextureMetal.mm [moved from Source/WebCore/platform/graphics/metal/GPUTextureMetal.mm with 81% similarity]
Tools/ChangeLog
Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyBuffer.mm [moved from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUBuffer.mm with 92% similarity]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyCommandQueue.mm [new file with mode: 0644]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyDevice.mm [moved from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm with 93% similarity]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyFunction.mm [moved from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUFunction.mm with 80% similarity]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyLibrary.mm [moved from Tools/TestWebKitAPI/Tests/WebCore/mac/GPULibrary.mm with 82% similarity]
Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyTest.h [moved from Tools/TestWebKitAPI/Tests/WebCore/mac/GPUTest.h with 98% similarity]

index 2859121..9d4fa68 100644 (file)
@@ -1,3 +1,14 @@
+2018-10-23  Justin Fan  <justin_fan@apple.com>
+
+        [WebGPU] Rename old GPU* implementation files to GPULegacy* for WebMetal
+        https://bugs.webkit.org/show_bug.cgi?id=190817
+
+        Reviewed by Dean Jackson.
+
+        No new tests. No change in behavior.
+
+        * [Large list of refactored classes and renamed files]: GPU* is now GPULegacy*
+
 2018-10-23  Ryan Haddad  <ryanhaddad@apple.com>
 
         Unreviewed, rolling out r237261.
index 7994eb6..aeb662e 100644 (file)
@@ -1718,27 +1718,27 @@ platform/graphics/filters/SourceAlpha.cpp
 platform/graphics/filters/SourceGraphic.cpp
 platform/graphics/filters/SpotLightSource.cpp
 
-platform/graphics/gpu/GPUBuffer.cpp
-platform/graphics/gpu/GPUCommandBuffer.cpp
-platform/graphics/gpu/GPUCommandQueue.cpp
-platform/graphics/gpu/GPUComputeCommandEncoder.cpp
-platform/graphics/gpu/GPUComputePipelineState.cpp
-platform/graphics/gpu/GPUDepthStencilDescriptor.cpp
-platform/graphics/gpu/GPUDepthStencilState.cpp
-platform/graphics/gpu/GPUDevice.cpp
-platform/graphics/gpu/GPUDrawable.cpp
-platform/graphics/gpu/GPUFunction.cpp
-platform/graphics/gpu/GPULibrary.cpp
-platform/graphics/gpu/GPURenderCommandEncoder.cpp
-platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp
-platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp
-platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.cpp
-platform/graphics/gpu/GPURenderPassDescriptor.cpp
-platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp
-platform/graphics/gpu/GPURenderPipelineDescriptor.cpp
-platform/graphics/gpu/GPURenderPipelineState.cpp
-platform/graphics/gpu/GPUTexture.cpp
-platform/graphics/gpu/GPUTextureDescriptor.cpp
+platform/graphics/gpu/GPULegacyBuffer.cpp
+platform/graphics/gpu/GPULegacyCommandBuffer.cpp
+platform/graphics/gpu/GPULegacyCommandQueue.cpp
+platform/graphics/gpu/GPULegacyComputeCommandEncoder.cpp
+platform/graphics/gpu/GPULegacyComputePipelineState.cpp
+platform/graphics/gpu/GPULegacyDepthStencilDescriptor.cpp
+platform/graphics/gpu/GPULegacyDepthStencilState.cpp
+platform/graphics/gpu/GPULegacyDevice.cpp
+platform/graphics/gpu/GPULegacyDrawable.cpp
+platform/graphics/gpu/GPULegacyFunction.cpp
+platform/graphics/gpu/GPULegacyLibrary.cpp
+platform/graphics/gpu/GPULegacyRenderCommandEncoder.cpp
+platform/graphics/gpu/GPULegacyRenderPassAttachmentDescriptor.cpp
+platform/graphics/gpu/GPULegacyRenderPassColorAttachmentDescriptor.cpp
+platform/graphics/gpu/GPULegacyRenderPassDepthAttachmentDescriptor.cpp
+platform/graphics/gpu/GPULegacyRenderPassDescriptor.cpp
+platform/graphics/gpu/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp
+platform/graphics/gpu/GPULegacyRenderPipelineDescriptor.cpp
+platform/graphics/gpu/GPULegacyRenderPipelineState.cpp
+platform/graphics/gpu/GPULegacyTexture.cpp
+platform/graphics/gpu/GPULegacyTextureDescriptor.cpp
 
 platform/graphics/iso/ISOBox.cpp
 platform/graphics/iso/ISOOriginalFormatBox.cpp
index 84555a6..94ff156 100644 (file)
@@ -345,27 +345,27 @@ platform/graphics/mac/SimpleFontDataCoreText.cpp
 platform/graphics/mac/WebLayer.mm
 platform/graphics/mac/WebKitNSImageExtras.mm
 
-platform/graphics/metal/GPUBufferMetal.mm
-platform/graphics/metal/GPUCommandBufferMetal.mm
-platform/graphics/metal/GPUCommandQueueMetal.mm
-platform/graphics/metal/GPUComputeCommandEncoderMetal.mm
-platform/graphics/metal/GPUComputePipelineStateMetal.mm
-platform/graphics/metal/GPUDepthStencilDescriptorMetal.mm
-platform/graphics/metal/GPUDepthStencilStateMetal.mm
-platform/graphics/metal/GPUDeviceMetal.mm
-platform/graphics/metal/GPUDrawableMetal.mm
-platform/graphics/metal/GPUFunctionMetal.mm
-platform/graphics/metal/GPULibraryMetal.mm
-platform/graphics/metal/GPURenderCommandEncoderMetal.mm
-platform/graphics/metal/GPURenderPassAttachmentDescriptorMetal.mm
-platform/graphics/metal/GPURenderPassColorAttachmentDescriptorMetal.mm
-platform/graphics/metal/GPURenderPassDepthAttachmentDescriptorMetal.mm
-platform/graphics/metal/GPURenderPassDescriptorMetal.mm
-platform/graphics/metal/GPURenderPipelineColorAttachmentDescriptorMetal.mm
-platform/graphics/metal/GPURenderPipelineDescriptorMetal.mm
-platform/graphics/metal/GPURenderPipelineStateMetal.mm
-platform/graphics/metal/GPUTextureDescriptorMetal.mm
-platform/graphics/metal/GPUTextureMetal.mm
+platform/graphics/metal/GPULegacyBufferMetal.mm
+platform/graphics/metal/GPULegacyCommandBufferMetal.mm
+platform/graphics/metal/GPULegacyCommandQueueMetal.mm
+platform/graphics/metal/GPULegacyComputeCommandEncoderMetal.mm
+platform/graphics/metal/GPULegacyComputePipelineStateMetal.mm
+platform/graphics/metal/GPULegacyDepthStencilDescriptorMetal.mm
+platform/graphics/metal/GPULegacyDepthStencilStateMetal.mm
+platform/graphics/metal/GPULegacyDeviceMetal.mm
+platform/graphics/metal/GPULegacyDrawableMetal.mm
+platform/graphics/metal/GPULegacyFunctionMetal.mm
+platform/graphics/metal/GPULegacyLibraryMetal.mm
+platform/graphics/metal/GPULegacyRenderCommandEncoderMetal.mm
+platform/graphics/metal/GPULegacyRenderPassAttachmentDescriptorMetal.mm
+platform/graphics/metal/GPULegacyRenderPassColorAttachmentDescriptorMetal.mm
+platform/graphics/metal/GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm
+platform/graphics/metal/GPULegacyRenderPassDescriptorMetal.mm
+platform/graphics/metal/GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm
+platform/graphics/metal/GPULegacyRenderPipelineDescriptorMetal.mm
+platform/graphics/metal/GPULegacyRenderPipelineStateMetal.mm
+platform/graphics/metal/GPULegacyTextureDescriptorMetal.mm
+platform/graphics/metal/GPULegacyTextureMetal.mm
 
 platform/graphics/opengl/Extensions3DOpenGL.cpp
 platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
index a41106f..6c2d71e 100644 (file)
                314877E61FAAB02500C05759 /* JSOffscreenCanvas.h in Headers */ = {isa = PBXBuildFile; fileRef = 314877E41FAAB02200C05759 /* JSOffscreenCanvas.h */; };
                314BE3A11B30F6B700141982 /* CSSNamedImageValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A01B30F6B700141982 /* CSSNamedImageValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
                314BE3A71B3103FB00141982 /* NamedImageGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */; };
-               316BDB861E6E0A2700DE0D5A /* GPUDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB851E6E0A2100DE0D5A /* GPUDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               316BDB861E6E0A2700DE0D5A /* GPULegacyDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB851E6E0A2100DE0D5A /* GPULegacyDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
                316BDB8C1E6E153000DE0D5A /* WebMetalLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */; };
-               316BDB951E70C89700DE0D5A /* GPUFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB931E70C89700DE0D5A /* GPUFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               316BDB9B1E70CBBF00DE0D5A /* GPULibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB991E70CBBF00DE0D5A /* GPULibrary.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               316BDBAA1E71FA9300DE0D5A /* GPUBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBA81E71FA9300DE0D5A /* GPUBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               316BDBB21E7354BB00DE0D5A /* GPUTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBB01E7354BB00DE0D5A /* GPUTexture.h */; };
-               316BDBB81E7357CB00DE0D5A /* GPUTextureDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBB61E7357CB00DE0D5A /* GPUTextureDescriptor.h */; };
-               316BDBBC1E73880600DE0D5A /* GPUCommandQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBBA1E73880600DE0D5A /* GPUCommandQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               316BDBCD1E75F18400DE0D5A /* GPUDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBCB1E75F17600DE0D5A /* GPUDrawable.h */; };
-               316BDBCE1E75F18A00DE0D5A /* GPUCommandBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBC51E75EE2400DE0D5A /* GPUCommandBuffer.h */; };
-               316BDBD31E75F7B600DE0D5A /* GPURenderPassDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBD11E75F7AE00DE0D5A /* GPURenderPassDescriptor.h */; };
-               316BDBDB1E7612E200DE0D5A /* GPURenderPassColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBD91E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.h */; };
-               316BDBDF1E76137500DE0D5A /* GPURenderPassAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBDD1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.h */; };
-               316BDBE41E761F0500DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBE31E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h */; };
-               316BDBEB1E76244D00DE0D5A /* GPURenderCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBE91E76244400DE0D5A /* GPURenderCommandEncoder.h */; };
-               316BDBF01E76292000DE0D5A /* GPUDepthStencilState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBEF1E76291B00DE0D5A /* GPUDepthStencilState.h */; };
-               316BDBF71E762AD500DE0D5A /* GPUDepthStencilDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBF51E762ACD00DE0D5A /* GPUDepthStencilDescriptor.h */; };
-               316BDBFB1E762D0400DE0D5A /* GPUEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFA1E762D0400DE0D5A /* GPUEnums.h */; };
-               316BDC021E762F6400DE0D5A /* GPURenderPipelineDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFD1E762F5700DE0D5A /* GPURenderPipelineDescriptor.h */; };
-               316BDC031E762F6900DE0D5A /* GPURenderPipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFF1E762F5700DE0D5A /* GPURenderPipelineState.h */; };
-               316BDC0D1E7634D200DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDC091E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h */; };
+               316BDB951E70C89700DE0D5A /* GPULegacyFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB931E70C89700DE0D5A /* GPULegacyFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               316BDB9B1E70CBBF00DE0D5A /* GPULegacyLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDB991E70CBBF00DE0D5A /* GPULegacyLibrary.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               316BDBAA1E71FA9300DE0D5A /* GPULegacyBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBA81E71FA9300DE0D5A /* GPULegacyBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               316BDBB21E7354BB00DE0D5A /* GPULegacyTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBB01E7354BB00DE0D5A /* GPULegacyTexture.h */; };
+               316BDBB81E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBB61E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h */; };
+               316BDBBC1E73880600DE0D5A /* GPULegacyCommandQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBBA1E73880600DE0D5A /* GPULegacyCommandQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               316BDBCD1E75F18400DE0D5A /* GPULegacyDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBCB1E75F17600DE0D5A /* GPULegacyDrawable.h */; };
+               316BDBCE1E75F18A00DE0D5A /* GPULegacyCommandBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBC51E75EE2400DE0D5A /* GPULegacyCommandBuffer.h */; };
+               316BDBD31E75F7B600DE0D5A /* GPULegacyRenderPassDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBD11E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.h */; };
+               316BDBDB1E7612E200DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBD91E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h */; };
+               316BDBDF1E76137500DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBDD1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h */; };
+               316BDBE41E761F0500DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBE31E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h */; };
+               316BDBEB1E76244D00DE0D5A /* GPULegacyRenderCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBE91E76244400DE0D5A /* GPULegacyRenderCommandEncoder.h */; };
+               316BDBF01E76292000DE0D5A /* GPULegacyDepthStencilState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBEF1E76291B00DE0D5A /* GPULegacyDepthStencilState.h */; };
+               316BDBF71E762AD500DE0D5A /* GPULegacyDepthStencilDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBF51E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.h */; };
+               316BDBFB1E762D0400DE0D5A /* GPULegacyEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFA1E762D0400DE0D5A /* GPULegacyEnums.h */; };
+               316BDC021E762F6400DE0D5A /* GPULegacyRenderPipelineDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFD1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.h */; };
+               316BDC031E762F6900DE0D5A /* GPULegacyRenderPipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDBFF1E762F5700DE0D5A /* GPULegacyRenderPipelineState.h */; };
+               316BDC0D1E7634D200DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 316BDC091E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */; };
                316DCB201E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1A1E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h */; };
                316DCB221E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1C1E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h */; };
                316DCB4C1E7910A6001B5F87 /* JSRTCIceConnectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB461E7910A6001B5F87 /* JSRTCIceConnectionState.h */; };
                93A806171E03B51C008A1F26 /* LongRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A806131E03B51C008A1F26 /* LongRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93A8061E1E03B585008A1F26 /* JSDoubleRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A8061A1E03B585008A1F26 /* JSDoubleRange.h */; };
                93A806201E03B585008A1F26 /* JSLongRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A8061C1E03B585008A1F26 /* JSLongRange.h */; };
-               93A953B020EBD3C900A619F6 /* GPUComputePipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35EC1E8E23E40043E850 /* GPUComputePipelineState.h */; };
-               93A953B420EBD43200A619F6 /* GPUComputeCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35EA1E8E20D90043E850 /* GPUComputeCommandEncoder.h */; };
-               93A953B520EC9C3F00A619F6 /* GPUSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35F61E8E4D0E0043E850 /* GPUSize.h */; };
+               93A953B020EBD3C900A619F6 /* GPULegacyComputePipelineState.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35EC1E8E23E40043E850 /* GPULegacyComputePipelineState.h */; };
+               93A953B420EBD43200A619F6 /* GPULegacyComputeCommandEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35EA1E8E20D90043E850 /* GPULegacyComputeCommandEncoder.h */; };
+               93A953B520EC9C3F00A619F6 /* GPULegacySize.h in Headers */ = {isa = PBXBuildFile; fileRef = 381E35F61E8E4D0E0043E850 /* GPULegacySize.h */; };
                93B2D8160F9920D2006AE6B2 /* SuddenTermination.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B2D8150F9920D2006AE6B2 /* SuddenTermination.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93B6A0E60B0BCA5C00F5027A /* ContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93B70D6409EB0C7C009D8468 /* JSDOMBinding.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */; settings = {ATTRIBUTES = (Private, ); }; };
                314BE3A21B30F6D100141982 /* CSSNamedImageValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSNamedImageValue.cpp; sourceTree = "<group>"; };
                314BE3A41B3103FB00141982 /* NamedImageGeneratedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NamedImageGeneratedImage.cpp; sourceTree = "<group>"; };
                314BE3A51B3103FB00141982 /* NamedImageGeneratedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NamedImageGeneratedImage.h; sourceTree = "<group>"; };
-               316BDB841E6E0A2100DE0D5A /* GPUDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUDevice.cpp; sourceTree = "<group>"; };
-               316BDB851E6E0A2100DE0D5A /* GPUDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDevice.h; sourceTree = "<group>"; };
-               316BDB881E6E141C00DE0D5A /* GPUDeviceMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDeviceMetal.mm; sourceTree = "<group>"; };
+               316BDB841E6E0A2100DE0D5A /* GPULegacyDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDevice.cpp; sourceTree = "<group>"; };
+               316BDB851E6E0A2100DE0D5A /* GPULegacyDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyDevice.h; sourceTree = "<group>"; };
+               316BDB881E6E141C00DE0D5A /* GPULegacyDeviceMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDeviceMetal.mm; sourceTree = "<group>"; };
                316BDB8A1E6E153000DE0D5A /* WebMetalLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMetalLayer.h; sourceTree = "<group>"; };
-               316BDB921E70C89700DE0D5A /* GPUFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUFunction.cpp; sourceTree = "<group>"; };
-               316BDB931E70C89700DE0D5A /* GPUFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUFunction.h; sourceTree = "<group>"; };
-               316BDB961E70CA2400DE0D5A /* GPUFunctionMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUFunctionMetal.mm; sourceTree = "<group>"; };
-               316BDB981E70CBBF00DE0D5A /* GPULibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULibrary.cpp; sourceTree = "<group>"; };
-               316BDB991E70CBBF00DE0D5A /* GPULibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULibrary.h; sourceTree = "<group>"; };
-               316BDB9C1E70CD9000DE0D5A /* GPULibraryMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULibraryMetal.mm; sourceTree = "<group>"; };
-               316BDBA51E71FA6F00DE0D5A /* GPUBufferMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUBufferMetal.mm; sourceTree = "<group>"; };
-               316BDBA71E71FA9300DE0D5A /* GPUBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUBuffer.cpp; sourceTree = "<group>"; };
-               316BDBA81E71FA9300DE0D5A /* GPUBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUBuffer.h; sourceTree = "<group>"; };
-               316BDBAD1E73549C00DE0D5A /* GPUTextureMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUTextureMetal.mm; sourceTree = "<group>"; };
-               316BDBAF1E7354BB00DE0D5A /* GPUTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUTexture.cpp; sourceTree = "<group>"; };
-               316BDBB01E7354BB00DE0D5A /* GPUTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUTexture.h; sourceTree = "<group>"; };
-               316BDBB31E7357B000DE0D5A /* GPUTextureDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUTextureDescriptorMetal.mm; sourceTree = "<group>"; };
-               316BDBB51E7357CB00DE0D5A /* GPUTextureDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUTextureDescriptor.cpp; sourceTree = "<group>"; };
-               316BDBB61E7357CB00DE0D5A /* GPUTextureDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUTextureDescriptor.h; sourceTree = "<group>"; };
-               316BDBB91E73880600DE0D5A /* GPUCommandQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUCommandQueue.cpp; sourceTree = "<group>"; };
-               316BDBBA1E73880600DE0D5A /* GPUCommandQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUCommandQueue.h; sourceTree = "<group>"; };
-               316BDBBD1E73881300DE0D5A /* GPUCommandQueueMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUCommandQueueMetal.mm; sourceTree = "<group>"; };
-               316BDBC41E75EE2400DE0D5A /* GPUCommandBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUCommandBuffer.cpp; sourceTree = "<group>"; };
-               316BDBC51E75EE2400DE0D5A /* GPUCommandBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUCommandBuffer.h; sourceTree = "<group>"; };
-               316BDBC61E75EE3D00DE0D5A /* GPUCommandBufferMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUCommandBufferMetal.mm; sourceTree = "<group>"; };
-               316BDBC91E75F16200DE0D5A /* GPUDrawableMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDrawableMetal.mm; sourceTree = "<group>"; };
-               316BDBCA1E75F17600DE0D5A /* GPUDrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUDrawable.cpp; sourceTree = "<group>"; };
-               316BDBCB1E75F17600DE0D5A /* GPUDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDrawable.h; sourceTree = "<group>"; };
-               316BDBD01E75F7AE00DE0D5A /* GPURenderPassDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPassDescriptor.cpp; sourceTree = "<group>"; };
-               316BDBD11E75F7AE00DE0D5A /* GPURenderPassDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPassDescriptor.h; sourceTree = "<group>"; };
-               316BDBD41E75F7CA00DE0D5A /* GPURenderPassDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPassDescriptorMetal.mm; sourceTree = "<group>"; };
-               316BDBD61E7612C400DE0D5A /* GPURenderPassColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPassColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
-               316BDBD81E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPassColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               316BDBD91E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPassColorAttachmentDescriptor.h; sourceTree = "<group>"; };
-               316BDBDC1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPassAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               316BDBDD1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPassAttachmentDescriptor.h; sourceTree = "<group>"; };
-               316BDBE01E761CB500DE0D5A /* GPURenderPassAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPassAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
-               316BDBE21E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPassDepthAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               316BDBE31E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPassDepthAttachmentDescriptor.h; sourceTree = "<group>"; };
-               316BDBE61E761F2700DE0D5A /* GPURenderPassDepthAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPassDepthAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
-               316BDBE81E76244300DE0D5A /* GPURenderCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderCommandEncoder.cpp; sourceTree = "<group>"; };
-               316BDBE91E76244400DE0D5A /* GPURenderCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderCommandEncoder.h; sourceTree = "<group>"; };
-               316BDBEC1E76246B00DE0D5A /* GPURenderCommandEncoderMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderCommandEncoderMetal.mm; sourceTree = "<group>"; };
-               316BDBEE1E76291B00DE0D5A /* GPUDepthStencilState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUDepthStencilState.cpp; sourceTree = "<group>"; };
-               316BDBEF1E76291B00DE0D5A /* GPUDepthStencilState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDepthStencilState.h; sourceTree = "<group>"; };
-               316BDBF21E76293700DE0D5A /* GPUDepthStencilStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDepthStencilStateMetal.mm; sourceTree = "<group>"; };
-               316BDBF41E762ACD00DE0D5A /* GPUDepthStencilDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUDepthStencilDescriptor.cpp; sourceTree = "<group>"; };
-               316BDBF51E762ACD00DE0D5A /* GPUDepthStencilDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUDepthStencilDescriptor.h; sourceTree = "<group>"; };
-               316BDBF81E762BEF00DE0D5A /* GPUDepthStencilDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDepthStencilDescriptorMetal.mm; sourceTree = "<group>"; };
-               316BDBFA1E762D0400DE0D5A /* GPUEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUEnums.h; sourceTree = "<group>"; };
-               316BDBFC1E762F5700DE0D5A /* GPURenderPipelineDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPipelineDescriptor.cpp; sourceTree = "<group>"; };
-               316BDBFD1E762F5700DE0D5A /* GPURenderPipelineDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPipelineDescriptor.h; sourceTree = "<group>"; };
-               316BDBFE1E762F5700DE0D5A /* GPURenderPipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPipelineState.cpp; sourceTree = "<group>"; };
-               316BDBFF1E762F5700DE0D5A /* GPURenderPipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPipelineState.h; sourceTree = "<group>"; };
-               316BDC041E762F7E00DE0D5A /* GPURenderPipelineDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPipelineDescriptorMetal.mm; sourceTree = "<group>"; };
-               316BDC051E762F7E00DE0D5A /* GPURenderPipelineStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPipelineStateMetal.mm; sourceTree = "<group>"; };
-               316BDC081E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPURenderPipelineColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
-               316BDC091E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPipelineColorAttachmentDescriptor.h; sourceTree = "<group>"; };
-               316BDC0A1E76343600DE0D5A /* GPURenderPipelineColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPipelineColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
+               316BDB921E70C89700DE0D5A /* GPULegacyFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyFunction.cpp; sourceTree = "<group>"; };
+               316BDB931E70C89700DE0D5A /* GPULegacyFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyFunction.h; sourceTree = "<group>"; };
+               316BDB961E70CA2400DE0D5A /* GPULegacyFunctionMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyFunctionMetal.mm; sourceTree = "<group>"; };
+               316BDB981E70CBBF00DE0D5A /* GPULegacyLibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyLibrary.cpp; sourceTree = "<group>"; };
+               316BDB991E70CBBF00DE0D5A /* GPULegacyLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyLibrary.h; sourceTree = "<group>"; };
+               316BDB9C1E70CD9000DE0D5A /* GPULegacyLibraryMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyLibraryMetal.mm; sourceTree = "<group>"; };
+               316BDBA51E71FA6F00DE0D5A /* GPULegacyBufferMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyBufferMetal.mm; sourceTree = "<group>"; };
+               316BDBA71E71FA9300DE0D5A /* GPULegacyBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyBuffer.cpp; sourceTree = "<group>"; };
+               316BDBA81E71FA9300DE0D5A /* GPULegacyBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyBuffer.h; sourceTree = "<group>"; };
+               316BDBAF1E7354BB00DE0D5A /* GPULegacyTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyTexture.cpp; sourceTree = "<group>"; };
+               316BDBB01E7354BB00DE0D5A /* GPULegacyTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyTexture.h; sourceTree = "<group>"; };
+               316BDBB31E7357B000DE0D5A /* GPULegacyTextureDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyTextureDescriptorMetal.mm; sourceTree = "<group>"; };
+               316BDBB51E7357CB00DE0D5A /* GPULegacyTextureDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyTextureDescriptor.cpp; sourceTree = "<group>"; };
+               316BDBB61E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyTextureDescriptor.h; sourceTree = "<group>"; };
+               316BDBB91E73880600DE0D5A /* GPULegacyCommandQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyCommandQueue.cpp; sourceTree = "<group>"; };
+               316BDBBA1E73880600DE0D5A /* GPULegacyCommandQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyCommandQueue.h; sourceTree = "<group>"; };
+               316BDBBD1E73881300DE0D5A /* GPULegacyCommandQueueMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyCommandQueueMetal.mm; sourceTree = "<group>"; };
+               316BDBC41E75EE2400DE0D5A /* GPULegacyCommandBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyCommandBuffer.cpp; sourceTree = "<group>"; };
+               316BDBC51E75EE2400DE0D5A /* GPULegacyCommandBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyCommandBuffer.h; sourceTree = "<group>"; };
+               316BDBC61E75EE3D00DE0D5A /* GPULegacyCommandBufferMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyCommandBufferMetal.mm; sourceTree = "<group>"; };
+               316BDBC91E75F16200DE0D5A /* GPULegacyDrawableMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDrawableMetal.mm; sourceTree = "<group>"; };
+               316BDBCA1E75F17600DE0D5A /* GPULegacyDrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDrawable.cpp; sourceTree = "<group>"; };
+               316BDBCB1E75F17600DE0D5A /* GPULegacyDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyDrawable.h; sourceTree = "<group>"; };
+               316BDBD01E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassDescriptor.cpp; sourceTree = "<group>"; };
+               316BDBD11E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassDescriptor.h; sourceTree = "<group>"; };
+               316BDBD41E75F7CA00DE0D5A /* GPULegacyRenderPassDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassDescriptorMetal.mm; sourceTree = "<group>"; };
+               316BDBD61E7612C400DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
+               316BDBD81E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
+               316BDBD91E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassColorAttachmentDescriptor.h; sourceTree = "<group>"; };
+               316BDBDC1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassAttachmentDescriptor.cpp; sourceTree = "<group>"; };
+               316BDBDD1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassAttachmentDescriptor.h; sourceTree = "<group>"; };
+               316BDBE01E761CB500DE0D5A /* GPULegacyRenderPassAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
+               316BDBE21E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPassDepthAttachmentDescriptor.cpp; sourceTree = "<group>"; };
+               316BDBE31E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPassDepthAttachmentDescriptor.h; sourceTree = "<group>"; };
+               316BDBE61E761F2700DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
+               316BDBE81E76244300DE0D5A /* GPULegacyRenderCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderCommandEncoder.cpp; sourceTree = "<group>"; };
+               316BDBE91E76244400DE0D5A /* GPULegacyRenderCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderCommandEncoder.h; sourceTree = "<group>"; };
+               316BDBEC1E76246B00DE0D5A /* GPULegacyRenderCommandEncoderMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderCommandEncoderMetal.mm; sourceTree = "<group>"; };
+               316BDBEE1E76291B00DE0D5A /* GPULegacyDepthStencilState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDepthStencilState.cpp; sourceTree = "<group>"; };
+               316BDBEF1E76291B00DE0D5A /* GPULegacyDepthStencilState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyDepthStencilState.h; sourceTree = "<group>"; };
+               316BDBF21E76293700DE0D5A /* GPULegacyDepthStencilStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDepthStencilStateMetal.mm; sourceTree = "<group>"; };
+               316BDBF41E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyDepthStencilDescriptor.cpp; sourceTree = "<group>"; };
+               316BDBF51E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyDepthStencilDescriptor.h; sourceTree = "<group>"; };
+               316BDBF81E762BEF00DE0D5A /* GPULegacyDepthStencilDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDepthStencilDescriptorMetal.mm; sourceTree = "<group>"; };
+               316BDBFA1E762D0400DE0D5A /* GPULegacyEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyEnums.h; sourceTree = "<group>"; };
+               316BDBFC1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineDescriptor.cpp; sourceTree = "<group>"; };
+               316BDBFD1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineDescriptor.h; sourceTree = "<group>"; };
+               316BDBFE1E762F5700DE0D5A /* GPULegacyRenderPipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineState.cpp; sourceTree = "<group>"; };
+               316BDBFF1E762F5700DE0D5A /* GPULegacyRenderPipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineState.h; sourceTree = "<group>"; };
+               316BDC041E762F7E00DE0D5A /* GPULegacyRenderPipelineDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineDescriptorMetal.mm; sourceTree = "<group>"; };
+               316BDC051E762F7E00DE0D5A /* GPULegacyRenderPipelineStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineStateMetal.mm; sourceTree = "<group>"; };
+               316BDC081E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyRenderPipelineColorAttachmentDescriptor.cpp; sourceTree = "<group>"; };
+               316BDC091E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyRenderPipelineColorAttachmentDescriptor.h; sourceTree = "<group>"; };
+               316BDC0A1E76343600DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
                316DCB121E78BE43001B5F87 /* RTCOfferAnswerOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCOfferAnswerOptions.idl; sourceTree = "<group>"; };
                316DCB171E78C330001B5F87 /* RTCRtpTransceiverDirection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpTransceiverDirection.idl; sourceTree = "<group>"; };
                316DCB191E78CA55001B5F87 /* JSRTCOfferAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCOfferAnswerOptions.cpp; sourceTree = "<group>"; };
                381E35E61E8E1DB90043E850 /* WebGPUComputeCommandEncoder.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebGPUComputeCommandEncoder.idl; sourceTree = "<group>"; };
                381E35E71E8E1E0A0043E850 /* WebGPUComputeCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGPUComputeCommandEncoder.h; sourceTree = "<group>"; };
                381E35E81E8E1E160043E850 /* WebGPUComputeCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGPUComputeCommandEncoder.cpp; sourceTree = "<group>"; };
-               381E35E91E8E20AC0043E850 /* GPUComputeCommandEncoderMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUComputeCommandEncoderMetal.mm; sourceTree = "<group>"; };
-               381E35EA1E8E20D90043E850 /* GPUComputeCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUComputeCommandEncoder.h; sourceTree = "<group>"; };
-               381E35EB1E8E21990043E850 /* GPUComputeCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUComputeCommandEncoder.cpp; sourceTree = "<group>"; };
-               381E35EC1E8E23E40043E850 /* GPUComputePipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUComputePipelineState.h; sourceTree = "<group>"; };
-               381E35ED1E8E247A0043E850 /* GPUComputePipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPUComputePipelineState.cpp; sourceTree = "<group>"; };
-               381E35EE1E8E24CB0043E850 /* GPUComputePipelineStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUComputePipelineStateMetal.mm; sourceTree = "<group>"; };
+               381E35E91E8E20AC0043E850 /* GPULegacyComputeCommandEncoderMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyComputeCommandEncoderMetal.mm; sourceTree = "<group>"; };
+               381E35EA1E8E20D90043E850 /* GPULegacyComputeCommandEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyComputeCommandEncoder.h; sourceTree = "<group>"; };
+               381E35EB1E8E21990043E850 /* GPULegacyComputeCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyComputeCommandEncoder.cpp; sourceTree = "<group>"; };
+               381E35EC1E8E23E40043E850 /* GPULegacyComputePipelineState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyComputePipelineState.h; sourceTree = "<group>"; };
+               381E35ED1E8E247A0043E850 /* GPULegacyComputePipelineState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPULegacyComputePipelineState.cpp; sourceTree = "<group>"; };
+               381E35EE1E8E24CB0043E850 /* GPULegacyComputePipelineStateMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyComputePipelineStateMetal.mm; sourceTree = "<group>"; };
                381E35EF1E8E3D7F0043E850 /* WebGPUSize.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebGPUSize.idl; sourceTree = "<group>"; };
                381E35F51E8E4C420043E850 /* WebGPUSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGPUSize.h; sourceTree = "<group>"; };
-               381E35F61E8E4D0E0043E850 /* GPUSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUSize.h; sourceTree = "<group>"; };
+               381E35F61E8E4D0E0043E850 /* GPULegacySize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacySize.h; sourceTree = "<group>"; };
                387AE9581E8E92EF0000DE96 /* JSWebGPUSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGPUSize.cpp; sourceTree = "<group>"; };
                387AE9591E8E92EF0000DE96 /* JSWebGPUSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGPUSize.h; sourceTree = "<group>"; };
                38F23AAE1E8E83C400CE46F5 /* JSWebGPUComputeCommandEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGPUComputeCommandEncoder.cpp; sourceTree = "<group>"; };
                D045AD2121682474000A6E9B /* WebMetalBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalBuffer.cpp; sourceTree = "<group>"; };
                D045AD2221682474000A6E9B /* WebMetalCommandBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebMetalCommandBuffer.h; sourceTree = "<group>"; };
                D045AD2321682475000A6E9B /* WebMetalCommandQueue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMetalCommandQueue.cpp; sourceTree = "<group>"; };
+               D0573D42217EB81E00D1BE91 /* GPULegacyTextureMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyTextureMetal.mm; sourceTree = "<group>"; };
                D05CED270A40BB2C00C5AF38 /* FormatBlockCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FormatBlockCommand.cpp; sourceTree = "<group>"; };
                D05CED280A40BB2C00C5AF38 /* FormatBlockCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FormatBlockCommand.h; sourceTree = "<group>"; };
                D06C0D8D0CFD11460065F43F /* RemoveFormatCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoveFormatCommand.h; sourceTree = "<group>"; };
                498770C11242C50D002226BA /* gpu */ = {
                        isa = PBXGroup;
                        children = (
-                               316BDBA71E71FA9300DE0D5A /* GPUBuffer.cpp */,
-                               316BDBA81E71FA9300DE0D5A /* GPUBuffer.h */,
-                               316BDBC41E75EE2400DE0D5A /* GPUCommandBuffer.cpp */,
-                               316BDBC51E75EE2400DE0D5A /* GPUCommandBuffer.h */,
-                               316BDBB91E73880600DE0D5A /* GPUCommandQueue.cpp */,
-                               316BDBBA1E73880600DE0D5A /* GPUCommandQueue.h */,
-                               381E35EB1E8E21990043E850 /* GPUComputeCommandEncoder.cpp */,
-                               381E35EA1E8E20D90043E850 /* GPUComputeCommandEncoder.h */,
-                               381E35ED1E8E247A0043E850 /* GPUComputePipelineState.cpp */,
-                               381E35EC1E8E23E40043E850 /* GPUComputePipelineState.h */,
-                               316BDBF41E762ACD00DE0D5A /* GPUDepthStencilDescriptor.cpp */,
-                               316BDBF51E762ACD00DE0D5A /* GPUDepthStencilDescriptor.h */,
-                               316BDBEE1E76291B00DE0D5A /* GPUDepthStencilState.cpp */,
-                               316BDBEF1E76291B00DE0D5A /* GPUDepthStencilState.h */,
-                               316BDB841E6E0A2100DE0D5A /* GPUDevice.cpp */,
-                               316BDB851E6E0A2100DE0D5A /* GPUDevice.h */,
-                               316BDBCA1E75F17600DE0D5A /* GPUDrawable.cpp */,
-                               316BDBCB1E75F17600DE0D5A /* GPUDrawable.h */,
-                               316BDBFA1E762D0400DE0D5A /* GPUEnums.h */,
-                               316BDB921E70C89700DE0D5A /* GPUFunction.cpp */,
-                               316BDB931E70C89700DE0D5A /* GPUFunction.h */,
-                               316BDB981E70CBBF00DE0D5A /* GPULibrary.cpp */,
-                               316BDB991E70CBBF00DE0D5A /* GPULibrary.h */,
-                               316BDBE81E76244300DE0D5A /* GPURenderCommandEncoder.cpp */,
-                               316BDBE91E76244400DE0D5A /* GPURenderCommandEncoder.h */,
-                               316BDBDC1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.cpp */,
-                               316BDBDD1E76136C00DE0D5A /* GPURenderPassAttachmentDescriptor.h */,
-                               316BDBD81E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.cpp */,
-                               316BDBD91E7612DB00DE0D5A /* GPURenderPassColorAttachmentDescriptor.h */,
-                               316BDBE21E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.cpp */,
-                               316BDBE31E761EFF00DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h */,
-                               316BDBD01E75F7AE00DE0D5A /* GPURenderPassDescriptor.cpp */,
-                               316BDBD11E75F7AE00DE0D5A /* GPURenderPassDescriptor.h */,
-                               316BDC081E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.cpp */,
-                               316BDC091E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h */,
-                               316BDBFC1E762F5700DE0D5A /* GPURenderPipelineDescriptor.cpp */,
-                               316BDBFD1E762F5700DE0D5A /* GPURenderPipelineDescriptor.h */,
-                               316BDBFE1E762F5700DE0D5A /* GPURenderPipelineState.cpp */,
-                               316BDBFF1E762F5700DE0D5A /* GPURenderPipelineState.h */,
-                               381E35F61E8E4D0E0043E850 /* GPUSize.h */,
-                               316BDBAF1E7354BB00DE0D5A /* GPUTexture.cpp */,
-                               316BDBB01E7354BB00DE0D5A /* GPUTexture.h */,
-                               316BDBB51E7357CB00DE0D5A /* GPUTextureDescriptor.cpp */,
-                               316BDBB61E7357CB00DE0D5A /* GPUTextureDescriptor.h */,
+                               316BDBA71E71FA9300DE0D5A /* GPULegacyBuffer.cpp */,
+                               316BDBA81E71FA9300DE0D5A /* GPULegacyBuffer.h */,
+                               316BDBC41E75EE2400DE0D5A /* GPULegacyCommandBuffer.cpp */,
+                               316BDBC51E75EE2400DE0D5A /* GPULegacyCommandBuffer.h */,
+                               316BDBB91E73880600DE0D5A /* GPULegacyCommandQueue.cpp */,
+                               316BDBBA1E73880600DE0D5A /* GPULegacyCommandQueue.h */,
+                               381E35EB1E8E21990043E850 /* GPULegacyComputeCommandEncoder.cpp */,
+                               381E35EA1E8E20D90043E850 /* GPULegacyComputeCommandEncoder.h */,
+                               381E35ED1E8E247A0043E850 /* GPULegacyComputePipelineState.cpp */,
+                               381E35EC1E8E23E40043E850 /* GPULegacyComputePipelineState.h */,
+                               316BDBF41E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.cpp */,
+                               316BDBF51E762ACD00DE0D5A /* GPULegacyDepthStencilDescriptor.h */,
+                               316BDBEE1E76291B00DE0D5A /* GPULegacyDepthStencilState.cpp */,
+                               316BDBEF1E76291B00DE0D5A /* GPULegacyDepthStencilState.h */,
+                               316BDB841E6E0A2100DE0D5A /* GPULegacyDevice.cpp */,
+                               316BDB851E6E0A2100DE0D5A /* GPULegacyDevice.h */,
+                               316BDBCA1E75F17600DE0D5A /* GPULegacyDrawable.cpp */,
+                               316BDBCB1E75F17600DE0D5A /* GPULegacyDrawable.h */,
+                               316BDBFA1E762D0400DE0D5A /* GPULegacyEnums.h */,
+                               316BDB921E70C89700DE0D5A /* GPULegacyFunction.cpp */,
+                               316BDB931E70C89700DE0D5A /* GPULegacyFunction.h */,
+                               316BDB981E70CBBF00DE0D5A /* GPULegacyLibrary.cpp */,
+                               316BDB991E70CBBF00DE0D5A /* GPULegacyLibrary.h */,
+                               316BDBE81E76244300DE0D5A /* GPULegacyRenderCommandEncoder.cpp */,
+                               316BDBE91E76244400DE0D5A /* GPULegacyRenderCommandEncoder.h */,
+                               316BDBDC1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.cpp */,
+                               316BDBDD1E76136C00DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h */,
+                               316BDBD81E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.cpp */,
+                               316BDBD91E7612DB00DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h */,
+                               316BDBE21E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.cpp */,
+                               316BDBE31E761EFF00DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h */,
+                               316BDBD01E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.cpp */,
+                               316BDBD11E75F7AE00DE0D5A /* GPULegacyRenderPassDescriptor.h */,
+                               316BDC081E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.cpp */,
+                               316BDC091E76342700DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h */,
+                               316BDBFC1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.cpp */,
+                               316BDBFD1E762F5700DE0D5A /* GPULegacyRenderPipelineDescriptor.h */,
+                               316BDBFE1E762F5700DE0D5A /* GPULegacyRenderPipelineState.cpp */,
+                               316BDBFF1E762F5700DE0D5A /* GPULegacyRenderPipelineState.h */,
+                               381E35F61E8E4D0E0043E850 /* GPULegacySize.h */,
+                               316BDBAF1E7354BB00DE0D5A /* GPULegacyTexture.cpp */,
+                               316BDBB01E7354BB00DE0D5A /* GPULegacyTexture.h */,
+                               316BDBB51E7357CB00DE0D5A /* GPULegacyTextureDescriptor.cpp */,
+                               316BDBB61E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h */,
                                498770D71242C535002226BA /* Texture.cpp */,
                                498770D81242C535002226BA /* Texture.h */,
                                498770D91242C535002226BA /* TilingData.cpp */,
                9368C49120F9B57200434D61 /* metal */ = {
                        isa = PBXGroup;
                        children = (
-                               316BDBA51E71FA6F00DE0D5A /* GPUBufferMetal.mm */,
-                               316BDBC61E75EE3D00DE0D5A /* GPUCommandBufferMetal.mm */,
-                               316BDBBD1E73881300DE0D5A /* GPUCommandQueueMetal.mm */,
-                               381E35E91E8E20AC0043E850 /* GPUComputeCommandEncoderMetal.mm */,
-                               381E35EE1E8E24CB0043E850 /* GPUComputePipelineStateMetal.mm */,
-                               316BDBF81E762BEF00DE0D5A /* GPUDepthStencilDescriptorMetal.mm */,
-                               316BDBF21E76293700DE0D5A /* GPUDepthStencilStateMetal.mm */,
-                               316BDB881E6E141C00DE0D5A /* GPUDeviceMetal.mm */,
-                               316BDBC91E75F16200DE0D5A /* GPUDrawableMetal.mm */,
-                               316BDB961E70CA2400DE0D5A /* GPUFunctionMetal.mm */,
-                               316BDB9C1E70CD9000DE0D5A /* GPULibraryMetal.mm */,
-                               316BDBEC1E76246B00DE0D5A /* GPURenderCommandEncoderMetal.mm */,
-                               316BDBE01E761CB500DE0D5A /* GPURenderPassAttachmentDescriptorMetal.mm */,
-                               316BDBD61E7612C400DE0D5A /* GPURenderPassColorAttachmentDescriptorMetal.mm */,
-                               316BDBE61E761F2700DE0D5A /* GPURenderPassDepthAttachmentDescriptorMetal.mm */,
-                               316BDBD41E75F7CA00DE0D5A /* GPURenderPassDescriptorMetal.mm */,
-                               316BDC0A1E76343600DE0D5A /* GPURenderPipelineColorAttachmentDescriptorMetal.mm */,
-                               316BDC041E762F7E00DE0D5A /* GPURenderPipelineDescriptorMetal.mm */,
-                               316BDC051E762F7E00DE0D5A /* GPURenderPipelineStateMetal.mm */,
-                               316BDBB31E7357B000DE0D5A /* GPUTextureDescriptorMetal.mm */,
-                               316BDBAD1E73549C00DE0D5A /* GPUTextureMetal.mm */,
+                               316BDBA51E71FA6F00DE0D5A /* GPULegacyBufferMetal.mm */,
+                               316BDBC61E75EE3D00DE0D5A /* GPULegacyCommandBufferMetal.mm */,
+                               316BDBBD1E73881300DE0D5A /* GPULegacyCommandQueueMetal.mm */,
+                               381E35E91E8E20AC0043E850 /* GPULegacyComputeCommandEncoderMetal.mm */,
+                               381E35EE1E8E24CB0043E850 /* GPULegacyComputePipelineStateMetal.mm */,
+                               316BDBF81E762BEF00DE0D5A /* GPULegacyDepthStencilDescriptorMetal.mm */,
+                               316BDBF21E76293700DE0D5A /* GPULegacyDepthStencilStateMetal.mm */,
+                               316BDB881E6E141C00DE0D5A /* GPULegacyDeviceMetal.mm */,
+                               316BDBC91E75F16200DE0D5A /* GPULegacyDrawableMetal.mm */,
+                               316BDB961E70CA2400DE0D5A /* GPULegacyFunctionMetal.mm */,
+                               316BDB9C1E70CD9000DE0D5A /* GPULegacyLibraryMetal.mm */,
+                               316BDBEC1E76246B00DE0D5A /* GPULegacyRenderCommandEncoderMetal.mm */,
+                               316BDBE01E761CB500DE0D5A /* GPULegacyRenderPassAttachmentDescriptorMetal.mm */,
+                               316BDBD61E7612C400DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptorMetal.mm */,
+                               316BDBE61E761F2700DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptorMetal.mm */,
+                               316BDBD41E75F7CA00DE0D5A /* GPULegacyRenderPassDescriptorMetal.mm */,
+                               316BDC0A1E76343600DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptorMetal.mm */,
+                               316BDC041E762F7E00DE0D5A /* GPULegacyRenderPipelineDescriptorMetal.mm */,
+                               316BDC051E762F7E00DE0D5A /* GPULegacyRenderPipelineStateMetal.mm */,
+                               316BDBB31E7357B000DE0D5A /* GPULegacyTextureDescriptorMetal.mm */,
+                               D0573D42217EB81E00D1BE91 /* GPULegacyTextureMetal.mm */,
                        );
                        path = metal;
                        sourceTree = "<group>";
                                C5D4AA7A116BAFB60069CA93 /* GlyphMetricsMap.h in Headers */,
                                0873B86B136064EA00A522C2 /* GlyphPage.h in Headers */,
                                311518FC1E78C15F00EC514A /* GPUBasedCanvasRenderingContext.h in Headers */,
-                               316BDBAA1E71FA9300DE0D5A /* GPUBuffer.h in Headers */,
-                               316BDBCE1E75F18A00DE0D5A /* GPUCommandBuffer.h in Headers */,
-                               316BDBBC1E73880600DE0D5A /* GPUCommandQueue.h in Headers */,
-                               93A953B420EBD43200A619F6 /* GPUComputeCommandEncoder.h in Headers */,
-                               93A953B020EBD3C900A619F6 /* GPUComputePipelineState.h in Headers */,
-                               316BDBF71E762AD500DE0D5A /* GPUDepthStencilDescriptor.h in Headers */,
-                               316BDBF01E76292000DE0D5A /* GPUDepthStencilState.h in Headers */,
-                               316BDB861E6E0A2700DE0D5A /* GPUDevice.h in Headers */,
-                               316BDBCD1E75F18400DE0D5A /* GPUDrawable.h in Headers */,
-                               316BDBFB1E762D0400DE0D5A /* GPUEnums.h in Headers */,
-                               316BDB951E70C89700DE0D5A /* GPUFunction.h in Headers */,
-                               316BDB9B1E70CBBF00DE0D5A /* GPULibrary.h in Headers */,
-                               316BDBEB1E76244D00DE0D5A /* GPURenderCommandEncoder.h in Headers */,
-                               316BDBDF1E76137500DE0D5A /* GPURenderPassAttachmentDescriptor.h in Headers */,
-                               316BDBDB1E7612E200DE0D5A /* GPURenderPassColorAttachmentDescriptor.h in Headers */,
-                               316BDBE41E761F0500DE0D5A /* GPURenderPassDepthAttachmentDescriptor.h in Headers */,
-                               316BDBD31E75F7B600DE0D5A /* GPURenderPassDescriptor.h in Headers */,
-                               316BDC0D1E7634D200DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h in Headers */,
-                               316BDC021E762F6400DE0D5A /* GPURenderPipelineDescriptor.h in Headers */,
-                               316BDC031E762F6900DE0D5A /* GPURenderPipelineState.h in Headers */,
-                               93A953B520EC9C3F00A619F6 /* GPUSize.h in Headers */,
-                               316BDBB21E7354BB00DE0D5A /* GPUTexture.h in Headers */,
-                               316BDBB81E7357CB00DE0D5A /* GPUTextureDescriptor.h in Headers */,
+                               316BDBAA1E71FA9300DE0D5A /* GPULegacyBuffer.h in Headers */,
+                               316BDBCE1E75F18A00DE0D5A /* GPULegacyCommandBuffer.h in Headers */,
+                               316BDBBC1E73880600DE0D5A /* GPULegacyCommandQueue.h in Headers */,
+                               93A953B420EBD43200A619F6 /* GPULegacyComputeCommandEncoder.h in Headers */,
+                               93A953B020EBD3C900A619F6 /* GPULegacyComputePipelineState.h in Headers */,
+                               316BDBF71E762AD500DE0D5A /* GPULegacyDepthStencilDescriptor.h in Headers */,
+                               316BDBF01E76292000DE0D5A /* GPULegacyDepthStencilState.h in Headers */,
+                               316BDB861E6E0A2700DE0D5A /* GPULegacyDevice.h in Headers */,
+                               316BDBCD1E75F18400DE0D5A /* GPULegacyDrawable.h in Headers */,
+                               316BDBFB1E762D0400DE0D5A /* GPULegacyEnums.h in Headers */,
+                               316BDB951E70C89700DE0D5A /* GPULegacyFunction.h in Headers */,
+                               316BDB9B1E70CBBF00DE0D5A /* GPULegacyLibrary.h in Headers */,
+                               316BDBEB1E76244D00DE0D5A /* GPULegacyRenderCommandEncoder.h in Headers */,
+                               316BDBDF1E76137500DE0D5A /* GPULegacyRenderPassAttachmentDescriptor.h in Headers */,
+                               316BDBDB1E7612E200DE0D5A /* GPULegacyRenderPassColorAttachmentDescriptor.h in Headers */,
+                               316BDBE41E761F0500DE0D5A /* GPULegacyRenderPassDepthAttachmentDescriptor.h in Headers */,
+                               316BDBD31E75F7B600DE0D5A /* GPULegacyRenderPassDescriptor.h in Headers */,
+                               316BDC0D1E7634D200DE0D5A /* GPULegacyRenderPipelineColorAttachmentDescriptor.h in Headers */,
+                               316BDC021E762F6400DE0D5A /* GPULegacyRenderPipelineDescriptor.h in Headers */,
+                               316BDC031E762F6900DE0D5A /* GPULegacyRenderPipelineState.h in Headers */,
+                               93A953B520EC9C3F00A619F6 /* GPULegacySize.h in Headers */,
+                               316BDBB21E7354BB00DE0D5A /* GPULegacyTexture.h in Headers */,
+                               316BDBB81E7357CB00DE0D5A /* GPULegacyTextureDescriptor.h in Headers */,
                                BC53C5F50DA56B920021EB5D /* Gradient.h in Headers */,
                                B22279640D00BF220071B782 /* GradientAttributes.h in Headers */,
                                2D481F04146B5C6B00AA7834 /* GradientImage.h in Headers */,
index bd301ee..f65904b 100644 (file)
 
 namespace WebCore {
 
-RefPtr<WebMetalBuffer> WebMetalBuffer::create(GPUBuffer&& buffer)
+RefPtr<WebMetalBuffer> WebMetalBuffer::create(GPULegacyBuffer&& buffer)
 {
     // FIXME: Consider returning null rather than a buffer with length 0 and contents null when creation fails.
     return adoptRef(*new WebMetalBuffer(WTFMove(buffer)));
 }
 
-WebMetalBuffer::WebMetalBuffer(GPUBuffer&& buffer)
+WebMetalBuffer::WebMetalBuffer(GPULegacyBuffer&& buffer)
     : m_buffer { WTFMove(buffer) }
 {
 }
index 2e341a7..e844a17 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUBuffer.h"
+#include "GPULegacyBuffer.h"
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
@@ -35,17 +35,17 @@ namespace WebCore {
 
 class WebMetalBuffer : public RefCounted<WebMetalBuffer> {
 public:
-    static RefPtr<WebMetalBuffer> create(GPUBuffer&&);
+    static RefPtr<WebMetalBuffer> create(GPULegacyBuffer&&);
 
     unsigned length() const { return m_buffer.length(); }
     JSC::ArrayBuffer& contents() const { return *m_buffer.contents(); }
 
-    const GPUBuffer& buffer() const { return m_buffer; }
+    const GPULegacyBuffer& buffer() const { return m_buffer; }
 
 private:
-    explicit WebMetalBuffer(GPUBuffer&&);
+    explicit WebMetalBuffer(GPULegacyBuffer&&);
 
-    GPUBuffer m_buffer;
+    GPULegacyBuffer m_buffer;
 };
 
 } // namespace WebCore
index d1bbe1a..03afc36 100644 (file)
@@ -29,8 +29,8 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUCommandBuffer.h"
-#include "GPUCommandQueue.h"
+#include "GPULegacyCommandBuffer.h"
+#include "GPULegacyCommandQueue.h"
 #include "Logging.h"
 #include "WebMetalComputeCommandEncoder.h"
 #include "WebMetalDrawable.h"
 
 namespace WebCore {
 
-Ref<WebMetalCommandBuffer> WebMetalCommandBuffer::create(const GPUCommandQueue& queue)
+Ref<WebMetalCommandBuffer> WebMetalCommandBuffer::create(const GPULegacyCommandQueue& queue)
 {
     return adoptRef(*new WebMetalCommandBuffer(queue));
 }
 
-WebMetalCommandBuffer::WebMetalCommandBuffer(const GPUCommandQueue& queue)
+WebMetalCommandBuffer::WebMetalCommandBuffer(const GPULegacyCommandQueue& queue)
     : m_buffer { queue, [this] () { m_completed.resolve(); } }
 {
     LOG(WebMetal, "WebMetalCommandBuffer::WebMetalCommandBuffer()");
@@ -69,12 +69,12 @@ void WebMetalCommandBuffer::presentDrawable(WebMetalDrawable& drawable)
 
 Ref<WebMetalRenderCommandEncoder> WebMetalCommandBuffer::createRenderCommandEncoderWithDescriptor(WebMetalRenderPassDescriptor& descriptor)
 {
-    return WebMetalRenderCommandEncoder::create(GPURenderCommandEncoder { m_buffer, descriptor.descriptor() });
+    return WebMetalRenderCommandEncoder::create(GPULegacyRenderCommandEncoder { m_buffer, descriptor.descriptor() });
 }
 
 Ref<WebMetalComputeCommandEncoder> WebMetalCommandBuffer::createComputeCommandEncoder()
 {
-    return WebMetalComputeCommandEncoder::create(GPUComputeCommandEncoder { m_buffer });
+    return WebMetalComputeCommandEncoder::create(GPULegacyComputeCommandEncoder { m_buffer });
 }
 
 DOMPromiseProxy<IDLVoid>& WebMetalCommandBuffer::completed()
index b384f2d..261fdd6 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(WEBMETAL)
 
 #include "DOMPromiseProxy.h"
-#include "GPUCommandBuffer.h"
+#include "GPULegacyCommandBuffer.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -43,7 +43,7 @@ class WebMetalRenderPassDescriptor;
 class WebMetalCommandBuffer : public RefCounted<WebMetalCommandBuffer> {
 public:
     ~WebMetalCommandBuffer();
-    static Ref<WebMetalCommandBuffer> create(const GPUCommandQueue&);
+    static Ref<WebMetalCommandBuffer> create(const GPULegacyCommandQueue&);
 
     void commit();
     void presentDrawable(WebMetalDrawable&);
@@ -53,12 +53,12 @@ public:
 
     DOMPromiseProxy<IDLVoid>& completed();
 
-    const GPUCommandBuffer& buffer() const { return m_buffer; }
+    const GPULegacyCommandBuffer& buffer() const { return m_buffer; }
 
 private:
-    explicit WebMetalCommandBuffer(const GPUCommandQueue&);
+    explicit WebMetalCommandBuffer(const GPULegacyCommandQueue&);
 
-    GPUCommandBuffer m_buffer;
+    GPULegacyCommandBuffer m_buffer;
     DOMPromiseProxy<IDLVoid> m_completed;
 };
 
index a49b23b..da4d2c2 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalCommandQueue> WebMetalCommandQueue::create(GPUCommandQueue&& queue)
+Ref<WebMetalCommandQueue> WebMetalCommandQueue::create(GPULegacyCommandQueue&& queue)
 {
     return adoptRef(*new WebMetalCommandQueue(WTFMove(queue)));
 }
 
-WebMetalCommandQueue::WebMetalCommandQueue(GPUCommandQueue&& queue)
+WebMetalCommandQueue::WebMetalCommandQueue(GPULegacyCommandQueue&& queue)
     : m_queue { WTFMove(queue) }
 {
 }
index f507b23..5cbb872 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUCommandQueue.h"
+#include "GPULegacyCommandQueue.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -38,7 +38,7 @@ class WebMetalCommandBuffer;
 class WebMetalCommandQueue : public RefCounted<WebMetalCommandQueue> {
 public:
     ~WebMetalCommandQueue();
-    static Ref<WebMetalCommandQueue> create(GPUCommandQueue&&);
+    static Ref<WebMetalCommandQueue> create(GPULegacyCommandQueue&&);
 
     String label() const { return m_queue.label(); }
     void setLabel(const String& label) { m_queue.setLabel(label); }
@@ -46,9 +46,9 @@ public:
     Ref<WebMetalCommandBuffer> createCommandBuffer();
 
 private:
-    explicit WebMetalCommandQueue(GPUCommandQueue&&);
+    explicit WebMetalCommandQueue(GPULegacyCommandQueue&&);
 
-    GPUCommandQueue m_queue;
+    GPULegacyCommandQueue m_queue;
 };
 
 } // namespace WebCore
index b4603f4..84401dd 100644 (file)
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUCommandBuffer.h"
-#include "GPUComputeCommandEncoder.h"
-#include "GPUSize.h"
+#include "GPULegacyCommandBuffer.h"
+#include "GPULegacyComputeCommandEncoder.h"
+#include "GPULegacySize.h"
 #include "WebMetalBuffer.h"
 #include "WebMetalCommandBuffer.h"
 #include "WebMetalComputePipelineState.h"
 
 namespace WebCore {
 
-static inline GPUSize GPUSizeMake(WebMetalSize size)
+static inline GPULegacySize GPULegacySizeMake(WebMetalSize size)
 {
     return { size.width, size.height, size.depth };
 }
 
-Ref<WebMetalComputeCommandEncoder> WebMetalComputeCommandEncoder::create(GPUComputeCommandEncoder&& encoder)
+Ref<WebMetalComputeCommandEncoder> WebMetalComputeCommandEncoder::create(GPULegacyComputeCommandEncoder&& encoder)
 {
     return adoptRef(*new WebMetalComputeCommandEncoder(WTFMove(encoder)));
 }
     
-WebMetalComputeCommandEncoder::WebMetalComputeCommandEncoder(GPUComputeCommandEncoder&& encoder)
+WebMetalComputeCommandEncoder::WebMetalComputeCommandEncoder(GPULegacyComputeCommandEncoder&& encoder)
     : m_encoder { WTFMove(encoder) }
 {
 }
@@ -64,7 +64,7 @@ void WebMetalComputeCommandEncoder::setBuffer(WebMetalBuffer& buffer, unsigned o
 
 void WebMetalComputeCommandEncoder::dispatch(WebMetalSize threadgroupsPerGrid, WebMetalSize threadsPerThreadgroup)
 {
-    m_encoder.dispatch(GPUSizeMake(threadgroupsPerGrid), GPUSizeMake(threadsPerThreadgroup));
+    m_encoder.dispatch(GPULegacySizeMake(threadgroupsPerGrid), GPULegacySizeMake(threadsPerThreadgroup));
 }
 
 void WebMetalComputeCommandEncoder::endEncoding()
index bfba8c5..6f6ad78 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUComputeCommandEncoder.h"
+#include "GPULegacyComputeCommandEncoder.h"
 #include "WebMetalSize.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
@@ -39,7 +39,7 @@ class WebMetalComputePipelineState;
 
 class WebMetalComputeCommandEncoder : public RefCounted<WebMetalComputeCommandEncoder> {
 public:
-    static Ref<WebMetalComputeCommandEncoder> create(GPUComputeCommandEncoder&&);
+    static Ref<WebMetalComputeCommandEncoder> create(GPULegacyComputeCommandEncoder&&);
 
     void setComputePipelineState(WebMetalComputePipelineState&);
     void setBuffer(WebMetalBuffer&, unsigned, unsigned);
@@ -47,9 +47,9 @@ public:
     void endEncoding();
 
 private:
-    explicit WebMetalComputeCommandEncoder(GPUComputeCommandEncoder&&);
+    explicit WebMetalComputeCommandEncoder(GPULegacyComputeCommandEncoder&&);
 
-    GPUComputeCommandEncoder m_encoder;
+    GPULegacyComputeCommandEncoder m_encoder;
 };
 
 } // namespace WebCore
index 11b53b5..853107f 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalComputePipelineState> WebMetalComputePipelineState::create(GPUComputePipelineState&& state)
+Ref<WebMetalComputePipelineState> WebMetalComputePipelineState::create(GPULegacyComputePipelineState&& state)
 {
     return adoptRef(*new WebMetalComputePipelineState(WTFMove(state)));
 }
 
-WebMetalComputePipelineState::WebMetalComputePipelineState(GPUComputePipelineState&& state)
+WebMetalComputePipelineState::WebMetalComputePipelineState(GPULegacyComputePipelineState&& state)
     : m_state { WTFMove(state) }
 {
 }
index bce478f..f04ff5f 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUComputePipelineState.h"
+#include "GPULegacyComputePipelineState.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -37,14 +37,14 @@ class WebMetalFunction;
 
 class WebMetalComputePipelineState : public RefCounted<WebMetalComputePipelineState> {
 public:
-    static Ref<WebMetalComputePipelineState> create(GPUComputePipelineState&&);
+    static Ref<WebMetalComputePipelineState> create(GPULegacyComputePipelineState&&);
 
-    GPUComputePipelineState& state() { return m_state; }
+    GPULegacyComputePipelineState& state() { return m_state; }
 
 private:
-    explicit WebMetalComputePipelineState(GPUComputePipelineState&&);
+    explicit WebMetalComputePipelineState(GPULegacyComputePipelineState&&);
 
-    GPUComputePipelineState m_state;
+    GPULegacyComputePipelineState m_state;
 };
 
 } // namespace WebCore
index 259b703..5778063 100644 (file)
@@ -53,7 +53,7 @@ WebMetalCompareFunction WebMetalDepthStencilDescriptor::depthCompareFunction() c
 void WebMetalDepthStencilDescriptor::setDepthCompareFunction(CompareFunction newDepthCompareFunction)
 {
     m_depthCompareFunction = newDepthCompareFunction;
-    m_descriptor.setDepthCompareFunction(toGPUCompareFunction(m_depthCompareFunction));
+    m_descriptor.setDepthCompareFunction(toGPULegacyCompareFunction(m_depthCompareFunction));
 }
 
 } // namespace WebCore
index a3b7950..809c1ea 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUDepthStencilDescriptor.h"
+#include "GPULegacyDepthStencilDescriptor.h"
 #include "WebMetalEnums.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
@@ -45,7 +45,7 @@ public:
     CompareFunction depthCompareFunction() const;
     void setDepthCompareFunction(CompareFunction);
 
-    GPUDepthStencilDescriptor& descriptor() { return m_descriptor; }
+    GPULegacyDepthStencilDescriptor& descriptor() { return m_descriptor; }
 
 private:
     WebMetalDepthStencilDescriptor() = default;
@@ -56,7 +56,7 @@ private:
     // there would be no need for a default value here.
 
     WebMetalCompareFunction m_depthCompareFunction { WebMetalCompareFunction::Always };
-    GPUDepthStencilDescriptor m_descriptor;
+    GPULegacyDepthStencilDescriptor m_descriptor;
 };
 
 } // namespace WebCore
index 6a947eb..0a7c7d2 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalDepthStencilState> WebMetalDepthStencilState::create(GPUDepthStencilState&& state)
+Ref<WebMetalDepthStencilState> WebMetalDepthStencilState::create(GPULegacyDepthStencilState&& state)
 {
     return adoptRef(*new WebMetalDepthStencilState(WTFMove(state)));
 }
 
-WebMetalDepthStencilState::WebMetalDepthStencilState(GPUDepthStencilState&& state)
+WebMetalDepthStencilState::WebMetalDepthStencilState(GPULegacyDepthStencilState&& state)
     : m_state { WTFMove(state) }
 {
 }
index f45c2d6..1c96f29 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUDepthStencilState.h"
+#include "GPULegacyDepthStencilState.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -35,17 +35,17 @@ namespace WebCore {
 
 class WebMetalDepthStencilState : public RefCounted<WebMetalDepthStencilState> {
 public:
-    static Ref<WebMetalDepthStencilState> create(GPUDepthStencilState&&);
+    static Ref<WebMetalDepthStencilState> create(GPULegacyDepthStencilState&&);
 
     String label() const;
     void setLabel(const String&);
 
-    GPUDepthStencilState& state() { return m_state; }
+    GPULegacyDepthStencilState& state() { return m_state; }
 
 private:
-    explicit WebMetalDepthStencilState(GPUDepthStencilState&&);
+    explicit WebMetalDepthStencilState(GPULegacyDepthStencilState&&);
 
-    GPUDepthStencilState m_state;
+    GPULegacyDepthStencilState m_state;
 };
     
 } // namespace WebCore
index 57f7921..5ed2e9e 100644 (file)
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUTexture.h"
+#include "GPULegacyTexture.h"
 #include "WebMetalTexture.h"
 
 namespace WebCore {
 
-Ref<WebMetalDrawable> WebMetalDrawable::create(GPUDrawable&& drawable)
+Ref<WebMetalDrawable> WebMetalDrawable::create(GPULegacyDrawable&& drawable)
 {
     return adoptRef(*new WebMetalDrawable(WTFMove(drawable)));
 }
 
-WebMetalDrawable::WebMetalDrawable(GPUDrawable&& drawable)
+WebMetalDrawable::WebMetalDrawable(GPULegacyDrawable&& drawable)
     : m_drawable { WTFMove(drawable) }
-    , m_texture { WebMetalTexture::create(GPUTexture { m_drawable }) }
+    , m_texture { WebMetalTexture::create(GPULegacyTexture { m_drawable }) }
 {
 }
 
index 537ab5b..649b29f 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUDrawable.h"
+#include "GPULegacyDrawable.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -38,15 +38,15 @@ class WebMetalTexture;
 class WebMetalDrawable : public RefCounted<WebMetalDrawable> {
 public:
     ~WebMetalDrawable();
-    static Ref<WebMetalDrawable> create(GPUDrawable&&);
+    static Ref<WebMetalDrawable> create(GPULegacyDrawable&&);
 
-    GPUDrawable& drawable() { return m_drawable; }
+    GPULegacyDrawable& drawable() { return m_drawable; }
     WebMetalTexture& texture() { return m_texture.get(); }
 
 private:
-    explicit WebMetalDrawable(GPUDrawable&&);
+    explicit WebMetalDrawable(GPULegacyDrawable&&);
 
-    GPUDrawable m_drawable;
+    GPULegacyDrawable m_drawable;
     Ref<WebMetalTexture> m_texture;
 };
 
index 6ad0a46..d7f9255 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUEnums.h"
+#include "GPULegacyEnums.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -79,27 +79,27 @@ String web3DCompareFunctionName(WebMetalCompareFunction value)
     return emptyString();
 }
 
-GPUCompareFunction toGPUCompareFunction(const WebMetalCompareFunction value)
+GPULegacyCompareFunction toGPULegacyCompareFunction(const WebMetalCompareFunction value)
 {
     if (value == WebMetalCompareFunction::Never)
-        return GPUCompareFunction::Never;
+        return GPULegacyCompareFunction::Never;
     if (value == WebMetalCompareFunction::Less)
-        return GPUCompareFunction::Less;
+        return GPULegacyCompareFunction::Less;
     if (value == WebMetalCompareFunction::Equal)
-        return GPUCompareFunction::Equal;
+        return GPULegacyCompareFunction::Equal;
     if (value == WebMetalCompareFunction::Lessequal)
-        return GPUCompareFunction::LessEqual;
+        return GPULegacyCompareFunction::LessEqual;
     if (value == WebMetalCompareFunction::Greater)
-        return GPUCompareFunction::Greater;
+        return GPULegacyCompareFunction::Greater;
     if (value == WebMetalCompareFunction::Notequal)
-        return GPUCompareFunction::NotEqual;
+        return GPULegacyCompareFunction::NotEqual;
     if (value == WebMetalCompareFunction::Greaterequal)
-        return GPUCompareFunction::GreaterEqual;
+        return GPULegacyCompareFunction::GreaterEqual;
     if (value == WebMetalCompareFunction::Always)
-        return GPUCompareFunction::Always;
+        return GPULegacyCompareFunction::Always;
     
     ASSERT_NOT_REACHED();
-    return GPUCompareFunction::Never;
+    return GPULegacyCompareFunction::Never;
 }
 
 } // namespace WebCore
index 282c506..9119b12 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-enum class GPUCompareFunction;
+enum class GPULegacyCompareFunction;
 
 enum class WebMetalCompareFunction {
     Never,
@@ -47,7 +47,7 @@ enum class WebMetalCompareFunction {
 
 std::optional<WebMetalCompareFunction> toWebMetalCompareFunction(const String&);
 String web3DCompareFunctionName(WebMetalCompareFunction);
-GPUCompareFunction toGPUCompareFunction(WebMetalCompareFunction);
+GPULegacyCompareFunction toGPULegacyCompareFunction(WebMetalCompareFunction);
 
 } // namespace WebCore
 
index 47bd3ad..60727c9 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalFunction> WebMetalFunction::create(GPUFunction&& function)
+Ref<WebMetalFunction> WebMetalFunction::create(GPULegacyFunction&& function)
 {
     return adoptRef(*new WebMetalFunction(WTFMove(function)));
 }
 
-WebMetalFunction::WebMetalFunction(GPUFunction&& function)
+WebMetalFunction::WebMetalFunction(GPULegacyFunction&& function)
     : m_function { WTFMove(function) }
 {
 }
index 2ba692c..70245dc 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUFunction.h"
+#include "GPULegacyFunction.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
@@ -36,15 +36,15 @@ namespace WebCore {
 
 class WebMetalFunction : public RefCounted<WebMetalFunction> {
 public:
-    static Ref<WebMetalFunction> create(GPUFunction&&);
+    static Ref<WebMetalFunction> create(GPULegacyFunction&&);
 
     String name() const { return m_function.name(); }
-    const GPUFunction& function() const { return m_function; }
+    const GPULegacyFunction& function() const { return m_function; }
 
 private:
-    explicit WebMetalFunction(GPUFunction&&);
+    explicit WebMetalFunction(GPULegacyFunction&&);
 
-    GPUFunction m_function;
+    GPULegacyFunction m_function;
 };
     
 } // namespace WebCore
index b79156b..3672344 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalLibrary> WebMetalLibrary::create(GPULibrary&& library, const String& sourceCode)
+Ref<WebMetalLibrary> WebMetalLibrary::create(GPULegacyLibrary&& library, const String& sourceCode)
 {
     return adoptRef(*new WebMetalLibrary(WTFMove(library), sourceCode));
 }
 
-WebMetalLibrary::WebMetalLibrary(GPULibrary&& library, const String& sourceCode)
+WebMetalLibrary::WebMetalLibrary(GPULegacyLibrary&& library, const String& sourceCode)
     : m_sourceCode { sourceCode }
     , m_library { WTFMove(library) }
 {
@@ -50,7 +50,7 @@ Vector<String> WebMetalLibrary::functionNames() const
 
 RefPtr<WebMetalFunction> WebMetalLibrary::functionWithName(const String& name) const
 {
-    GPUFunction function { m_library, name };
+    GPULegacyFunction function { m_library, name };
     if (!function)
         return nullptr;
     return WebMetalFunction::create(WTFMove(function));
index e8e11d9..9876c20 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPULibrary.h"
+#include "GPULegacyLibrary.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -37,7 +37,7 @@ class WebMetalFunction;
 
 class WebMetalLibrary : public RefCounted<WebMetalLibrary> {
 public:
-    static Ref<WebMetalLibrary> create(GPULibrary&&, const String& sourceCode);
+    static Ref<WebMetalLibrary> create(GPULegacyLibrary&&, const String& sourceCode);
 
     const String& sourceCode() const { return m_sourceCode; }
 
@@ -49,10 +49,10 @@ public:
     RefPtr<WebMetalFunction> functionWithName(const String&) const;
 
 private:
-    WebMetalLibrary(GPULibrary&&, const String& sourceCode);
+    WebMetalLibrary(GPULegacyLibrary&&, const String& sourceCode);
 
     String m_sourceCode;
-    GPULibrary m_library;
+    GPULegacyLibrary m_library;
 };
 
 } // namespace WebCore
index e8e618c..cc681a9 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUCommandBuffer.h"
-#include "GPURenderPassDescriptor.h"
+#include "GPULegacyCommandBuffer.h"
+#include "GPULegacyRenderPassDescriptor.h"
 #include "WebMetalBuffer.h"
 #include "WebMetalCommandBuffer.h"
 #include "WebMetalDepthStencilState.h"
 
 namespace WebCore {
 
-Ref<WebMetalRenderCommandEncoder> WebMetalRenderCommandEncoder::create(GPURenderCommandEncoder&& encoder)
+Ref<WebMetalRenderCommandEncoder> WebMetalRenderCommandEncoder::create(GPULegacyRenderCommandEncoder&& encoder)
 {
     return adoptRef(*new WebMetalRenderCommandEncoder(WTFMove(encoder)));
 }
 
-WebMetalRenderCommandEncoder::WebMetalRenderCommandEncoder(GPURenderCommandEncoder&& encoder)
+WebMetalRenderCommandEncoder::WebMetalRenderCommandEncoder(GPULegacyRenderCommandEncoder&& encoder)
     : m_encoder { WTFMove(encoder) }
 {
 }
index 9ded7ab..cbe66fc 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderCommandEncoder.h"
+#include "GPULegacyRenderCommandEncoder.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -40,7 +40,7 @@ class WebMetalRenderPipelineState;
 class WebMetalRenderCommandEncoder : public RefCounted<WebMetalRenderCommandEncoder> {
 public:
     ~WebMetalRenderCommandEncoder();
-    static Ref<WebMetalRenderCommandEncoder> create(GPURenderCommandEncoder&&);
+    static Ref<WebMetalRenderCommandEncoder> create(GPULegacyRenderCommandEncoder&&);
 
     void setRenderPipelineState(WebMetalRenderPipelineState&);
     void setDepthStencilState(WebMetalDepthStencilState&);
@@ -49,12 +49,12 @@ public:
     void drawPrimitives(unsigned type, unsigned start, unsigned count);
     void endEncoding();
 
-    GPURenderCommandEncoder& encoder() { return m_encoder; }
+    GPULegacyRenderCommandEncoder& encoder() { return m_encoder; }
 
 private:
-    explicit WebMetalRenderCommandEncoder(GPURenderCommandEncoder&&);
+    explicit WebMetalRenderCommandEncoder(GPULegacyRenderCommandEncoder&&);
 
-    GPURenderCommandEncoder m_encoder;
+    GPULegacyRenderCommandEncoder m_encoder;
 };
 
 } // namespace WebCore
index 0fc4baa..3eee745 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPassAttachmentDescriptor.h"
-#include "GPUTexture.h"
+#include "GPULegacyRenderPassAttachmentDescriptor.h"
+#include "GPULegacyTexture.h"
 #include "WebMetalTexture.h"
 
 namespace WebCore {
index edd4b05..3959002 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-class GPURenderPassAttachmentDescriptor;
+class GPULegacyRenderPassAttachmentDescriptor;
 class WebMetalTexture;
 
 class WebMetalRenderPassAttachmentDescriptor : public RefCounted<WebMetalRenderPassAttachmentDescriptor> {
@@ -54,7 +54,7 @@ protected:
     WebMetalRenderPassAttachmentDescriptor();
 
 private:
-    virtual const GPURenderPassAttachmentDescriptor& descriptor() const = 0;
+    virtual const GPULegacyRenderPassAttachmentDescriptor& descriptor() const = 0;
 
     RefPtr<WebMetalTexture> m_texture;
 };
index 6628ff9..ace43dd 100644 (file)
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUTexture.h"
+#include "GPULegacyTexture.h"
 #include "WebMetalTexture.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
-Ref<WebMetalRenderPassColorAttachmentDescriptor> WebMetalRenderPassColorAttachmentDescriptor::create(GPURenderPassColorAttachmentDescriptor&& descriptor)
+Ref<WebMetalRenderPassColorAttachmentDescriptor> WebMetalRenderPassColorAttachmentDescriptor::create(GPULegacyRenderPassColorAttachmentDescriptor&& descriptor)
 {
     return adoptRef(*new WebMetalRenderPassColorAttachmentDescriptor(WTFMove(descriptor)));
 }
 
-WebMetalRenderPassColorAttachmentDescriptor::WebMetalRenderPassColorAttachmentDescriptor(GPURenderPassColorAttachmentDescriptor&& descriptor)
+WebMetalRenderPassColorAttachmentDescriptor::WebMetalRenderPassColorAttachmentDescriptor(GPULegacyRenderPassColorAttachmentDescriptor&& descriptor)
     : m_descriptor { WTFMove(descriptor) }
 {
 }
 
 WebMetalRenderPassColorAttachmentDescriptor::~WebMetalRenderPassColorAttachmentDescriptor() = default;
 
-const GPURenderPassAttachmentDescriptor& WebMetalRenderPassColorAttachmentDescriptor::descriptor() const
+const GPULegacyRenderPassAttachmentDescriptor& WebMetalRenderPassColorAttachmentDescriptor::descriptor() const
 {
     return m_descriptor;
 }
index d101e7b..e5f8baa 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPassColorAttachmentDescriptor.h"
+#include "GPULegacyRenderPassColorAttachmentDescriptor.h"
 #include "WebMetalRenderPassAttachmentDescriptor.h"
 
 namespace WebCore {
@@ -35,18 +35,18 @@ namespace WebCore {
 class WebMetalRenderPassColorAttachmentDescriptor final : public WebMetalRenderPassAttachmentDescriptor {
 public:
     virtual ~WebMetalRenderPassColorAttachmentDescriptor();
-    static Ref<WebMetalRenderPassColorAttachmentDescriptor> create(GPURenderPassColorAttachmentDescriptor&&);
+    static Ref<WebMetalRenderPassColorAttachmentDescriptor> create(GPULegacyRenderPassColorAttachmentDescriptor&&);
 
     Vector<float> clearColor() const;
     void setClearColor(const Vector<float>&);
 
 private:
-    explicit WebMetalRenderPassColorAttachmentDescriptor(GPURenderPassColorAttachmentDescriptor&&);
+    explicit WebMetalRenderPassColorAttachmentDescriptor(GPULegacyRenderPassColorAttachmentDescriptor&&);
 
-    const GPURenderPassAttachmentDescriptor& descriptor() const final;
+    const GPULegacyRenderPassAttachmentDescriptor& descriptor() const final;
     bool isColorAttachmentDescriptor() const final { return true; }
 
-    GPURenderPassColorAttachmentDescriptor m_descriptor;
+    GPULegacyRenderPassColorAttachmentDescriptor m_descriptor;
 };
     
 } // namespace WebCore
index 05c5fb2..09b2b8e 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalRenderPassDepthAttachmentDescriptor> WebMetalRenderPassDepthAttachmentDescriptor::create(GPURenderPassDepthAttachmentDescriptor&& descriptor)
+Ref<WebMetalRenderPassDepthAttachmentDescriptor> WebMetalRenderPassDepthAttachmentDescriptor::create(GPULegacyRenderPassDepthAttachmentDescriptor&& descriptor)
 {
     return adoptRef(*new WebMetalRenderPassDepthAttachmentDescriptor(WTFMove(descriptor)));
 }
 
-WebMetalRenderPassDepthAttachmentDescriptor::WebMetalRenderPassDepthAttachmentDescriptor(GPURenderPassDepthAttachmentDescriptor&& descriptor)
+WebMetalRenderPassDepthAttachmentDescriptor::WebMetalRenderPassDepthAttachmentDescriptor(GPULegacyRenderPassDepthAttachmentDescriptor&& descriptor)
     : m_descriptor { WTFMove(descriptor) }
 {
 }
@@ -54,7 +54,7 @@ void WebMetalRenderPassDepthAttachmentDescriptor::setClearDepth(double newClearD
     m_descriptor.setClearDepth(newClearDepth);
 }
 
-const GPURenderPassAttachmentDescriptor& WebMetalRenderPassDepthAttachmentDescriptor::descriptor() const
+const GPULegacyRenderPassAttachmentDescriptor& WebMetalRenderPassDepthAttachmentDescriptor::descriptor() const
 {
     return m_descriptor;
 }
index ba09029..2175816 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPassDepthAttachmentDescriptor.h"
+#include "GPULegacyRenderPassDepthAttachmentDescriptor.h"
 #include "WebMetalRenderPassAttachmentDescriptor.h"
 
 namespace WebCore {
@@ -35,18 +35,18 @@ namespace WebCore {
 class WebMetalRenderPassDepthAttachmentDescriptor final : public WebMetalRenderPassAttachmentDescriptor {
 public:
     virtual ~WebMetalRenderPassDepthAttachmentDescriptor();
-    static Ref<WebMetalRenderPassDepthAttachmentDescriptor> create(GPURenderPassDepthAttachmentDescriptor&&);
+    static Ref<WebMetalRenderPassDepthAttachmentDescriptor> create(GPULegacyRenderPassDepthAttachmentDescriptor&&);
 
     double clearDepth() const;
     void setClearDepth(double);
 
 private:
-    explicit WebMetalRenderPassDepthAttachmentDescriptor(GPURenderPassDepthAttachmentDescriptor&&);
+    explicit WebMetalRenderPassDepthAttachmentDescriptor(GPULegacyRenderPassDepthAttachmentDescriptor&&);
 
-    const GPURenderPassAttachmentDescriptor& descriptor() const final;
+    const GPULegacyRenderPassAttachmentDescriptor& descriptor() const final;
     bool isColorAttachmentDescriptor() const final { return false; }
 
-    GPURenderPassDepthAttachmentDescriptor m_descriptor;
+    GPULegacyRenderPassDepthAttachmentDescriptor m_descriptor;
 };
     
 } // namespace WebCore
index 2e2389c..bba494e 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPassDescriptor.h"
+#include "GPULegacyRenderPassDescriptor.h"
 #include "WebMetalRenderPassColorAttachmentDescriptor.h"
 #include "WebMetalRenderPassDepthAttachmentDescriptor.h"
 #include <wtf/Ref.h>
@@ -44,7 +44,7 @@ public:
     WebMetalRenderPassDepthAttachmentDescriptor& depthAttachment();
     const Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>>& colorAttachments();
 
-    const GPURenderPassDescriptor& descriptor() const { return m_descriptor; }
+    const GPULegacyRenderPassDescriptor& descriptor() const { return m_descriptor; }
 
 private:
     WebMetalRenderPassDescriptor();
@@ -52,7 +52,7 @@ private:
     Vector<RefPtr<WebMetalRenderPassColorAttachmentDescriptor>> m_colorAttachments;
     RefPtr<WebMetalRenderPassDepthAttachmentDescriptor> m_depthAttachment;
 
-    GPURenderPassDescriptor m_descriptor;
+    GPULegacyRenderPassDescriptor m_descriptor;
 };
     
 } // namespace WebCore
index 5c6d962..0e534c0 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalRenderPipelineColorAttachmentDescriptor> WebMetalRenderPipelineColorAttachmentDescriptor::create(GPURenderPipelineColorAttachmentDescriptor&& descriptor)
+Ref<WebMetalRenderPipelineColorAttachmentDescriptor> WebMetalRenderPipelineColorAttachmentDescriptor::create(GPULegacyRenderPipelineColorAttachmentDescriptor&& descriptor)
 {
     return adoptRef(*new WebMetalRenderPipelineColorAttachmentDescriptor(WTFMove(descriptor)));
 }
 
-WebMetalRenderPipelineColorAttachmentDescriptor::WebMetalRenderPipelineColorAttachmentDescriptor(GPURenderPipelineColorAttachmentDescriptor&& descriptor)
+WebMetalRenderPipelineColorAttachmentDescriptor::WebMetalRenderPipelineColorAttachmentDescriptor(GPULegacyRenderPipelineColorAttachmentDescriptor&& descriptor)
     : m_descriptor { WTFMove(descriptor) }
 {
 }
index b66ef52..fb85581 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPipelineColorAttachmentDescriptor.h"
+#include "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -35,15 +35,15 @@ namespace WebCore {
 
 class WebMetalRenderPipelineColorAttachmentDescriptor : public RefCounted<WebMetalRenderPipelineColorAttachmentDescriptor> {
 public:
-    static Ref<WebMetalRenderPipelineColorAttachmentDescriptor> create(GPURenderPipelineColorAttachmentDescriptor&&);
+    static Ref<WebMetalRenderPipelineColorAttachmentDescriptor> create(GPULegacyRenderPipelineColorAttachmentDescriptor&&);
 
     unsigned pixelFormat() const;
     void setPixelFormat(unsigned);
 
 private:
-    explicit WebMetalRenderPipelineColorAttachmentDescriptor(GPURenderPipelineColorAttachmentDescriptor&&);
+    explicit WebMetalRenderPipelineColorAttachmentDescriptor(GPULegacyRenderPipelineColorAttachmentDescriptor&&);
 
-    GPURenderPipelineColorAttachmentDescriptor m_descriptor;
+    GPULegacyRenderPipelineColorAttachmentDescriptor m_descriptor;
 };
     
 } // namespace WebCore
index 0c71280..541d711 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUFunction.h"
-#include "GPURenderPipelineColorAttachmentDescriptor.h"
+#include "GPULegacyFunction.h"
+#include "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
 #include "WebMetalFunction.h"
 #include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
 
index 8a06200..9d70185 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPipelineDescriptor.h"
+#include "GPULegacyRenderPipelineDescriptor.h"
 #include "WebMetalRenderPipelineColorAttachmentDescriptor.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
@@ -35,8 +35,8 @@
 
 namespace WebCore {
 
-class GPUFunction;
-class GPURenderPipelineDescriptor;
+class GPULegacyFunction;
+class GPULegacyRenderPipelineDescriptor;
 class WebMetalFunction;
 class WebMetalRenderPipelineColorAttachmentDescriptor;
 
@@ -58,7 +58,7 @@ public:
 
     void reset();
 
-    const GPURenderPipelineDescriptor& descriptor() { return m_descriptor; }
+    const GPULegacyRenderPipelineDescriptor& descriptor() { return m_descriptor; }
 
 private:
     WebMetalRenderPipelineDescriptor();
@@ -68,7 +68,7 @@ private:
 
     Vector<RefPtr<WebMetalRenderPipelineColorAttachmentDescriptor>> m_colorAttachments;
 
-    GPURenderPipelineDescriptor m_descriptor;
+    GPULegacyRenderPipelineDescriptor m_descriptor;
 };
 
 } // namespace WebCore
index 2138bff..dd0f057 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalRenderPipelineState> WebMetalRenderPipelineState::create(GPURenderPipelineState&& state)
+Ref<WebMetalRenderPipelineState> WebMetalRenderPipelineState::create(GPULegacyRenderPipelineState&& state)
 {
     return adoptRef(*new WebMetalRenderPipelineState(WTFMove(state)));
 }
 
-WebMetalRenderPipelineState::WebMetalRenderPipelineState(GPURenderPipelineState&& state)
+WebMetalRenderPipelineState::WebMetalRenderPipelineState(GPULegacyRenderPipelineState&& state)
     : m_state { WTFMove(state) }
 {
 }
index 88f799d..b17fd3b 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPipelineState.h"
+#include "GPULegacyRenderPipelineState.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -35,17 +35,17 @@ namespace WebCore {
 
 class WebMetalRenderPipelineState : public RefCounted<WebMetalRenderPipelineState> {
 public:
-    static Ref<WebMetalRenderPipelineState> create(GPURenderPipelineState&&);
+    static Ref<WebMetalRenderPipelineState> create(GPULegacyRenderPipelineState&&);
 
     String label() const;
     void setLabel(const String&);
 
-    const GPURenderPipelineState& state() const { return m_state; }
+    const GPULegacyRenderPipelineState& state() const { return m_state; }
 
 private:
-    explicit WebMetalRenderPipelineState(GPURenderPipelineState&&);
+    explicit WebMetalRenderPipelineState(GPULegacyRenderPipelineState&&);
 
-    GPURenderPipelineState m_state;
+    GPULegacyRenderPipelineState m_state;
 };
     
 } // namespace WebCore
index 169eabd..90413ea 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "Document.h"
 #include "FrameView.h"
-#include "GPUDevice.h"
+#include "GPULegacyDevice.h"
 #include "InspectorInstrumentation.h"
 #include "WebMetalBuffer.h"
 #include "WebMetalCommandQueue.h"
@@ -72,7 +72,7 @@ static const int kMaxTextureSize = 4096;
 
 std::unique_ptr<WebMetalRenderingContext> WebMetalRenderingContext::create(CanvasBase& canvas)
 {
-    GPUDevice device;
+    GPULegacyDevice device;
 
     if (!device) {
         // FIXME: WebMetal - dispatch an event here for the failure.
@@ -87,7 +87,7 @@ std::unique_ptr<WebMetalRenderingContext> WebMetalRenderingContext::create(Canva
     return renderingContext;
 }
 
-WebMetalRenderingContext::WebMetalRenderingContext(CanvasBase& canvas, GPUDevice&& device)
+WebMetalRenderingContext::WebMetalRenderingContext(CanvasBase& canvas, GPULegacyDevice&& device)
     : GPUBasedCanvasRenderingContext(canvas)
     , m_device(WTFMove(device))
 {
@@ -153,42 +153,42 @@ void WebMetalRenderingContext::reshape(int width, int height)
 
 Ref<WebMetalLibrary> WebMetalRenderingContext::createLibrary(const String& sourceCode)
 {
-    return WebMetalLibrary::create(GPULibrary { m_device, sourceCode }, sourceCode);
+    return WebMetalLibrary::create(GPULegacyLibrary { m_device, sourceCode }, sourceCode);
 }
 
 Ref<WebMetalRenderPipelineState> WebMetalRenderingContext::createRenderPipelineState(WebMetalRenderPipelineDescriptor& descriptor)
 {
-    return WebMetalRenderPipelineState::create(GPURenderPipelineState { m_device, descriptor.descriptor() });
+    return WebMetalRenderPipelineState::create(GPULegacyRenderPipelineState { m_device, descriptor.descriptor() });
 }
 
 Ref<WebMetalDepthStencilState> WebMetalRenderingContext::createDepthStencilState(WebMetalDepthStencilDescriptor& descriptor)
 {
-    return WebMetalDepthStencilState::create(GPUDepthStencilState { m_device, descriptor.descriptor() });
+    return WebMetalDepthStencilState::create(GPULegacyDepthStencilState { m_device, descriptor.descriptor() });
 }
 
 Ref<WebMetalComputePipelineState> WebMetalRenderingContext::createComputePipelineState(WebMetalFunction& function)
 {
-    return WebMetalComputePipelineState::create(GPUComputePipelineState { m_device, function.function() });
+    return WebMetalComputePipelineState::create(GPULegacyComputePipelineState { m_device, function.function() });
 }
 
 Ref<WebMetalCommandQueue> WebMetalRenderingContext::createCommandQueue()
 {
-    return WebMetalCommandQueue::create(GPUCommandQueue { m_device });
+    return WebMetalCommandQueue::create(GPULegacyCommandQueue { m_device });
 }
 
 Ref<WebMetalDrawable> WebMetalRenderingContext::nextDrawable()
 {
-    return WebMetalDrawable::create(GPUDrawable { m_device });
+    return WebMetalDrawable::create(GPULegacyDrawable { m_device });
 }
 
 RefPtr<WebMetalBuffer> WebMetalRenderingContext::createBuffer(JSC::ArrayBufferView& data)
 {
-    return WebMetalBuffer::create(GPUBuffer { m_device, data });
+    return WebMetalBuffer::create(GPULegacyBuffer { m_device, data });
 }
 
 Ref<WebMetalTexture> WebMetalRenderingContext::createTexture(WebMetalTextureDescriptor& descriptor)
 {
-    return WebMetalTexture::create(GPUTexture { m_device, descriptor.descriptor() });
+    return WebMetalTexture::create(GPULegacyTexture { m_device, descriptor.descriptor() });
 }
 
 } // namespace WebCore
index cfc70bd..50ccd46 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(WEBMETAL)
 
 #include "GPUBasedCanvasRenderingContext.h"
-#include "GPUDevice.h"
+#include "GPULegacyDevice.h"
 
 namespace JSC {
 class ArrayBufferView;
@@ -66,10 +66,10 @@ public:
     RefPtr<WebMetalBuffer> createBuffer(JSC::ArrayBufferView&);
     Ref<WebMetalTexture> createTexture(WebMetalTextureDescriptor&);
 
-    const GPUDevice& device() const { return m_device; }
+    const GPULegacyDevice& device() const { return m_device; }
 
 private:
-    WebMetalRenderingContext(CanvasBase&, GPUDevice&&);
+    WebMetalRenderingContext(CanvasBase&, GPULegacyDevice&&);
 
     bool hasPendingActivity() const final;
     void stop() final;
@@ -85,7 +85,7 @@ private:
     void markLayerComposited() final;
     PlatformLayer* platformLayer() const final;
 
-    GPUDevice m_device;
+    GPULegacyDevice m_device;
 };
 
 } // namespace WebCore
index cdc3e16..e709998 100644 (file)
 
 namespace WebCore {
 
-Ref<WebMetalTexture> WebMetalTexture::create(GPUTexture&& texture)
+Ref<WebMetalTexture> WebMetalTexture::create(GPULegacyTexture&& texture)
 {
     return adoptRef(*new WebMetalTexture(WTFMove(texture)));
 }
 
-WebMetalTexture::WebMetalTexture(GPUTexture&& texture)
+WebMetalTexture::WebMetalTexture(GPULegacyTexture&& texture)
     : m_texture { WTFMove(texture) }
 {
 }
index becb4aa..30b7f6c 100644 (file)
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUTexture.h"
+#include "GPULegacyTexture.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
 
-class GPUTextureDescriptor;
+class GPULegacyTextureDescriptor;
 
 class WebMetalTexture : public RefCounted<WebMetalTexture> {
 public:
-    static Ref<WebMetalTexture> create(GPUTexture&&);
+    static Ref<WebMetalTexture> create(GPULegacyTexture&&);
 
     unsigned width() const { return m_texture.width(); }
     unsigned height() const { return m_texture.height(); }
 
-    const GPUTexture& texture() const { return m_texture; }
+    const GPULegacyTexture& texture() const { return m_texture; }
 
 private:
-    explicit WebMetalTexture(GPUTexture&&);
+    explicit WebMetalTexture(GPULegacyTexture&&);
 
-    GPUTexture m_texture;
+    GPULegacyTexture m_texture;
 };
     
 } // namespace WebCore
index c450022..c8328da 100644 (file)
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#include "GPUTextureDescriptor.h"
+#include "GPULegacyTextureDescriptor.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
 
@@ -55,12 +55,12 @@ public:
     unsigned usage() const;
     void setUsage(unsigned);
 
-    const GPUTextureDescriptor& descriptor() { return m_descriptor; }
+    const GPULegacyTextureDescriptor& descriptor() { return m_descriptor; }
 
 private:
     WebMetalTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
 
-    GPUTextureDescriptor m_descriptor;
+    GPULegacyTextureDescriptor m_descriptor;
 };
 
 } // namespace WebCore
index 92c16fb..a09c4a2 100644 (file)
@@ -31,7 +31,7 @@
 #import <QuartzCore/QuartzCore.h>
 
 namespace WebCore {
-class GPUDevice;
+class GPULegacyDevice;
 }
 
 #if !PLATFORM(IOS_FAMILY_SIMULATOR)
@@ -39,13 +39,13 @@ class GPUDevice;
 #else
 @interface WebMetalLayer : CALayer { // FIXME: WebMetal - Disable WebMetal on iOS simulator?
 #endif
-    WebCore::GPUDevice* _context;
+    WebCore::GPULegacyDevice* _context;
     float _devicePixelRatio;
 }
 
-@property (nonatomic) WebCore::GPUDevice* context;
+@property (nonatomic) WebCore::GPULegacyDevice* context;
 
-- (id)initWithGPUDevice:(WebCore::GPUDevice*)context;
+- (id)initWithGPUDevice:(WebCore::GPULegacyDevice*)context;
 
 - (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace;
 
index 91c0233..3ffdf19 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDevice.h"
+#import "GPULegacyDevice.h"
 #import "GraphicsContextCG.h"
 #import "GraphicsLayer.h"
 #import <wtf/FastMalloc.h>
@@ -38,7 +38,7 @@
 
 @synthesize context=_context;
 
-- (id)initWithGPUDevice:(WebCore::GPUDevice*)context
+- (id)initWithGPUDevice:(WebCore::GPULegacyDevice*)context
 {
     self = [super init];
     _context = context;
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUBuffer.h"
+#include "GPULegacyBuffer.h"
 
 #if ENABLE(WEBMETAL)
 
 
 namespace WebCore {
 
-GPUBuffer::~GPUBuffer()
+GPULegacyBuffer::~GPULegacyBuffer()
 {
     LOG(WebMetal, "GPUBuffer::~GPUBuffer()");
 }
 
-unsigned GPUBuffer::length() const
+unsigned GPULegacyBuffer::length() const
 {
     return m_contents ? m_contents->byteLength() : 0;
 }
@@ -39,12 +39,12 @@ class ArrayBufferView;
 
 namespace WebCore {
 
-class GPUDevice;
+class GPULegacyDevice;
 
-class GPUBuffer {
+class GPULegacyBuffer {
 public:
-    WEBCORE_EXPORT GPUBuffer(const GPUDevice&, const JSC::ArrayBufferView&);
-    WEBCORE_EXPORT ~GPUBuffer();
+    WEBCORE_EXPORT GPULegacyBuffer(const GPULegacyDevice&, const JSC::ArrayBufferView&);
+    WEBCORE_EXPORT ~GPULegacyBuffer();
 
     WEBCORE_EXPORT unsigned length() const;
     JSC::ArrayBuffer* contents() const { return m_contents.get(); }
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "GPUCommandBuffer.h"
+#include "GPULegacyCommandBuffer.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -33,7 +33,7 @@
 
 namespace WebCore {
 
-GPUCommandBuffer::~GPUCommandBuffer()
+GPULegacyCommandBuffer::~GPULegacyCommandBuffer()
 {
     LOG(WebMetal, "GPUCommandBuffer::~GPUCommandBuffer()");
 }
@@ -35,16 +35,16 @@ OBJC_PROTOCOL(MTLCommandBuffer);
 
 namespace WebCore {
 
-class GPUCommandQueue;
-class GPUDrawable;
+class GPULegacyCommandQueue;
+class GPULegacyDrawable;
 
-class GPUCommandBuffer {
+class GPULegacyCommandBuffer {
 public:
-    explicit GPUCommandBuffer(const GPUCommandQueue&, Function<void()>&& completedCallback);
-    ~GPUCommandBuffer();
+    explicit GPULegacyCommandBuffer(const GPULegacyCommandQueue&, Function<void()>&& completedCallback);
+    ~GPULegacyCommandBuffer();
 
     void commit() const;
-    void presentDrawable(GPUDrawable&) const;
+    void presentDrawable(GPULegacyDrawable&) const;
 
 #if USE(METAL)
     MTLCommandBuffer *metal() const { return m_metal.get(); }
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUDepthStencilState.h"
+#include "GPULegacyCommandQueue.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,9 +32,9 @@
 
 namespace WebCore {
 
-GPUDepthStencilState::~GPUDepthStencilState()
+GPULegacyCommandQueue::~GPULegacyCommandQueue()
 {
-    LOG(WebMetal, "GPUDepthStencilState::~GPUDepthStencilState()");
+    LOG(WebMetal, "GPULegacyCommandQueue::~GPULegacyCommandQueue()");
 }
 
 } // namespace WebCore
@@ -33,12 +33,12 @@ OBJC_PROTOCOL(MTLCommandQueue);
 
 namespace WebCore {
 
-class GPUDevice;
+class GPULegacyDevice;
 
-class GPUCommandQueue {
+class GPULegacyCommandQueue {
 public:
-    WEBCORE_EXPORT explicit GPUCommandQueue(const GPUDevice&);
-    WEBCORE_EXPORT ~GPUCommandQueue();
+    WEBCORE_EXPORT explicit GPULegacyCommandQueue(const GPULegacyDevice&);
+    WEBCORE_EXPORT ~GPULegacyCommandQueue();
 
     WEBCORE_EXPORT String label() const;
     WEBCORE_EXPORT void setLabel(const String&) const;
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUComputeCommandEncoder.h"
+#include "GPULegacyComputeCommandEncoder.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,9 +32,9 @@
 
 namespace WebCore {
     
-GPUComputeCommandEncoder::~GPUComputeCommandEncoder()
+GPULegacyComputeCommandEncoder::~GPULegacyComputeCommandEncoder()
 {
-    LOG(WebMetal, "GPUComputeCommandEncoder::~GPUComputeCommandEncoder()");
+    LOG(WebMetal, "GPULegacyComputeCommandEncoder::~GPULegacyComputeCommandEncoder()");
 }
     
 } // namespace WebCore
@@ -33,20 +33,20 @@ OBJC_PROTOCOL(MTLComputeCommandEncoder);
 
 namespace WebCore {
     
-class GPUBuffer;
-class GPUCommandBuffer;
-class GPUComputePipelineState;
+class GPULegacyBuffer;
+class GPULegacyCommandBuffer;
+class GPULegacyComputePipelineState;
 
-struct GPUSize;
+struct GPULegacySize;
 
-class GPUComputeCommandEncoder {
+class GPULegacyComputeCommandEncoder {
 public:
-    explicit GPUComputeCommandEncoder(const GPUCommandBuffer&);
-    ~GPUComputeCommandEncoder();
+    explicit GPULegacyComputeCommandEncoder(const GPULegacyCommandBuffer&);
+    ~GPULegacyComputeCommandEncoder();
 
-    void setComputePipelineState(const GPUComputePipelineState&) const;
-    void setBuffer(const GPUBuffer&, unsigned, unsigned) const;
-    void dispatch(GPUSize, GPUSize) const;
+    void setComputePipelineState(const GPULegacyComputePipelineState&) const;
+    void setBuffer(const GPULegacyBuffer&, unsigned, unsigned) const;
+    void dispatch(GPULegacySize, GPULegacySize) const;
     void endEncoding() const;
 
 #if USE(METAL)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUComputePipelineState.h"
+#include "GPULegacyComputePipelineState.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,9 +32,9 @@
 
 namespace WebCore {
     
-GPUComputePipelineState::~GPUComputePipelineState()
+GPULegacyComputePipelineState::~GPULegacyComputePipelineState()
 {
-    LOG(WebMetal, "GPUComputePipelineState::~GPUComputePipelineState()");
+    LOG(WebMetal, "GPULegacyComputePipelineState::~GPULegacyComputePipelineState()");
 }
 
 } // namespace WebCore
@@ -33,14 +33,14 @@ OBJC_PROTOCOL(MTLComputePipelineState);
 
 namespace WebCore {
 
-class GPUDevice;
-class GPUFunction;
+class GPULegacyDevice;
+class GPULegacyFunction;
 
-class GPUComputePipelineState {
+class GPULegacyComputePipelineState {
 public:
-    GPUComputePipelineState() = default;
-    GPUComputePipelineState(const GPUDevice&, const GPUFunction&);
-    ~GPUComputePipelineState();
+    GPULegacyComputePipelineState() = default;
+    GPULegacyComputePipelineState(const GPULegacyDevice&, const GPULegacyFunction&);
+    ~GPULegacyComputePipelineState();
 
 #if USE(METAL)
     MTLComputePipelineState *metal() const { return m_metal.get(); }
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUDepthStencilDescriptor.h"
+#include "GPULegacyDepthStencilDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()
+GPULegacyDepthStencilDescriptor::~GPULegacyDepthStencilDescriptor()
 {
     LOG(WebMetal, "GPUDepthStencilDescriptor::~GPUDepthStencilDescriptor()");
 }
@@ -33,18 +33,18 @@ OBJC_CLASS MTLDepthStencilDescriptor;
 
 namespace WebCore {
 
-enum class GPUCompareFunction;
+enum class GPULegacyCompareFunction;
 
-class GPUDepthStencilDescriptor {
+class GPULegacyDepthStencilDescriptor {
 public:
-    GPUDepthStencilDescriptor();
-    ~GPUDepthStencilDescriptor();
+    GPULegacyDepthStencilDescriptor();
+    ~GPULegacyDepthStencilDescriptor();
 
     bool depthWriteEnabled() const;
     void setDepthWriteEnabled(bool) const;
 
-    GPUCompareFunction depthCompareFunction() const;
-    void setDepthCompareFunction(GPUCompareFunction) const;
+    GPULegacyCompareFunction depthCompareFunction() const;
+    void setDepthCompareFunction(GPULegacyCompareFunction) const;
 
 #if USE(METAL)
     MTLDepthStencilDescriptor *metal() const { return m_metal.get(); }
diff --git a/Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilState.cpp b/Source/WebCore/platform/graphics/gpu/GPULegacyDepthStencilState.cpp
new file mode 100644 (file)
index 0000000..027f54f
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPULegacyDepthStencilState.h"
+
+#if ENABLE(WEBMETAL)
+
+#include "Logging.h"
+
+namespace WebCore {
+
+GPULegacyDepthStencilState::~GPULegacyDepthStencilState()
+{
+    LOG(WebMetal, "GPULegacyDepthStencilState::~GPULegacyDepthStencilState()");
+}
+
+} // namespace WebCore
+
+#endif
@@ -34,14 +34,14 @@ OBJC_PROTOCOL(MTLDepthStencilState);
 
 namespace WebCore {
 
-class GPUDevice;
-class GPUDepthStencilDescriptor;
+class GPULegacyDevice;
+class GPULegacyDepthStencilDescriptor;
 
-class GPUDepthStencilState {
+class GPULegacyDepthStencilState {
 public:
-    GPUDepthStencilState() = default;
-    GPUDepthStencilState(const GPUDevice&, const GPUDepthStencilDescriptor&);
-    ~GPUDepthStencilState();
+    GPULegacyDepthStencilState() = default;
+    GPULegacyDepthStencilState(const GPULegacyDevice&, const GPULegacyDepthStencilDescriptor&);
+    ~GPULegacyDepthStencilState();
 
     String label() const;
     void setLabel(const String&) const;
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUDevice.h"
+#include "GPULegacyDevice.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,9 +32,9 @@
 
 namespace WebCore {
 
-GPUDevice::~GPUDevice()
+GPULegacyDevice::~GPULegacyDevice()
 {
-    LOG(WebMetal, "GPUDevice::~GPUDevice()");
+    LOG(WebMetal, "GPULegacyDevice::~GPULegacyDevice()");
     disconnect();
 }
 
@@ -36,10 +36,10 @@ OBJC_PROTOCOL(MTLDevice);
 
 namespace WebCore {
 
-class GPUDevice {
+class GPULegacyDevice {
 public:
-    WEBCORE_EXPORT GPUDevice();
-    WEBCORE_EXPORT ~GPUDevice();
+    WEBCORE_EXPORT GPULegacyDevice();
+    WEBCORE_EXPORT ~GPULegacyDevice();
 
     WEBCORE_EXPORT bool operator!() const;
 
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUDrawable.h"
+#include "GPULegacyDrawable.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,9 +32,9 @@
 
 namespace WebCore {
 
-GPUDrawable::~GPUDrawable()
+GPULegacyDrawable::~GPULegacyDrawable()
 {
-    LOG(WebMetal, "GPUDrawable::~GPUDrawable()");
+    LOG(WebMetal, "GPULegacyDrawable::~GPULegacyDrawable()");
 }
 
 } // namespace WebCore
@@ -34,12 +34,12 @@ OBJC_PROTOCOL(MTLTexture);
 
 namespace WebCore {
 
-class GPUDevice;
+class GPULegacyDevice;
 
-class GPUDrawable {
+class GPULegacyDrawable {
 public:
-    explicit GPUDrawable(const GPUDevice&);
-    ~GPUDrawable();
+    explicit GPULegacyDrawable(const GPULegacyDevice&);
+    ~GPULegacyDrawable();
 
     void release();
 
@@ -29,7 +29,7 @@
 
 namespace WebCore {
 
-enum class GPUCompareFunction {
+enum class GPULegacyCompareFunction {
     Never = 0,
     Less = 1,
     Equal = 2,
diff --git a/Source/WebCore/platform/graphics/gpu/GPULegacyFunction.cpp b/Source/WebCore/platform/graphics/gpu/GPULegacyFunction.cpp
new file mode 100644 (file)
index 0000000..74d5425
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPULegacyFunction.h"
+
+#if ENABLE(WEBMETAL)
+
+#include "Logging.h"
+
+namespace WebCore {
+
+GPULegacyFunction::~GPULegacyFunction()
+{
+    LOG(WebMetal, "GPULegacyFunction::~GPULegacyFunction()");
+}
+
+} // namespace WebCore
+
+#endif
@@ -33,12 +33,12 @@ OBJC_PROTOCOL(MTLFunction);
 
 namespace WebCore {
 
-class GPULibrary;
+class GPULegacyLibrary;
 
-class GPUFunction {
+class GPULegacyFunction {
 public:
-    WEBCORE_EXPORT GPUFunction(const GPULibrary&, const String& name);
-    WEBCORE_EXPORT ~GPUFunction();
+    WEBCORE_EXPORT GPULegacyFunction(const GPULegacyLibrary&, const String& name);
+    WEBCORE_EXPORT ~GPULegacyFunction();
 
     bool operator!() const;
 
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUFunction.h"
+#include "GPULegacyLibrary.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,9 +32,9 @@
 
 namespace WebCore {
 
-GPUFunction::~GPUFunction()
+GPULegacyLibrary::~GPULegacyLibrary()
 {
-    LOG(WebMetal, "GPUFunction::~GPUFunction()");
+    LOG(WebMetal, "GPULegacyLibrary::~GPULegacyLibrary()");
 }
 
 } // namespace WebCore
@@ -33,12 +33,12 @@ OBJC_PROTOCOL(MTLLibrary);
 
 namespace WebCore {
 
-class GPUDevice;
+class GPULegacyDevice;
 
-class GPULibrary {
+class GPULegacyLibrary {
 public:
-    WEBCORE_EXPORT GPULibrary(const GPUDevice&, const String& sourceCode);
-    WEBCORE_EXPORT ~GPULibrary();
+    WEBCORE_EXPORT GPULegacyLibrary(const GPULegacyDevice&, const String& sourceCode);
+    WEBCORE_EXPORT ~GPULegacyLibrary();
 
     WEBCORE_EXPORT String label() const;
     WEBCORE_EXPORT void setLabel(const String&) const;
diff --git a/Source/WebCore/platform/graphics/gpu/GPULegacyRenderCommandEncoder.cpp b/Source/WebCore/platform/graphics/gpu/GPULegacyRenderCommandEncoder.cpp
new file mode 100644 (file)
index 0000000..a3e7487
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPULegacyRenderCommandEncoder.h"
+
+#if ENABLE(WEBMETAL)
+
+#include "Logging.h"
+
+namespace WebCore {
+
+GPULegacyRenderCommandEncoder::~GPULegacyRenderCommandEncoder()
+{
+    LOG(WebMetal, "GPULegacyRenderCommandEncoder::~GPULegacyRenderCommandEncoder()");
+}
+
+} // namespace WebCore
+
+#endif
@@ -33,21 +33,21 @@ OBJC_PROTOCOL(MTLRenderCommandEncoder);
 
 namespace WebCore {
 
-class GPUBuffer;
-class GPUCommandBuffer;
-class GPUDepthStencilState;
-class GPURenderPassDescriptor;
-class GPURenderPipelineState;
+class GPULegacyBuffer;
+class GPULegacyCommandBuffer;
+class GPULegacyDepthStencilState;
+class GPULegacyRenderPassDescriptor;
+class GPULegacyRenderPipelineState;
 
-class GPURenderCommandEncoder {
+class GPULegacyRenderCommandEncoder {
 public:
-    GPURenderCommandEncoder(const GPUCommandBuffer&, const GPURenderPassDescriptor&);
-    ~GPURenderCommandEncoder();
+    GPULegacyRenderCommandEncoder(const GPULegacyCommandBuffer&, const GPULegacyRenderPassDescriptor&);
+    ~GPULegacyRenderCommandEncoder();
 
-    void setRenderPipelineState(const GPURenderPipelineState&) const;
-    void setDepthStencilState(const GPUDepthStencilState&) const;
-    void setVertexBuffer(const GPUBuffer&, unsigned offset, unsigned index) const;
-    void setFragmentBuffer(const GPUBuffer&, unsigned offset, unsigned index) const;
+    void setRenderPipelineState(const GPULegacyRenderPipelineState&) const;
+    void setDepthStencilState(const GPULegacyDepthStencilState&) const;
+    void setVertexBuffer(const GPULegacyBuffer&, unsigned offset, unsigned index) const;
+    void setFragmentBuffer(const GPULegacyBuffer&, unsigned offset, unsigned index) const;
     void drawPrimitives(unsigned type, unsigned start, unsigned count) const;
     void endEncoding() const;
 
diff --git a/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassAttachmentDescriptor.cpp b/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassAttachmentDescriptor.cpp
new file mode 100644 (file)
index 0000000..9caf581
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPULegacyRenderPassAttachmentDescriptor.h"
+
+#if ENABLE(WEBMETAL)
+
+#include "GPULegacyTexture.h"
+#include "Logging.h"
+
+namespace WebCore {
+
+GPULegacyRenderPassAttachmentDescriptor::~GPULegacyRenderPassAttachmentDescriptor()
+{
+    LOG(WebMetal, "GPULegacyRenderPassAttachmentDescriptor::~GPULegacyRenderPassAttachmentDescriptor()");
+}
+
+} // namespace WebCore
+
+#endif
@@ -33,11 +33,11 @@ OBJC_CLASS MTLRenderPassAttachmentDescriptor;
 
 namespace WebCore {
 
-class GPUTexture;
+class GPULegacyTexture;
 
-class GPURenderPassAttachmentDescriptor {
+class GPULegacyRenderPassAttachmentDescriptor {
 public:
-    ~GPURenderPassAttachmentDescriptor();
+    ~GPULegacyRenderPassAttachmentDescriptor();
 
     unsigned loadAction() const;
     void setLoadAction(unsigned) const;
@@ -45,7 +45,7 @@ public:
     unsigned storeAction() const;
     void setStoreAction(unsigned) const;
 
-    void setTexture(const GPUTexture&) const;
+    void setTexture(const GPULegacyTexture&) const;
 
 #if USE(METAL)
     MTLRenderPassAttachmentDescriptor *metal() const;
@@ -53,7 +53,7 @@ public:
 
 #if USE(METAL)
 protected:
-    explicit GPURenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor *);
+    explicit GPULegacyRenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor *);
 
 private:
     RetainPtr<MTLRenderPassAttachmentDescriptor> m_metal;
diff --git a/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassColorAttachmentDescriptor.cpp b/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPassColorAttachmentDescriptor.cpp
new file mode 100644 (file)
index 0000000..ca82e94
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPULegacyRenderPassColorAttachmentDescriptor.h"
+
+#if ENABLE(WEBMETAL)
+
+#include "Logging.h"
+
+namespace WebCore {
+
+GPULegacyRenderPassColorAttachmentDescriptor::~GPULegacyRenderPassColorAttachmentDescriptor()
+{
+    LOG(WebMetal, "GPULegacyRenderPassColorAttachmentDescriptor::~GPULegacyRenderPassColorAttachmentDescriptor()");
+}
+
+} // namespace WebCore
+
+#endif
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPassAttachmentDescriptor.h"
+#include "GPULegacyRenderPassAttachmentDescriptor.h"
 
 OBJC_CLASS MTLRenderPassColorAttachmentDescriptor;
 
 namespace WebCore {
 
-class GPURenderPassColorAttachmentDescriptor : public GPURenderPassAttachmentDescriptor {
+class GPULegacyRenderPassColorAttachmentDescriptor : public GPULegacyRenderPassAttachmentDescriptor {
 public:
 #if USE(METAL)
-    GPURenderPassColorAttachmentDescriptor(MTLRenderPassColorAttachmentDescriptor *);
+    GPULegacyRenderPassColorAttachmentDescriptor(MTLRenderPassColorAttachmentDescriptor *);
 #endif
-    ~GPURenderPassColorAttachmentDescriptor();
+    ~GPULegacyRenderPassColorAttachmentDescriptor();
 
     Vector<float> clearColor() const;
     void setClearColor(const Vector<float>&) const;
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPURenderPassDepthAttachmentDescriptor.h"
+#include "GPULegacyRenderPassDepthAttachmentDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor()
+GPULegacyRenderPassDepthAttachmentDescriptor::~GPULegacyRenderPassDepthAttachmentDescriptor()
 {
     LOG(WebMetal, "GPURenderPassDepthAttachmentDescriptor::~GPURenderPassDepthAttachmentDescriptor()");
 }
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPassAttachmentDescriptor.h"
+#include "GPULegacyRenderPassAttachmentDescriptor.h"
 
 OBJC_CLASS MTLRenderPassDepthAttachmentDescriptor;
 
 namespace WebCore {
 
-class GPURenderPassDepthAttachmentDescriptor : public GPURenderPassAttachmentDescriptor {
+class GPULegacyRenderPassDepthAttachmentDescriptor : public GPULegacyRenderPassAttachmentDescriptor {
 public:
 #if USE(METAL)
-    GPURenderPassDepthAttachmentDescriptor(MTLRenderPassDepthAttachmentDescriptor *);
+    GPULegacyRenderPassDepthAttachmentDescriptor(MTLRenderPassDepthAttachmentDescriptor *);
 #endif
-    ~GPURenderPassDepthAttachmentDescriptor();
+    ~GPULegacyRenderPassDepthAttachmentDescriptor();
 
     double clearDepth() const;
     void setClearDepth(double) const;
  */
 
 #include "config.h"
-#include "GPURenderPassDescriptor.h"
+#include "GPULegacyRenderPassDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
-#include "GPURenderPassDepthAttachmentDescriptor.h"
+#include "GPULegacyRenderPassDepthAttachmentDescriptor.h"
 #include "Logging.h"
 
 namespace WebCore {
 
-GPURenderPassDescriptor::~GPURenderPassDescriptor()
+GPULegacyRenderPassDescriptor::~GPULegacyRenderPassDescriptor()
 {
     LOG(WebMetal, "GPURenderPassDescriptor::~GPURenderPassDescriptor()");
 }
@@ -33,16 +33,16 @@ OBJC_CLASS MTLRenderPassDescriptor;
 
 namespace WebCore {
 
-class GPURenderPassColorAttachmentDescriptor;
-class GPURenderPassDepthAttachmentDescriptor;
+class GPULegacyRenderPassColorAttachmentDescriptor;
+class GPULegacyRenderPassDepthAttachmentDescriptor;
 
-class GPURenderPassDescriptor {
+class GPULegacyRenderPassDescriptor {
 public:
-    GPURenderPassDescriptor();
-    ~GPURenderPassDescriptor();
+    GPULegacyRenderPassDescriptor();
+    ~GPULegacyRenderPassDescriptor();
 
-    Vector<GPURenderPassColorAttachmentDescriptor> colorAttachments() const;
-    GPURenderPassDepthAttachmentDescriptor depthAttachment() const;
+    Vector<GPULegacyRenderPassColorAttachmentDescriptor> colorAttachments() const;
+    GPULegacyRenderPassDepthAttachmentDescriptor depthAttachment() const;
 
 #if USE(METAL)
     MTLRenderPassDescriptor *metal() const;
diff --git a/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp b/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineColorAttachmentDescriptor.cpp
new file mode 100644 (file)
index 0000000..a8e6e12
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
+
+#if ENABLE(WEBMETAL)
+
+#include "Logging.h"
+
+namespace WebCore {
+
+GPULegacyRenderPipelineColorAttachmentDescriptor::~GPULegacyRenderPipelineColorAttachmentDescriptor()
+{
+    LOG(WebMetal, "GPULegacyRenderPipelineColorAttachmentDescriptor::~GPULegacyRenderPipelineColorAttachmentDescriptor()");
+}
+
+} // namespace WebCore
+
+#endif
@@ -33,12 +33,12 @@ OBJC_CLASS MTLRenderPipelineColorAttachmentDescriptor;
 
 namespace WebCore {
 
-class GPURenderPipelineColorAttachmentDescriptor {
+class GPULegacyRenderPipelineColorAttachmentDescriptor {
 public:
 #if USE(METAL)
-    GPURenderPipelineColorAttachmentDescriptor(MTLRenderPipelineColorAttachmentDescriptor *);
+    GPULegacyRenderPipelineColorAttachmentDescriptor(MTLRenderPipelineColorAttachmentDescriptor *);
 #endif
-    ~GPURenderPipelineColorAttachmentDescriptor();
+    ~GPULegacyRenderPipelineColorAttachmentDescriptor();
 
     unsigned pixelFormat() const;
     void setPixelFormat(unsigned) const;
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPURenderPipelineDescriptor.h"
+#include "GPULegacyRenderPipelineDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor()
+GPULegacyRenderPipelineDescriptor::~GPULegacyRenderPipelineDescriptor()
 {
     LOG(WebMetal, "GPURenderPipelineDescriptor::~GPURenderPipelineDescriptor()");
 }
@@ -33,21 +33,21 @@ OBJC_CLASS MTLRenderPipelineDescriptor;
 
 namespace WebCore {
 
-class GPUFunction;
-class GPURenderPipelineColorAttachmentDescriptor;
+class GPULegacyFunction;
+class GPULegacyRenderPipelineColorAttachmentDescriptor;
 
-class GPURenderPipelineDescriptor {
+class GPULegacyRenderPipelineDescriptor {
 public:
-    GPURenderPipelineDescriptor();
-    ~GPURenderPipelineDescriptor();
+    GPULegacyRenderPipelineDescriptor();
+    ~GPULegacyRenderPipelineDescriptor();
 
-    void setVertexFunction(const GPUFunction&) const;
-    void setFragmentFunction(const GPUFunction&) const;
+    void setVertexFunction(const GPULegacyFunction&) const;
+    void setFragmentFunction(const GPULegacyFunction&) const;
 
     unsigned depthAttachmentPixelFormat() const;
     void setDepthAttachmentPixelFormat(unsigned) const;
 
-    Vector<GPURenderPipelineColorAttachmentDescriptor> colorAttachments() const;
+    Vector<GPULegacyRenderPipelineColorAttachmentDescriptor> colorAttachments() const;
 
     void reset() const;
 
diff --git a/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineState.cpp b/Source/WebCore/platform/graphics/gpu/GPULegacyRenderPipelineState.cpp
new file mode 100644 (file)
index 0000000..1e4f9c6
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPULegacyRenderPipelineState.h"
+
+#if ENABLE(WEBMETAL)
+
+#include "Logging.h"
+
+namespace WebCore {
+
+GPULegacyRenderPipelineState::~GPULegacyRenderPipelineState()
+{
+    LOG(WebMetal, "GPULegacyRenderPipelineState::~GPULegacyRenderPipelineState()");
+}
+
+} // namespace WebCore
+
+#endif
@@ -33,14 +33,14 @@ OBJC_PROTOCOL(MTLRenderPipelineState);
 
 namespace WebCore {
 
-class GPUDevice;
-class GPURenderPipelineDescriptor;
+class GPULegacyDevice;
+class GPULegacyRenderPipelineDescriptor;
 
-class GPURenderPipelineState {
+class GPULegacyRenderPipelineState {
 public:
-    GPURenderPipelineState() = default;
-    GPURenderPipelineState(const GPUDevice&, const GPURenderPipelineDescriptor&);
-    ~GPURenderPipelineState();
+    GPULegacyRenderPipelineState() = default;
+    GPULegacyRenderPipelineState(const GPULegacyDevice&, const GPULegacyRenderPipelineDescriptor&);
+    ~GPULegacyRenderPipelineState();
 
     String label() const;
     void setLabel(const String&) const;
@@ -29,7 +29,7 @@
 
 namespace WebCore {
     
-struct GPUSize {
+struct GPULegacySize {
     unsigned width;
     unsigned height;
     unsigned depth;
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUCommandQueue.h"
+#include "GPULegacyTexture.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,9 +32,9 @@
 
 namespace WebCore {
 
-GPUCommandQueue::~GPUCommandQueue()
+GPULegacyTexture::~GPULegacyTexture()
 {
-    LOG(WebMetal, "GPUCommandQueue::~GPUCommandQueue()");
+    LOG(WebMetal, "GPULegacyTexture::~GPULegacyTexture()");
 }
 
 } // namespace WebCore
@@ -33,15 +33,15 @@ OBJC_PROTOCOL(MTLTexture);
 
 namespace WebCore {
 
-class GPUDevice;
-class GPUDrawable;
-class GPUTextureDescriptor;
+class GPULegacyDevice;
+class GPULegacyDrawable;
+class GPULegacyTextureDescriptor;
 
-class GPUTexture {
+class GPULegacyTexture {
 public:
-    GPUTexture(const GPUDevice&, const GPUTextureDescriptor&);
-    explicit GPUTexture(const GPUDrawable&);
-    ~GPUTexture();
+    GPULegacyTexture(const GPULegacyDevice&, const GPULegacyTextureDescriptor&);
+    explicit GPULegacyTexture(const GPULegacyDrawable&);
+    ~GPULegacyTexture();
 
     unsigned width() const;
     unsigned height() const;
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "GPUTextureDescriptor.h"
+#include "GPULegacyTextureDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
@@ -32,7 +32,7 @@
 
 namespace WebCore {
 
-GPUTextureDescriptor::~GPUTextureDescriptor()
+GPULegacyTextureDescriptor::~GPULegacyTextureDescriptor()
 {
     LOG(WebMetal, "GPUTextureDescriptor::~GPUTextureDescriptor()");
 }
@@ -33,10 +33,10 @@ OBJC_CLASS MTLTextureDescriptor;
 
 namespace WebCore {
 
-class GPUTextureDescriptor {
+class GPULegacyTextureDescriptor {
 public:
-    GPUTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
-    ~GPUTextureDescriptor();
+    GPULegacyTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped);
+    ~GPULegacyTextureDescriptor();
 
     unsigned width() const;
     void setWidth(unsigned) const;
diff --git a/Source/WebCore/platform/graphics/gpu/GPULibrary.cpp b/Source/WebCore/platform/graphics/gpu/GPULibrary.cpp
deleted file mode 100644 (file)
index 48c6c3c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GPULibrary.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "Logging.h"
-
-namespace WebCore {
-
-GPULibrary::~GPULibrary()
-{
-    LOG(WebMetal, "GPULibrary::~GPULibrary()");
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/platform/graphics/gpu/GPURenderCommandEncoder.cpp b/Source/WebCore/platform/graphics/gpu/GPURenderCommandEncoder.cpp
deleted file mode 100644 (file)
index 47461a8..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GPURenderCommandEncoder.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "Logging.h"
-
-namespace WebCore {
-
-GPURenderCommandEncoder::~GPURenderCommandEncoder()
-{
-    LOG(WebMetal, "GPURenderCommandEncoder::~GPURenderCommandEncoder()");
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp b/Source/WebCore/platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp
deleted file mode 100644 (file)
index 7162f7f..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GPURenderPassAttachmentDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "GPUTexture.h"
-#include "Logging.h"
-
-namespace WebCore {
-
-GPURenderPassAttachmentDescriptor::~GPURenderPassAttachmentDescriptor()
-{
-    LOG(WebMetal, "GPURenderPassAttachmentDescriptor::~GPURenderPassAttachmentDescriptor()");
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp b/Source/WebCore/platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp
deleted file mode 100644 (file)
index dfb1559..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GPURenderPassColorAttachmentDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "Logging.h"
-
-namespace WebCore {
-
-GPURenderPassColorAttachmentDescriptor::~GPURenderPassColorAttachmentDescriptor()
-{
-    LOG(WebMetal, "GPURenderPassColorAttachmentDescriptor::~GPURenderPassColorAttachmentDescriptor()");
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp b/Source/WebCore/platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp
deleted file mode 100644 (file)
index d83ba11..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GPURenderPipelineColorAttachmentDescriptor.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "Logging.h"
-
-namespace WebCore {
-
-GPURenderPipelineColorAttachmentDescriptor::~GPURenderPipelineColorAttachmentDescriptor()
-{
-    LOG(WebMetal, "GPURenderPipelineColorAttachmentDescriptor::~GPURenderPipelineColorAttachmentDescriptor()");
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/platform/graphics/gpu/GPURenderPipelineState.cpp b/Source/WebCore/platform/graphics/gpu/GPURenderPipelineState.cpp
deleted file mode 100644 (file)
index aab2b3e..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GPURenderPipelineState.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "Logging.h"
-
-namespace WebCore {
-
-GPURenderPipelineState::~GPURenderPipelineState()
-{
-    LOG(WebMetal, "GPURenderPipelineState::~GPURenderPipelineState()");
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/platform/graphics/gpu/GPUTexture.cpp b/Source/WebCore/platform/graphics/gpu/GPUTexture.cpp
deleted file mode 100644 (file)
index bf11469..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GPUTexture.h"
-
-#if ENABLE(WEBMETAL)
-
-#include "Logging.h"
-
-namespace WebCore {
-
-GPUTexture::~GPUTexture()
-{
-    LOG(WebMetal, "GPUTexture::~GPUTexture()");
-}
-
-} // namespace WebCore
-
-#endif
  */
 
 #import "config.h"
-#import "GPUBuffer.h"
+#import "GPULegacyBuffer.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDevice.h"
+#import "GPULegacyDevice.h"
 #import "Logging.h"
 #import <JavaScriptCore/ArrayBufferView.h>
 #import <Metal/Metal.h>
@@ -37,7 +37,7 @@
 
 namespace WebCore {
 
-GPUBuffer::GPUBuffer(const GPUDevice& device, const JSC::ArrayBufferView& data)
+GPULegacyBuffer::GPULegacyBuffer(const GPULegacyDevice& device, const JSC::ArrayBufferView& data)
 {
     LOG(WebMetal, "GPUBuffer::GPUBuffer()");
 
  */
 
 #import "config.h"
-#import "GPUCommandBuffer.h"
+#import "GPULegacyCommandBuffer.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUCommandQueue.h"
-#import "GPUDrawable.h"
+#import "GPULegacyCommandQueue.h"
+#import "GPULegacyDrawable.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 #import <wtf/BlockPtr.h>
@@ -37,7 +37,7 @@
 
 namespace WebCore {
 
-GPUCommandBuffer::GPUCommandBuffer(const GPUCommandQueue& queue, Function<void()>&& completedCallback)
+GPULegacyCommandBuffer::GPULegacyCommandBuffer(const GPULegacyCommandQueue& queue, Function<void()>&& completedCallback)
     : m_metal { [queue.metal() commandBuffer] }
 {
     LOG(WebMetal, "GPUCommandBuffer::GPUCommandBuffer()");
@@ -47,7 +47,7 @@ GPUCommandBuffer::GPUCommandBuffer(const GPUCommandQueue& queue, Function<void()
     }).get()];
 }
 
-void GPUCommandBuffer::presentDrawable(GPUDrawable& drawable) const
+void GPULegacyCommandBuffer::presentDrawable(GPULegacyDrawable& drawable) const
 {
     if (!m_metal || !drawable.metal())
         return;
@@ -56,7 +56,7 @@ void GPUCommandBuffer::presentDrawable(GPUDrawable& drawable) const
     drawable.release();
 }
 
-void GPUCommandBuffer::commit() const
+void GPULegacyCommandBuffer::commit() const
 {
     [m_metal commit];
 }
  */
 
 #import "config.h"
-#import "GPUCommandQueue.h"
+#import "GPULegacyCommandQueue.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDevice.h"
+#import "GPULegacyDevice.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 #import <wtf/text/WTFString.h>
@@ -38,15 +38,15 @@ namespace WebCore {
 static NSString * const commandQueueDefaultLabel = @"com.apple.WebKit";
 static NSString * const commandQueueLabelPrefix = @"com.apple.WebKit.";
 
-GPUCommandQueue::GPUCommandQueue(const GPUDevice& device)
+GPULegacyCommandQueue::GPULegacyCommandQueue(const GPULegacyDevice& device)
     : m_metal { adoptNS([device.metal() newCommandQueue]) }
 {
-    LOG(WebMetal, "GPUCommandQueue::GPUCommandQueue()");
+    LOG(WebMetal, "GPULegacyCommandQueue::GPULegacyCommandQueue()");
 
     [m_metal setLabel:commandQueueDefaultLabel];
 }
 
-String GPUCommandQueue::label() const
+String GPULegacyCommandQueue::label() const
 {
     if (!m_metal)
         return emptyString();
@@ -60,7 +60,7 @@ String GPUCommandQueue::label() const
     return [prefixedLabel substringFromIndex:commandQueueLabelPrefix.length];
 }
 
-void GPUCommandQueue::setLabel(const String& label) const
+void GPULegacyCommandQueue::setLabel(const String& label) const
 {
     if (label.isEmpty())
         [m_metal setLabel:commandQueueDefaultLabel];
  */
 
 #import "config.h"
-#import "GPUComputeCommandEncoder.h"
+#import "GPULegacyComputeCommandEncoder.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUBuffer.h"
-#import "GPUCommandBuffer.h"
-#import "GPUComputePipelineState.h"
-#import "GPUSize.h"
+#import "GPULegacyBuffer.h"
+#import "GPULegacyCommandBuffer.h"
+#import "GPULegacyComputePipelineState.h"
+#import "GPULegacySize.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 
 namespace WebCore {
 
-static inline MTLSize MTLSizeMake(GPUSize size)
+static inline MTLSize MTLSizeMake(GPULegacySize size)
 {
     return { size.width, size.height, size.depth };
 }
 
-GPUComputeCommandEncoder::GPUComputeCommandEncoder(const GPUCommandBuffer& buffer)
+GPULegacyComputeCommandEncoder::GPULegacyComputeCommandEncoder(const GPULegacyCommandBuffer& buffer)
     : m_metal { [buffer.metal() computeCommandEncoder] }
 {
-    LOG(WebMetal, "GPUComputeCommandEncoder::GPUComputeCommandEncoder()");
+    LOG(WebMetal, "GPULegacyComputeCommandEncoder::GPULegacyComputeCommandEncoder()");
 }
 
-void GPUComputeCommandEncoder::setComputePipelineState(const GPUComputePipelineState& computePipelineState) const
+void GPULegacyComputeCommandEncoder::setComputePipelineState(const GPULegacyComputePipelineState& computePipelineState) const
 {
     if (!computePipelineState.metal())
         return;
@@ -56,7 +56,7 @@ void GPUComputeCommandEncoder::setComputePipelineState(const GPUComputePipelineS
     [m_metal setComputePipelineState:computePipelineState.metal()];
 }
     
-void GPUComputeCommandEncoder::setBuffer(const GPUBuffer& buffer, unsigned offset, unsigned index) const
+void GPULegacyComputeCommandEncoder::setBuffer(const GPULegacyBuffer& buffer, unsigned offset, unsigned index) const
 {
     if (!buffer.metal())
         return;
@@ -64,12 +64,12 @@ void GPUComputeCommandEncoder::setBuffer(const GPUBuffer& buffer, unsigned offse
     [m_metal setBuffer:buffer.metal() offset:offset atIndex:index];
 }
     
-void GPUComputeCommandEncoder::dispatch(GPUSize threadgroupsPerGrid, GPUSize threadsPerThreadgroup) const
+void GPULegacyComputeCommandEncoder::dispatch(GPULegacySize threadgroupsPerGrid, GPULegacySize threadsPerThreadgroup) const
 {
     [m_metal dispatchThreadgroups:MTLSizeMake(threadgroupsPerGrid) threadsPerThreadgroup:MTLSizeMake(threadsPerThreadgroup)];
 }
 
-void GPUComputeCommandEncoder::endEncoding() const
+void GPULegacyComputeCommandEncoder::endEncoding() const
 {
     [m_metal endEncoding];
 }
  */
 
 #import "config.h"
-#import "GPUComputePipelineState.h"
+#import "GPULegacyComputePipelineState.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDevice.h"
-#import "GPUFunction.h"
+#import "GPULegacyDevice.h"
+#import "GPULegacyFunction.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 
 namespace WebCore {
 
-GPUComputePipelineState::GPUComputePipelineState(const GPUDevice& device, const GPUFunction& function)
+GPULegacyComputePipelineState::GPULegacyComputePipelineState(const GPULegacyDevice& device, const GPULegacyFunction& function)
 {
-    LOG(WebMetal, "GPUComputePipelineState::GPUComputePipelineState()");
+    LOG(WebMetal, "GPULegacyComputePipelineState::GPULegacyComputePipelineState()");
 
     if (!function.metal())
         return;
  */
 
 #import "config.h"
-#import "GPUDepthStencilDescriptor.h"
+#import "GPULegacyDepthStencilDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUEnums.h"
+#import "GPULegacyEnums.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 
 namespace WebCore {
 
-GPUDepthStencilDescriptor::GPUDepthStencilDescriptor()
+GPULegacyDepthStencilDescriptor::GPULegacyDepthStencilDescriptor()
     : m_metal { adoptNS([MTLDepthStencilDescriptor new]) }
 {
     LOG(WebMetal, "GPUDepthStencilDescriptor::GPUDepthStencilDescriptor()");
 }
 
-bool GPUDepthStencilDescriptor::depthWriteEnabled() const
+bool GPULegacyDepthStencilDescriptor::depthWriteEnabled() const
 {
     return [m_metal isDepthWriteEnabled];
 }
 
-void GPUDepthStencilDescriptor::setDepthWriteEnabled(bool newDepthWriteEnabled) const
+void GPULegacyDepthStencilDescriptor::setDepthWriteEnabled(bool newDepthWriteEnabled) const
 {
     [m_metal setDepthWriteEnabled:newDepthWriteEnabled];
 }
 
-GPUCompareFunction GPUDepthStencilDescriptor::depthCompareFunction() const
+GPULegacyCompareFunction GPULegacyDepthStencilDescriptor::depthCompareFunction() const
 {
-    return static_cast<GPUCompareFunction>([m_metal depthCompareFunction]);
+    return static_cast<GPULegacyCompareFunction>([m_metal depthCompareFunction]);
 }
 
-void GPUDepthStencilDescriptor::setDepthCompareFunction(GPUCompareFunction newFunction) const
+void GPULegacyDepthStencilDescriptor::setDepthCompareFunction(GPULegacyCompareFunction newFunction) const
 {
     // FIXME: Do we need to check if the function value is in range before casting to MTLCompareFunction?
     [m_metal setDepthCompareFunction:static_cast<MTLCompareFunction>(newFunction)];
  */
 
 #import "config.h"
-#import "GPUDepthStencilState.h"
+#import "GPULegacyDepthStencilState.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDepthStencilDescriptor.h"
-#import "GPUDevice.h"
+#import "GPULegacyDepthStencilDescriptor.h"
+#import "GPULegacyDevice.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 #import <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-GPUDepthStencilState::GPUDepthStencilState(const GPUDevice& device, const GPUDepthStencilDescriptor& descriptor)
+GPULegacyDepthStencilState::GPULegacyDepthStencilState(const GPULegacyDevice& device, const GPULegacyDepthStencilDescriptor& descriptor)
     : m_metal { adoptNS([device.metal() newDepthStencilStateWithDescriptor:descriptor.metal()]) }
 {
-    LOG(WebMetal, "GPUDepthStencilState::GPUDepthStencilState()");
+    LOG(WebMetal, "GPULegacyDepthStencilState::GPULegacyDepthStencilState()");
 }
 
-String GPUDepthStencilState::label() const
+String GPULegacyDepthStencilState::label() const
 {
     if (!m_metal)
         return emptyString();
@@ -50,7 +50,7 @@ String GPUDepthStencilState::label() const
     return [m_metal label];
 }
 
-void GPUDepthStencilState::setLabel(const String&) const
+void GPULegacyDepthStencilState::setLabel(const String&) const
 {
     // FIXME: The MTLDepthStencilState protocol does not allow setting the label.
     // The label has to be set on the descriptor when creating the state object.
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "GPUDevice.h"
+#import "GPULegacyDevice.h"
 
 #if ENABLE(WEBMETAL)
 
 
 namespace WebCore {
 
-GPUDevice::GPUDevice()
+GPULegacyDevice::GPULegacyDevice()
     : m_metal { adoptNS(MTLCreateSystemDefaultDevice()) }
 {
 
     if (!m_metal) {
-        LOG(WebMetal, "GPUDevice::GPUDevice -- could not create the device. This usually means Metal is not available on this hardware.");
+        LOG(WebMetal, "GPULegacyDevice::GPULegacyDevice -- could not create the device. This usually means Metal is not available on this hardware.");
         return;
     }
 
-    LOG(WebMetal, "GPUDevice::GPUDevice Metal device is %p", m_metal.get());
+    LOG(WebMetal, "GPULegacyDevice::GPULegacyDevice Metal device is %p", m_metal.get());
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS
 
@@ -61,13 +61,13 @@ GPUDevice::GPUDevice()
     END_BLOCK_OBJC_EXCEPTIONS
 }
 
-void GPUDevice::disconnect()
+void GPULegacyDevice::disconnect()
 {
     m_layer.get().context = nullptr;
     // FIXME: Should we also clear out the device property, which has the MTLDevice?
 }
 
-void GPUDevice::reshape(int width, int height) const
+void GPULegacyDevice::reshape(int width, int height) const
 {
     [m_layer setBounds:CGRectMake(0, 0, width, height)];
     [m_layer setDrawableSize:CGSizeMake(width, height)];
@@ -75,12 +75,12 @@ void GPUDevice::reshape(int width, int height) const
     // FIXME: WebMetal - Lots of reshape stuff should go here. See GC3D.
 }
 
-CALayer *GPUDevice::platformLayer() const
+CALayer *GPULegacyDevice::platformLayer() const
 {
     return m_layer.get();
 }
 
-bool GPUDevice::operator!() const
+bool GPULegacyDevice::operator!() const
 {
     return !m_metal;
 }
  */
 
 #import "config.h"
-#import "GPUDrawable.h"
+#import "GPULegacyDrawable.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDevice.h"
+#import "GPULegacyDevice.h"
 #import "Logging.h"
 #import "WebMetalLayer.h"
 
 namespace WebCore {
 
-GPUDrawable::GPUDrawable(const GPUDevice& device)
+GPULegacyDrawable::GPULegacyDrawable(const GPULegacyDevice& device)
     : m_metal { [device.layer() nextDrawable] }
 {
-    LOG(WebMetal, "GPUDrawable::GPUDrawable()");
+    LOG(WebMetal, "GPULegacyDrawable::GPULegacyDrawable()");
 }
 
-void GPUDrawable::release()
+void GPULegacyDrawable::release()
 {
-    LOG(WebMetal, "GPUDrawable::release()");
+    LOG(WebMetal, "GPULegacyDrawable::release()");
     m_metal = nil;
 }
     
-MTLDrawable *GPUDrawable::metal() const
+MTLDrawable *GPULegacyDrawable::metal() const
 {
     return m_metal.get();
 }
 
-MTLTexture *GPUDrawable::texture() const
+MTLTexture *GPULegacyDrawable::texture() const
 {
     if (![m_metal conformsToProtocol:@protocol(CAMetalDrawable)]) {
         ASSERT(!m_metal);
  */
 
 #import "config.h"
-#import "GPUFunction.h"
+#import "GPULegacyFunction.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPULibrary.h"
+#import "GPULegacyLibrary.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 #import <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-GPUFunction::GPUFunction(const GPULibrary& library, const String& name)
+GPULegacyFunction::GPULegacyFunction(const GPULegacyLibrary& library, const String& name)
     : m_metal { adoptNS([library.metal() newFunctionWithName:name]) }
 {
-    LOG(WebMetal, "GPUFunction::GPUFunction()");
+    LOG(WebMetal, "GPULegacyFunction::GPULegacyFunction()");
 }
 
-String GPUFunction::name() const
+String GPULegacyFunction::name() const
 {
     if (!m_metal)
         return emptyString();
@@ -49,7 +49,7 @@ String GPUFunction::name() const
     return [m_metal name];
 }
 
-bool GPUFunction::operator!() const
+bool GPULegacyFunction::operator!() const
 {
     return !m_metal;
 }
  */
 
 #import "config.h"
-#import "GPULibrary.h"
+#import "GPULegacyLibrary.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDevice.h"
+#import "GPULegacyDevice.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 #import <wtf/Vector.h>
@@ -36,9 +36,9 @@
 
 namespace WebCore {
 
-GPULibrary::GPULibrary(const GPUDevice& device, const String& sourceCode)
+GPULegacyLibrary::GPULegacyLibrary(const GPULegacyDevice& device, const String& sourceCode)
 {
-    LOG(WebMetal, "GPULibrary::GPULibrary()");
+    LOG(WebMetal, "GPULegacyLibrary::GPULegacyLibrary()");
 
     if (!device.metal())
         return;
@@ -49,7 +49,7 @@ GPULibrary::GPULibrary(const GPUDevice& device, const String& sourceCode)
         LOG(WebMetal, "Compilation error: %s", [[error localizedDescription] UTF8String]);
 }
 
-String GPULibrary::label() const
+String GPULegacyLibrary::label() const
 {
     if (!m_metal)
         return emptyString();
@@ -57,13 +57,13 @@ String GPULibrary::label() const
     return [m_metal label];
 }
 
-void GPULibrary::setLabel(const String& label) const
+void GPULegacyLibrary::setLabel(const String& label) const
 {
     ASSERT(m_metal);
     [m_metal setLabel:label];
 }
 
-Vector<String> GPULibrary::functionNames() const
+Vector<String> GPULegacyLibrary::functionNames() const
 {
     auto array = [m_metal functionNames];
     Vector<String> vector;
  */
 
 #import "config.h"
-#import "GPURenderCommandEncoder.h"
+#import "GPULegacyRenderCommandEncoder.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUBuffer.h"
-#import "GPUCommandBuffer.h"
-#import "GPUDepthStencilState.h"
-#import "GPURenderPassDescriptor.h"
-#import "GPURenderPipelineState.h"
+#import "GPULegacyBuffer.h"
+#import "GPULegacyCommandBuffer.h"
+#import "GPULegacyDepthStencilState.h"
+#import "GPULegacyRenderPassDescriptor.h"
+#import "GPULegacyRenderPipelineState.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 
 namespace WebCore {
 
-GPURenderCommandEncoder::GPURenderCommandEncoder(const GPUCommandBuffer& buffer, const GPURenderPassDescriptor& descriptor)
+GPULegacyRenderCommandEncoder::GPULegacyRenderCommandEncoder(const GPULegacyCommandBuffer& buffer, const GPULegacyRenderPassDescriptor& descriptor)
 {
-    LOG(WebMetal, "GPURenderCommandEncoder::GPURenderCommandEncoder()");
+    LOG(WebMetal, "GPULegacyRenderCommandEncoder::GPULegacyRenderCommandEncoder()");
 
     if (!descriptor.metal())
         return;
@@ -48,7 +48,7 @@ GPURenderCommandEncoder::GPURenderCommandEncoder(const GPUCommandBuffer& buffer,
     m_metal = [buffer.metal() renderCommandEncoderWithDescriptor:descriptor.metal()];
 }
 
-void GPURenderCommandEncoder::setRenderPipelineState(const GPURenderPipelineState& renderPipelineState) const
+void GPULegacyRenderCommandEncoder::setRenderPipelineState(const GPULegacyRenderPipelineState& renderPipelineState) const
 {
     if (!renderPipelineState.metal())
         return;
@@ -56,7 +56,7 @@ void GPURenderCommandEncoder::setRenderPipelineState(const GPURenderPipelineStat
     [m_metal setRenderPipelineState:renderPipelineState.metal()];
 }
 
-void GPURenderCommandEncoder::setDepthStencilState(const GPUDepthStencilState& depthStencilState) const
+void GPULegacyRenderCommandEncoder::setDepthStencilState(const GPULegacyDepthStencilState& depthStencilState) const
 {
     if (!depthStencilState.metal())
         return;
@@ -64,7 +64,7 @@ void GPURenderCommandEncoder::setDepthStencilState(const GPUDepthStencilState& d
     [m_metal setDepthStencilState:depthStencilState.metal()];
 }
 
-void GPURenderCommandEncoder::setVertexBuffer(const GPUBuffer& buffer, unsigned offset, unsigned index) const
+void GPULegacyRenderCommandEncoder::setVertexBuffer(const GPULegacyBuffer& buffer, unsigned offset, unsigned index) const
 {
     if (!buffer.metal())
         return;
@@ -72,7 +72,7 @@ void GPURenderCommandEncoder::setVertexBuffer(const GPUBuffer& buffer, unsigned
     [m_metal setVertexBuffer:buffer.metal() offset:offset atIndex:index];
 }
 
-void GPURenderCommandEncoder::setFragmentBuffer(const GPUBuffer& buffer, unsigned offset, unsigned index) const
+void GPULegacyRenderCommandEncoder::setFragmentBuffer(const GPULegacyBuffer& buffer, unsigned offset, unsigned index) const
 {
     if (!buffer.metal())
         return;
@@ -80,7 +80,7 @@ void GPURenderCommandEncoder::setFragmentBuffer(const GPUBuffer& buffer, unsigne
     [m_metal setFragmentBuffer:buffer.metal() offset:offset atIndex:index];
 }
 
-void GPURenderCommandEncoder::drawPrimitives(unsigned type, unsigned start, unsigned count) const
+void GPULegacyRenderCommandEncoder::drawPrimitives(unsigned type, unsigned start, unsigned count) const
 {
     // FIXME: Why do we need a specially optimized path for count of 0?
     if (!count)
@@ -89,7 +89,7 @@ void GPURenderCommandEncoder::drawPrimitives(unsigned type, unsigned start, unsi
     [m_metal drawPrimitives:static_cast<MTLPrimitiveType>(type) vertexStart:start vertexCount:count];
 }
 
-void GPURenderCommandEncoder::endEncoding() const
+void GPULegacyRenderCommandEncoder::endEncoding() const
 {
     [m_metal endEncoding];
 }
  */
 
 #import "config.h"
-#import "GPURenderPassAttachmentDescriptor.h"
+#import "GPULegacyRenderPassAttachmentDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUTexture.h"
+#import "GPULegacyTexture.h"
 #import "Logging.h"
 
 #import <Metal/Metal.h>
 
 namespace WebCore {
 
-GPURenderPassAttachmentDescriptor::GPURenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor *metal)
+GPULegacyRenderPassAttachmentDescriptor::GPULegacyRenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor *metal)
     : m_metal { metal }
 {
-    LOG(WebMetal, "GPURenderPassAttachmentDescriptor::GPURenderPassAttachmentDescriptor()");
+    LOG(WebMetal, "GPULegacyRenderPassAttachmentDescriptor::GPULegacyRenderPassAttachmentDescriptor()");
 }
 
-unsigned GPURenderPassAttachmentDescriptor::loadAction() const
+unsigned GPULegacyRenderPassAttachmentDescriptor::loadAction() const
 {
     return [m_metal loadAction];
 }
 
-void GPURenderPassAttachmentDescriptor::setLoadAction(unsigned newLoadAction) const
+void GPULegacyRenderPassAttachmentDescriptor::setLoadAction(unsigned newLoadAction) const
 {
     // FIXME: Should this range check for legitimate values?
     [m_metal setLoadAction:static_cast<MTLLoadAction>(newLoadAction)];
 }
 
-unsigned GPURenderPassAttachmentDescriptor::storeAction() const
+unsigned GPULegacyRenderPassAttachmentDescriptor::storeAction() const
 {
     return [m_metal storeAction];
 }
 
-void GPURenderPassAttachmentDescriptor::setStoreAction(unsigned newStoreAction) const
+void GPULegacyRenderPassAttachmentDescriptor::setStoreAction(unsigned newStoreAction) const
 {
     // FIXME: Should this range check for legitimate values?
     [m_metal setStoreAction:static_cast<MTLStoreAction>(newStoreAction)];
 }
 
-void GPURenderPassAttachmentDescriptor::setTexture(const GPUTexture& texture) const
+void GPULegacyRenderPassAttachmentDescriptor::setTexture(const GPULegacyTexture& texture) const
 {
     [m_metal setTexture:texture.metal()];
 }
 
-MTLRenderPassAttachmentDescriptor *GPURenderPassAttachmentDescriptor::metal() const
+MTLRenderPassAttachmentDescriptor *GPULegacyRenderPassAttachmentDescriptor::metal() const
 {
     return m_metal.get();
 }
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "GPURenderPassColorAttachmentDescriptor.h"
+#import "GPULegacyRenderPassColorAttachmentDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
 
 namespace WebCore {
 
-GPURenderPassColorAttachmentDescriptor::GPURenderPassColorAttachmentDescriptor(MTLRenderPassColorAttachmentDescriptor *metal)
-    : GPURenderPassAttachmentDescriptor { metal }
+GPULegacyRenderPassColorAttachmentDescriptor::GPULegacyRenderPassColorAttachmentDescriptor(MTLRenderPassColorAttachmentDescriptor *metal)
+    : GPULegacyRenderPassAttachmentDescriptor { metal }
 {
-    LOG(WebMetal, "GPURenderPassColorAttachmentDescriptor::GPURenderPassColorAttachmentDescriptor()");
+    LOG(WebMetal, "GPULegacyRenderPassColorAttachmentDescriptor::GPULegacyRenderPassColorAttachmentDescriptor()");
 }
 
-Vector<float> GPURenderPassColorAttachmentDescriptor::clearColor() const
+Vector<float> GPULegacyRenderPassColorAttachmentDescriptor::clearColor() const
 {
     auto* metal = this->metal();
     if (!metal)
@@ -51,7 +51,7 @@ Vector<float> GPURenderPassColorAttachmentDescriptor::clearColor() const
     return { narrowPrecisionToFloat(color.red), narrowPrecisionToFloat(color.green), narrowPrecisionToFloat(color.blue), narrowPrecisionToFloat(color.alpha) };
 }
 
-void GPURenderPassColorAttachmentDescriptor::setClearColor(const Vector<float>& newClearColor) const
+void GPULegacyRenderPassColorAttachmentDescriptor::setClearColor(const Vector<float>& newClearColor) const
 {
     if (newClearColor.size() != 4)
         return;
@@ -59,9 +59,9 @@ void GPURenderPassColorAttachmentDescriptor::setClearColor(const Vector<float>&
     [metal() setClearColor:MTLClearColorMake(newClearColor[0], newClearColor[1], newClearColor[2], newClearColor[3])];
 }
 
-MTLRenderPassColorAttachmentDescriptor *GPURenderPassColorAttachmentDescriptor::metal() const
+MTLRenderPassColorAttachmentDescriptor *GPULegacyRenderPassColorAttachmentDescriptor::metal() const
 {
-    return static_cast<MTLRenderPassColorAttachmentDescriptor *>(GPURenderPassAttachmentDescriptor::metal());
+    return static_cast<MTLRenderPassColorAttachmentDescriptor *>(GPULegacyRenderPassAttachmentDescriptor::metal());
 }
 
 } // namespace WebCore
  */
 
 #import "config.h"
-#import "GPURenderPassDepthAttachmentDescriptor.h"
+#import "GPULegacyRenderPassDepthAttachmentDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPURenderPassAttachmentDescriptor.h"
+#import "GPULegacyRenderPassAttachmentDescriptor.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 
 namespace WebCore {
 
-GPURenderPassDepthAttachmentDescriptor::GPURenderPassDepthAttachmentDescriptor(MTLRenderPassDepthAttachmentDescriptor *metal)
-    : GPURenderPassAttachmentDescriptor { metal }
+GPULegacyRenderPassDepthAttachmentDescriptor::GPULegacyRenderPassDepthAttachmentDescriptor(MTLRenderPassDepthAttachmentDescriptor *metal)
+    : GPULegacyRenderPassAttachmentDescriptor { metal }
 {
     LOG(WebMetal, "GPURenderPassDepthAttachmentDescriptor::GPURenderPassDepthAttachmentDescriptor()");
 }
 
-double GPURenderPassDepthAttachmentDescriptor::clearDepth() const
+double GPULegacyRenderPassDepthAttachmentDescriptor::clearDepth() const
 {
     auto* metal = this->metal();
     if (!metal)
@@ -49,14 +49,14 @@ double GPURenderPassDepthAttachmentDescriptor::clearDepth() const
     return [metal clearDepth];
 }
 
-void GPURenderPassDepthAttachmentDescriptor::setClearDepth(double newClearDepth) const
+void GPULegacyRenderPassDepthAttachmentDescriptor::setClearDepth(double newClearDepth) const
 {
     [metal() setClearDepth:newClearDepth];
 }
 
-MTLRenderPassDepthAttachmentDescriptor *GPURenderPassDepthAttachmentDescriptor::metal() const
+MTLRenderPassDepthAttachmentDescriptor *GPULegacyRenderPassDepthAttachmentDescriptor::metal() const
 {
-    return static_cast<MTLRenderPassDepthAttachmentDescriptor *>(GPURenderPassAttachmentDescriptor::metal());
+    return static_cast<MTLRenderPassDepthAttachmentDescriptor *>(GPULegacyRenderPassAttachmentDescriptor::metal());
 }
 
 } // namespace WebCore
  */
 
 #import "config.h"
-#import "GPURenderPassDescriptor.h"
+#import "GPULegacyRenderPassDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPURenderPassColorAttachmentDescriptor.h"
-#import "GPURenderPassDepthAttachmentDescriptor.h"
+#import "GPULegacyRenderPassColorAttachmentDescriptor.h"
+#import "GPULegacyRenderPassDepthAttachmentDescriptor.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 #import <wtf/Vector.h>
 
 namespace WebCore {
 
-GPURenderPassDescriptor::GPURenderPassDescriptor()
+GPULegacyRenderPassDescriptor::GPULegacyRenderPassDescriptor()
     : m_metal { adoptNS([MTLRenderPassDescriptor new]) }
 {
     LOG(WebMetal, "GPURenderPassDescriptor::GPURenderPassDescriptor()");
 }
 
-Vector<GPURenderPassColorAttachmentDescriptor> GPURenderPassDescriptor::colorAttachments() const
+Vector<GPULegacyRenderPassColorAttachmentDescriptor> GPULegacyRenderPassDescriptor::colorAttachments() const
 {
     if (!m_metal)
         return { };
@@ -51,12 +51,12 @@ Vector<GPURenderPassColorAttachmentDescriptor> GPURenderPassDescriptor::colorAtt
     return { { [[m_metal colorAttachments] objectAtIndexedSubscript:0] } };
 }
 
-GPURenderPassDepthAttachmentDescriptor GPURenderPassDescriptor::depthAttachment() const
+GPULegacyRenderPassDepthAttachmentDescriptor GPULegacyRenderPassDescriptor::depthAttachment() const
 {
     return [m_metal depthAttachment];
 }
 
-MTLRenderPassDescriptor *GPURenderPassDescriptor::metal() const
+MTLRenderPassDescriptor *GPULegacyRenderPassDescriptor::metal() const
 {
     return m_metal.get();
 }
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "GPURenderPipelineColorAttachmentDescriptor.h"
+#import "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
 
 namespace WebCore {
 
-GPURenderPipelineColorAttachmentDescriptor::GPURenderPipelineColorAttachmentDescriptor(MTLRenderPipelineColorAttachmentDescriptor *metal)
+GPULegacyRenderPipelineColorAttachmentDescriptor::GPULegacyRenderPipelineColorAttachmentDescriptor(MTLRenderPipelineColorAttachmentDescriptor *metal)
     : m_metal { metal }
 {
-    LOG(WebMetal, "GPURenderPipelineColorAttachmentDescriptor::GPURenderPipelineColorAttachmentDescriptor()");
+    LOG(WebMetal, "GPULegacyRenderPipelineColorAttachmentDescriptor::GPULegacyRenderPipelineColorAttachmentDescriptor()");
 }
 
-unsigned GPURenderPipelineColorAttachmentDescriptor::pixelFormat() const
+unsigned GPULegacyRenderPipelineColorAttachmentDescriptor::pixelFormat() const
 {
     return [m_metal pixelFormat];
 }
 
-void GPURenderPipelineColorAttachmentDescriptor::setPixelFormat(unsigned newPixelFormat) const
+void GPULegacyRenderPipelineColorAttachmentDescriptor::setPixelFormat(unsigned newPixelFormat) const
 {
     // FIXME: Should we check for enumeration values out of range before calling the method?
     [m_metal setPixelFormat:static_cast<MTLPixelFormat>(newPixelFormat)];
 }
 
-MTLRenderPipelineColorAttachmentDescriptor *GPURenderPipelineColorAttachmentDescriptor::metal() const
+MTLRenderPipelineColorAttachmentDescriptor *GPULegacyRenderPipelineColorAttachmentDescriptor::metal() const
 {
     return m_metal.get();
 }
  */
 
 #import "config.h"
-#import "GPURenderPipelineDescriptor.h"
+#import "GPULegacyRenderPipelineDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUFunction.h"
-#import "GPURenderPipelineColorAttachmentDescriptor.h"
+#import "GPULegacyFunction.h"
+#import "GPULegacyRenderPipelineColorAttachmentDescriptor.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 #import <wtf/Vector.h>
 
 namespace WebCore {
 
-GPURenderPipelineDescriptor::GPURenderPipelineDescriptor()
+GPULegacyRenderPipelineDescriptor::GPULegacyRenderPipelineDescriptor()
     : m_metal { adoptNS([MTLRenderPipelineDescriptor new]) }
 {
     LOG(WebMetal, "GPURenderPipelineDescriptor::GPURenderPipelineDescriptor()");
 }
 
-unsigned GPURenderPipelineDescriptor::depthAttachmentPixelFormat() const
+unsigned GPULegacyRenderPipelineDescriptor::depthAttachmentPixelFormat() const
 {
     return [m_metal depthAttachmentPixelFormat];
 }
 
-void GPURenderPipelineDescriptor::setDepthAttachmentPixelFormat(unsigned newPixelFormat) const
+void GPULegacyRenderPipelineDescriptor::setDepthAttachmentPixelFormat(unsigned newPixelFormat) const
 {
     [m_metal setDepthAttachmentPixelFormat:static_cast<MTLPixelFormat>(newPixelFormat)];
 }
 
-void GPURenderPipelineDescriptor::setVertexFunction(const GPUFunction& newFunction) const
+void GPULegacyRenderPipelineDescriptor::setVertexFunction(const GPULegacyFunction& newFunction) const
 {
     [m_metal setVertexFunction:newFunction.metal()];
 }
 
-void GPURenderPipelineDescriptor::setFragmentFunction(const GPUFunction& newFunction) const
+void GPULegacyRenderPipelineDescriptor::setFragmentFunction(const GPULegacyFunction& newFunction) const
 {
     [m_metal setFragmentFunction:newFunction.metal()];
 }
 
-Vector<GPURenderPipelineColorAttachmentDescriptor> GPURenderPipelineDescriptor::colorAttachments() const
+Vector<GPULegacyRenderPipelineColorAttachmentDescriptor> GPULegacyRenderPipelineDescriptor::colorAttachments() const
 {
     // FIXME: Why is it always OK to return exactly one attachment?
     return { { [[m_metal colorAttachments] objectAtIndexedSubscript:0] } };
 }
 
-void GPURenderPipelineDescriptor::reset() const
+void GPULegacyRenderPipelineDescriptor::reset() const
 {
     [m_metal reset];
 }
 
-MTLRenderPipelineDescriptor *GPURenderPipelineDescriptor::metal() const
+MTLRenderPipelineDescriptor *GPULegacyRenderPipelineDescriptor::metal() const
 {
     return m_metal.get();
 }
  */
 
 #import "config.h"
-#import "GPURenderPipelineState.h"
+#import "GPULegacyRenderPipelineState.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDevice.h"
-#import "GPURenderPipelineDescriptor.h"
+#import "GPULegacyDevice.h"
+#import "GPULegacyRenderPipelineDescriptor.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 #import <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-GPURenderPipelineState::GPURenderPipelineState(const GPUDevice& device, const GPURenderPipelineDescriptor& descriptor)
+GPULegacyRenderPipelineState::GPULegacyRenderPipelineState(const GPULegacyDevice& device, const GPULegacyRenderPipelineDescriptor& descriptor)
     : m_metal { adoptNS([device.metal() newRenderPipelineStateWithDescriptor:descriptor.metal() error:nil]) }
 {
-    LOG(WebMetal, "GPURenderPipelineState::GPURenderPipelineState()");
+    LOG(WebMetal, "GPULegacyRenderPipelineState::GPULegacyRenderPipelineState()");
 }
 
-String GPURenderPipelineState::label() const
+String GPULegacyRenderPipelineState::label() const
 {
     if (!m_metal)
         return emptyString();
     return [m_metal label];
 }
 
-void GPURenderPipelineState::setLabel(const String&) const
+void GPULegacyRenderPipelineState::setLabel(const String&) const
 {
     // FIXME: The MTLRenderPipelineState protocol does not allow setting the label.
     // The label has to be set on the descriptor when creating the state object.
     // We should consider changing the WebMetal interface to not require this!
 }
     
-MTLRenderPipelineState *GPURenderPipelineState::metal() const
+MTLRenderPipelineState *GPULegacyRenderPipelineState::metal() const
 {
     return m_metal.get();
 }
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "GPUTextureDescriptor.h"
+#import "GPULegacyTextureDescriptor.h"
 
 #if ENABLE(WEBMETAL)
 
 
 namespace WebCore {
 
-GPUTextureDescriptor::GPUTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
+GPULegacyTextureDescriptor::GPULegacyTextureDescriptor(unsigned pixelFormat, unsigned width, unsigned height, bool mipmapped)
     : m_metal { [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:static_cast<MTLPixelFormat>(pixelFormat) width:width height:height mipmapped:mipmapped] }
 {
     LOG(WebMetal, "GPUTextureDescriptor::GPUTextureDescriptor()");
 }
 
-unsigned GPUTextureDescriptor::width() const
+unsigned GPULegacyTextureDescriptor::width() const
 {
     return [m_metal width];
 }
 
-void GPUTextureDescriptor::setWidth(unsigned newWidth) const
+void GPULegacyTextureDescriptor::setWidth(unsigned newWidth) const
 {
     ASSERT(m_metal);
     [m_metal setWidth:newWidth];
 }
 
-unsigned GPUTextureDescriptor::height() const
+unsigned GPULegacyTextureDescriptor::height() const
 {
     return [m_metal height];
 }
 
-void GPUTextureDescriptor::setHeight(unsigned newHeight) const
+void GPULegacyTextureDescriptor::setHeight(unsigned newHeight) const
 {
     ASSERT(m_metal);
     [m_metal setHeight:newHeight];
 }
 
-unsigned GPUTextureDescriptor::sampleCount() const
+unsigned GPULegacyTextureDescriptor::sampleCount() const
 {
     return [m_metal sampleCount];
 }
 
-void GPUTextureDescriptor::setSampleCount(unsigned newSampleCount) const
+void GPULegacyTextureDescriptor::setSampleCount(unsigned newSampleCount) const
 {
     ASSERT(m_metal);
     [m_metal setSampleCount:newSampleCount];
 }
 
-unsigned GPUTextureDescriptor::textureType() const
+unsigned GPULegacyTextureDescriptor::textureType() const
 {
     return [m_metal textureType];
 }
 
-void GPUTextureDescriptor::setTextureType(unsigned newTextureType) const
+void GPULegacyTextureDescriptor::setTextureType(unsigned newTextureType) const
 {
     ASSERT(m_metal);
     [m_metal setTextureType:static_cast<MTLTextureType>(newTextureType)];
 }
 
-unsigned GPUTextureDescriptor::storageMode() const
+unsigned GPULegacyTextureDescriptor::storageMode() const
 {
     return [m_metal storageMode];
 }
 
-void GPUTextureDescriptor::setStorageMode(unsigned newStorageMode) const
+void GPULegacyTextureDescriptor::setStorageMode(unsigned newStorageMode) const
 {
     [m_metal setStorageMode:static_cast<MTLStorageMode>(newStorageMode)];
 }
 
-unsigned GPUTextureDescriptor::usage() const
+unsigned GPULegacyTextureDescriptor::usage() const
 {
     return [m_metal usage];
 }
 
-void GPUTextureDescriptor::setUsage(unsigned newUsage) const
+void GPULegacyTextureDescriptor::setUsage(unsigned newUsage) const
 {
     ASSERT(m_metal);
     [m_metal setUsage:newUsage];
 }
 
-MTLTextureDescriptor *GPUTextureDescriptor::metal() const
+MTLTextureDescriptor *GPULegacyTextureDescriptor::metal() const
 {
     return m_metal.get();
 }
  */
 
 #import "config.h"
-#import "GPUTexture.h"
+#import "GPULegacyTexture.h"
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUDevice.h"
-#import "GPUDrawable.h"
-#import "GPUTextureDescriptor.h"
+#import "GPULegacyDevice.h"
+#import "GPULegacyDrawable.h"
+#import "GPULegacyTextureDescriptor.h"
 #import "Logging.h"
 #import <Metal/Metal.h>
 
 namespace WebCore {
 
-GPUTexture::GPUTexture(const GPUDevice& device, const GPUTextureDescriptor& descriptor)
+GPULegacyTexture::GPULegacyTexture(const GPULegacyDevice& device, const GPULegacyTextureDescriptor& descriptor)
 {
     LOG(WebMetal, "GPUTexture::GPUTexture()");
 
@@ -46,23 +46,23 @@ GPUTexture::GPUTexture(const GPUDevice& device, const GPUTextureDescriptor& desc
     m_metal = adoptNS([device.metal() newTextureWithDescriptor:descriptor.metal()]);
 }
 
-GPUTexture::GPUTexture(const GPUDrawable& other)
+GPULegacyTexture::GPULegacyTexture(const GPULegacyDrawable& other)
     : m_metal { other.texture() }
 {
     LOG(WebMetal, "GPUTexture::GPUTexture()");
 }
 
-unsigned GPUTexture::width() const
+unsigned GPULegacyTexture::width() const
 {
     return m_metal.get().width;
 }
 
-unsigned GPUTexture::height() const
+unsigned GPULegacyTexture::height() const
 {
     return m_metal.get().height;
 }
 
-MTLTexture *GPUTexture::metal() const
+MTLTexture *GPULegacyTexture::metal() const
 {
     return m_metal.get();
 }
index 32a1101..ec4b20d 100644 (file)
@@ -1,3 +1,23 @@
+2018-10-23  Justin Fan  <justin_fan@apple.com>
+
+        [WebGPU] Rename old GPU* implementation files to GPULegacy* for WebMetal
+        https://bugs.webkit.org/show_bug.cgi?id=190817
+
+        Reviewed by Dean Jackson.
+
+        * 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.
+
 2018-10-23  Chris Dumez  <cdumez@apple.com>
 
         [PSON] Add support for cross-site client-side redirects
index 4982f4f..d5f9b77 100644 (file)
                2EFF06D41D8AEDBB0004BB30 /* TestWKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EFF06D31D8AEDBB0004BB30 /* TestWKWebView.mm */; };
                2EFF06D71D8AF34A0004BB30 /* WKWebViewCandidateTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EFF06D61D8AF34A0004BB30 /* WKWebViewCandidateTests.mm */; };
                315118101DB1AE4000176304 /* ExtendedColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3151180F1DB1ADD500176304 /* ExtendedColor.cpp */; };
-               315231CA1EB3B3C700A22A16 /* GPUCommandQueue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 315231C91EB3B3C700A22A16 /* GPUCommandQueue.mm */; };
-               3162AE9C1E6F2FF5000E4DBC /* GPUDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3162AE9B1E6F2FCE000E4DBC /* GPUDevice.mm */; };
-               316BDBA11E70D71B00DE0D5A /* GPULibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBA01E70D6D800DE0D5A /* GPULibrary.mm */; };
-               316BDBA41E70EF6800DE0D5A /* GPUFunction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBA31E70EF5D00DE0D5A /* GPUFunction.mm */; };
-               316BDBAC1E7207F100DE0D5A /* GPUBuffer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBAB1E7207F100DE0D5A /* GPUBuffer.mm */; };
+               315231CA1EB3B3C700A22A16 /* GPULegacyCommandQueue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 315231C91EB3B3C700A22A16 /* GPULegacyCommandQueue.mm */; };
+               3162AE9C1E6F2FF5000E4DBC /* GPULegacyDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3162AE9B1E6F2FCE000E4DBC /* GPULegacyDevice.mm */; };
+               316BDBA11E70D71B00DE0D5A /* GPULegacyLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBA01E70D6D800DE0D5A /* GPULegacyLibrary.mm */; };
+               316BDBA41E70EF6800DE0D5A /* GPULegacyFunction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBA31E70EF5D00DE0D5A /* GPULegacyFunction.mm */; };
+               316BDBAC1E7207F100DE0D5A /* GPULegacyBuffer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316BDBAB1E7207F100DE0D5A /* GPULegacyBuffer.mm */; };
                33BE5AF9137B5AAE00705813 /* MouseMoveAfterCrash_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33BE5AF8137B5AAE00705813 /* MouseMoveAfterCrash_Bundle.cpp */; };
                33DC8912141955FE00747EF7 /* simple-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 33DC890E1419539300747EF7 /* simple-iframe.html */; };
                33DC89141419579F00747EF7 /* LoadCanceledNoServerRedirectCallback_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33DC89131419579F00747EF7 /* LoadCanceledNoServerRedirectCallback_Bundle.cpp */; };
                2EFF06D31D8AEDBB0004BB30 /* TestWKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TestWKWebView.mm; path = cocoa/TestWKWebView.mm; sourceTree = "<group>"; };
                2EFF06D61D8AF34A0004BB30 /* WKWebViewCandidateTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewCandidateTests.mm; sourceTree = "<group>"; };
                3151180F1DB1ADD500176304 /* ExtendedColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtendedColor.cpp; sourceTree = "<group>"; };
-               315231C91EB3B3C700A22A16 /* GPUCommandQueue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUCommandQueue.mm; sourceTree = "<group>"; };
-               3162AE9B1E6F2FCE000E4DBC /* GPUDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUDevice.mm; sourceTree = "<group>"; };
-               316BDBA01E70D6D800DE0D5A /* GPULibrary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULibrary.mm; sourceTree = "<group>"; };
-               316BDBA21E70DEE500DE0D5A /* GPUTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUTest.h; sourceTree = "<group>"; };
-               316BDBA31E70EF5D00DE0D5A /* GPUFunction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPUFunction.mm; sourceTree = "<group>"; };
-               316BDBAB1E7207F100DE0D5A /* GPUBuffer.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = GPUBuffer.mm; sourceTree = "<group>"; };
+               315231C91EB3B3C700A22A16 /* GPULegacyCommandQueue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyCommandQueue.mm; sourceTree = "<group>"; };
+               3162AE9B1E6F2FCE000E4DBC /* GPULegacyDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyDevice.mm; sourceTree = "<group>"; };
+               316BDBA01E70D6D800DE0D5A /* GPULegacyLibrary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyLibrary.mm; sourceTree = "<group>"; };
+               316BDBA21E70DEE500DE0D5A /* GPULegacyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPULegacyTest.h; sourceTree = "<group>"; };
+               316BDBA31E70EF5D00DE0D5A /* GPULegacyFunction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPULegacyFunction.mm; sourceTree = "<group>"; };
+               316BDBAB1E7207F100DE0D5A /* GPULegacyBuffer.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = GPULegacyBuffer.mm; sourceTree = "<group>"; };
                333B9CE11277F23100FEFCE3 /* PreventEmptyUserAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreventEmptyUserAgent.cpp; sourceTree = "<group>"; };
                33BE5AF4137B5A6C00705813 /* MouseMoveAfterCrash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseMoveAfterCrash.cpp; sourceTree = "<group>"; };
                33BE5AF8137B5AAE00705813 /* MouseMoveAfterCrash_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseMoveAfterCrash_Bundle.cpp; sourceTree = "<group>"; };
                3162AE9A1E6F2F8F000E4DBC /* mac */ = {
                        isa = PBXGroup;
                        children = (
-                               316BDBAB1E7207F100DE0D5A /* GPUBuffer.mm */,
-                               315231C91EB3B3C700A22A16 /* GPUCommandQueue.mm */,
-                               3162AE9B1E6F2FCE000E4DBC /* GPUDevice.mm */,
-                               316BDBA31E70EF5D00DE0D5A /* GPUFunction.mm */,
-                               316BDBA01E70D6D800DE0D5A /* GPULibrary.mm */,
-                               316BDBA21E70DEE500DE0D5A /* GPUTest.h */,
+                               316BDBAB1E7207F100DE0D5A /* GPULegacyBuffer.mm */,
+                               315231C91EB3B3C700A22A16 /* GPULegacyCommandQueue.mm */,
+                               3162AE9B1E6F2FCE000E4DBC /* GPULegacyDevice.mm */,
+                               316BDBA31E70EF5D00DE0D5A /* GPULegacyFunction.mm */,
+                               316BDBA01E70D6D800DE0D5A /* GPULegacyLibrary.mm */,
+                               316BDBA21E70DEE500DE0D5A /* GPULegacyTest.h */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                                7CCE7EE21A411A9A00447C4C /* GetPIDAfterAbortedProcessLaunch.cpp in Sources */,
                                07CE1CF31F06A7E000BF89F5 /* GetUserMediaNavigation.mm in Sources */,
                                07E499911F9E56DF002F1EF3 /* GetUserMediaReprompt.mm in Sources */,
-                               316BDBAC1E7207F100DE0D5A /* GPUBuffer.mm in Sources */,
-                               315231CA1EB3B3C700A22A16 /* GPUCommandQueue.mm in Sources */,
-                               3162AE9C1E6F2FF5000E4DBC /* GPUDevice.mm in Sources */,
-                               316BDBA41E70EF6800DE0D5A /* GPUFunction.mm in Sources */,
-                               316BDBA11E70D71B00DE0D5A /* GPULibrary.mm in Sources */,
+                               316BDBAC1E7207F100DE0D5A /* GPULegacyBuffer.mm in Sources */,
+                               315231CA1EB3B3C700A22A16 /* GPULegacyCommandQueue.mm in Sources */,
+                               3162AE9C1E6F2FF5000E4DBC /* GPULegacyDevice.mm in Sources */,
+                               316BDBA41E70EF6800DE0D5A /* GPULegacyFunction.mm in Sources */,
+                               316BDBA11E70D71B00DE0D5A /* GPULegacyLibrary.mm in Sources */,
                                8E4A85371E1D1AB200F53B0F /* GridPosition.cpp in Sources */,
                                7CCE7EFA1A411AE600447C4C /* HitTestResultNodeHandle.cpp in Sources */,
                                7CCE7EC11A411A7E00447C4C /* HTMLCollectionNamedItem.mm in Sources */,
@@ -27,7 +27,7 @@
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUTest.h"
+#import "GPULegacyTest.h"
 #import <JavaScriptCore/ArrayBuffer.h>
 #import <JavaScriptCore/ArrayBufferView.h>
 #import <JavaScriptCore/GenericTypedArrayViewInlines.h>
 #import <JavaScriptCore/JSGenericTypedArrayViewInlines.h>
 #import <JavaScriptCore/TypedArrays.h>
 #import <Metal/Metal.h>
-#import <WebCore/GPUBuffer.h>
-#import <WebCore/GPUDevice.h>
+#import <WebCore/GPULegacyBuffer.h>
+#import <WebCore/GPULegacyDevice.h>
 
 using namespace WebCore;
 
 namespace TestWebKitAPI {
 
-TEST_F(GPU, BufferCreate)
+TEST_F(GPULegacy, BufferCreate)
 {
-    GPUDevice device;
+    GPULegacyDevice device;
 
     // Not all hardware supports Metal, so it is possible
     // that we were unable to create the MTLDevice object.
@@ -59,7 +59,7 @@ TEST_F(GPU, BufferCreate)
     auto data = bufferView->data();
     memset(data, 1, bufferView->byteLength());
 
-    GPUBuffer buffer { device, bufferView.get() };
+    GPULegacyBuffer buffer { device, bufferView.get() };
     EXPECT_EQ(1024U, buffer.length());
 
     auto contents = buffer.contents();
diff --git a/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyCommandQueue.mm b/Tools/TestWebKitAPI/Tests/WebCore/mac/GPULegacyCommandQueue.mm
new file mode 100644 (file)
index 0000000..209d444
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#if ENABLE(WEBMETAL)
+
+#import "GPULegacyTest.h"
+#import "PlatformUtilities.h"
+#import <Metal/Metal.h>
+#import <WebCore/GPULegacyCommandQueue.h>
+#import <WebCore/GPULegacyDevice.h>
+
+using namespace WebCore;
+
+namespace TestWebKitAPI {
+
+TEST_F(GPULegacy, CommandQueueCreate)
+{
+    GPULegacyDevice device;
+
+    // Not all hardware supports Metal, so it is possible
+    // that we were unable to create the MTLDevice object.
+    // In that case, the device should be null.
+    if (!device)
+        return;
+
+    GPULegacyCommandQueue commandQueue { device };
+    EXPECT_WK_STREQ("", commandQueue.label());
+
+    EXPECT_NOT_NULL(commandQueue.metal());
+
+    // If you haven't set a label, we just use the prefix.
+    EXPECT_STREQ("com.apple.WebKit", commandQueue.metal().label.UTF8String);
+
+    commandQueue.setLabel("this.is.a.test"_s);
+
+    // The WebKit API doesn't prefix.
+    EXPECT_WK_STREQ("this.is.a.test", commandQueue.label());
+
+    // But the underlying Metal object label will have one.
+    EXPECT_STREQ("com.apple.WebKit.this.is.a.test", commandQueue.metal().label.UTF8String);
+}
+
+} // namespace TestWebKitAPI
+
+#endif
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUTest.h"
+#import "GPULegacyTest.h"
 #import <Metal/Metal.h>
-#import <WebCore/GPUDevice.h>
+#import <WebCore/GPULegacyDevice.h>
 
 using namespace WebCore;
 
 namespace TestWebKitAPI {
 
-TEST_F(GPU, DeviceCreate)
+TEST_F(GPULegacy, DeviceCreate)
 {
-    GPUDevice device;
+    GPULegacyDevice device;
 
     // Not all hardware supports Metal, so it is possible
     // that we were unable to create the MTLDevice object.
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUTest.h"
+#import "GPULegacyTest.h"
 #import "PlatformUtilities.h"
 #import <Metal/Metal.h>
-#import <WebCore/GPUDevice.h>
-#import <WebCore/GPUFunction.h>
-#import <WebCore/GPULibrary.h>
+#import <WebCore/GPULegacyDevice.h>
+#import <WebCore/GPULegacyFunction.h>
+#import <WebCore/GPULegacyLibrary.h>
 
 using namespace WebCore;
 
 namespace TestWebKitAPI {
 
-TEST_F(GPU, FunctionAccessByName)
+TEST_F(GPULegacy, FunctionAccessByName)
 {
-    GPUDevice device;
+    GPULegacyDevice device;
 
     // Not all hardware supports Metal, so it is possible
     // that we were unable to create the MTLDevice object.
@@ -51,17 +51,17 @@ TEST_F(GPU, FunctionAccessByName)
 
     EXPECT_NOT_NULL(device.metal());
 
-    GPULibrary library { device, librarySourceCode() };
+    GPULegacyLibrary library { device, librarySourceCode() };
 
-    GPUFunction vertexFunction { library, "vertex_main"_s };
+    GPULegacyFunction vertexFunction { library, "vertex_main"_s };
     EXPECT_NOT_NULL(vertexFunction.metal());
     EXPECT_WK_STREQ("vertex_main", vertexFunction.name());
 
-    GPUFunction fragmentFunction { library, "fragment_main"_s };
+    GPULegacyFunction fragmentFunction { library, "fragment_main"_s };
     EXPECT_NOT_NULL(fragmentFunction.metal());
     EXPECT_WK_STREQ("fragment_main", fragmentFunction.name());
 
-    GPUFunction nonexistentFunction { library, "name_that_is_not_in_library"_s };
+    GPULegacyFunction nonexistentFunction { library, "name_that_is_not_in_library"_s };
     EXPECT_NULL(nonexistentFunction.metal());
 }
 
 
 #if ENABLE(WEBMETAL)
 
-#import "GPUTest.h"
+#import "GPULegacyTest.h"
 #import "PlatformUtilities.h"
 #import <Metal/Metal.h>
-#import <WebCore/GPUDevice.h>
-#import <WebCore/GPULibrary.h>
+#import <WebCore/GPULegacyDevice.h>
+#import <WebCore/GPULegacyLibrary.h>
 
 using namespace WebCore;
 
 namespace TestWebKitAPI {
 
-TEST_F(GPU, LibraryCreate)
+TEST_F(GPULegacy, LibraryCreate)
 {
-    GPUDevice device;
+    GPULegacyDevice device;
 
     // Not all hardware supports Metal, so it is possible
     // that we were unable to create the MTLDevice object.
@@ -49,30 +49,30 @@ TEST_F(GPU, LibraryCreate)
 
     EXPECT_NOT_NULL(device.metal());
 
-    GPULibrary library { device, librarySourceCode() };
+    GPULegacyLibrary library { device, librarySourceCode() };
     EXPECT_NOT_NULL(library.metal());
 }
 
-TEST_F(GPU, LibrarySetLabel)
+TEST_F(GPULegacy, LibrarySetLabel)
 {
-    GPUDevice device;
+    GPULegacyDevice device;
     if (!device)
         return;
 
-    GPULibrary library { device, librarySourceCode() };
+    GPULegacyLibrary library { device, librarySourceCode() };
     EXPECT_NOT_NULL(library.metal());
 
     library.setLabel("TestLabel"_s);
     EXPECT_EQ("TestLabel", library.label());
 }
 
-TEST_F(GPU, LibraryFunctionNames)
+TEST_F(GPULegacy, LibraryFunctionNames)
 {
-    GPUDevice device;
+    GPULegacyDevice device;
     if (!device)
         return;
 
-    GPULibrary library { device, librarySourceCode() };
+    GPULegacyLibrary library { device, librarySourceCode() };
     EXPECT_NOT_NULL(library.metal());
 
     auto functionNames = library.functionNames();
@@ -31,7 +31,7 @@
 
 namespace TestWebKitAPI {
 
-class GPU : public testing::Test {
+class GPULegacy : public testing::Test {
 public:
     void SetUp() final
     {