[WebGPU] https://webgpu.github.io/webgpu-samples/samples/computeBoids …

…does not work

https://bugs.webkit.org/show_bug.cgi?id=264719
<radar://118315907>

Reviewed by Dan Glastonbury.

Timestamps query was added to computeBoids but we implemented the older version
in the specification.

The newer version is simpler, so support that one.

Pipeline statistics query feature was removed from WebGPU so remove it.

* Source/WebCore/CMakeLists.txt:
* Source/WebCore/DerivedSources.make:
* Source/WebCore/Headers.cmake:
* Source/WebCore/Modules/WebGPU/GPUComputePassTimestampLocation.h: Removed.
* Source/WebCore/Modules/WebGPU/GPUComputePassTimestampLocation.idl: Removed.
* Source/WebCore/Modules/WebGPU/GPUComputePassTimestampWrites.h:
* Source/WebCore/Modules/WebGPU/GPURenderPassTimestampLocation.h: Removed.
* Source/WebCore/Modules/WebGPU/GPURenderPassTimestampLocation.idl: Removed.
* Source/WebCore/Modules/WebGPU/GPURenderPassTimestampWrites.h:
* Source/WebCore/Modules/WebGPU/Implementation/WebGPUAdapterImpl.cpp:
(WebCore::WebGPU::supportedFeatures):
* Source/WebCore/Modules/WebGPU/Implementation/WebGPUCommandEncoderImpl.cpp:
(WebCore::WebGPU::CommandEncoderImpl::beginRenderPass):
(WebCore::WebGPU::CommandEncoderImpl::beginComputePass):
* Source/WebCore/Modules/WebGPU/Implementation/WebGPUConvertToBackingContext.cpp:
* Source/WebCore/Modules/WebGPU/Implementation/WebGPUConvertToBackingContext.h:
* Source/WebCore/Modules/WebGPU/Implementation/WebGPUDeviceImpl.cpp:
(WebCore::WebGPU::DeviceImpl::createQuerySet):
* Source/WebCore/Modules/WebGPU/InternalAPI/WebGPU.serialization.in:
* Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUComputePassTimestampLocation.h: Removed.
* Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUComputePassTimestampWrites.h:
* Source/WebCore/Modules/WebGPU/InternalAPI/WebGPURenderPassTimestampLocation.h: Removed.
* Source/WebCore/Modules/WebGPU/InternalAPI/WebGPURenderPassTimestampWrites.h:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebGPU/WebGPU/CommandEncoder.mm:
(WebGPU::CommandEncoder::validateComputePassDescriptor const):
(WebGPU::CommandEncoder::beginComputePass):
(WebGPU::CommandEncoder::validateRenderPassDescriptor const):
(WebGPU::CommandEncoder::beginRenderPass):
(WebGPU::CommandEncoder::resolveQuerySet):
* Source/WebGPU/WebGPU/ComputePassEncoder.h:
* Source/WebGPU/WebGPU/ComputePassEncoder.mm:
(WebGPU::ComputePassEncoder::ComputePassEncoder):
(WebGPU::ComputePassEncoder::beginPipelineStatisticsQuery): Deleted.
(WebGPU::ComputePassEncoder::endPipelineStatisticsQuery): Deleted.
(wgpuComputePassEncoderBeginPipelineStatisticsQuery): Deleted.
(wgpuComputePassEncoderEndPipelineStatisticsQuery): Deleted.
* Source/WebGPU/WebGPU/HardwareCapabilities.mm:
(WebGPU::baseFeatures):
* Source/WebGPU/WebGPU/QuerySet.h:
* Source/WebGPU/WebGPU/QuerySet.mm:
(WebGPU::Device::createQuerySet):
(WebGPU::QuerySet::setOverrideLocation):
(WebGPU::QuerySet::encodeResolveCommands const):
* Source/WebGPU/WebGPU/RenderPassEncoder.h:
* Source/WebGPU/WebGPU/RenderPassEncoder.mm:
(WebGPU::RenderPassEncoder::RenderPassEncoder):
(WebGPU::RenderPassEncoder::beginPipelineStatisticsQuery): Deleted.
(WebGPU::RenderPassEncoder::endPipelineStatisticsQuery): Deleted.
(wgpuRenderPassEncoderBeginPipelineStatisticsQuery): Deleted.
(wgpuRenderPassEncoderEndPipelineStatisticsQuery): Deleted.
* Source/WebGPU/WebGPU/WebGPU.h:
* Source/WebKit/Scripts/webkit/messages.py:
(headers_for_type):
* Source/WebKit/Shared/WebGPU/WebGPUComputePassTimestampWrites.h:
* Source/WebKit/Shared/WebGPU/WebGPURenderPassTimestampWrites.h:

Canonical link: https://commits.webkit.org/270694@main

Source/WebCore/CMakeLists.txt

@@ -1740,7 +1740,6 @@ list(APPEND WebCore_NON_SVG_IDL_FILES
     Modules/WebGPU/GPUCompilationMessageType.idl
     Modules/WebGPU/GPUComputePassDescriptor.idl
     Modules/WebGPU/GPUComputePassEncoder.idl
-    Modules/WebGPU/GPUComputePassTimestampLocation.idl
     Modules/WebGPU/GPUComputePassTimestampWrites.idl
     Modules/WebGPU/GPUComputePipeline.idl
     Modules/WebGPU/GPUComputePipelineDescriptor.idl
@@ -1806,7 +1805,6 @@ list(APPEND WebCore_NON_SVG_IDL_FILES
     Modules/WebGPU/GPURenderPassDescriptor.idl
     Modules/WebGPU/GPURenderPassEncoder.idl
     Modules/WebGPU/GPURenderPassLayout.idl
-    Modules/WebGPU/GPURenderPassTimestampLocation.idl
     Modules/WebGPU/GPURenderPassTimestampWrites.idl
     Modules/WebGPU/GPURenderPipeline.idl
     Modules/WebGPU/GPURenderPipelineDescriptor.idl

Source/WebCore/DerivedSources.make

@@ -94,7 +94,6 @@ JS_BINDING_IDLS := \
     $(WebCore)/Modules/WebGPU/GPUCompilationMessageType.idl \
     $(WebCore)/Modules/WebGPU/GPUComputePassDescriptor.idl \
     $(WebCore)/Modules/WebGPU/GPUComputePassEncoder.idl \
-    $(WebCore)/Modules/WebGPU/GPUComputePassTimestampLocation.idl \
     $(WebCore)/Modules/WebGPU/GPUComputePassTimestampWrites.idl \
     $(WebCore)/Modules/WebGPU/GPUComputePipeline.idl \
     $(WebCore)/Modules/WebGPU/GPUComputePipelineDescriptor.idl \
@@ -160,7 +159,6 @@ JS_BINDING_IDLS := \
     $(WebCore)/Modules/WebGPU/GPURenderPassDescriptor.idl \
     $(WebCore)/Modules/WebGPU/GPURenderPassEncoder.idl \
     $(WebCore)/Modules/WebGPU/GPURenderPassLayout.idl \
-    $(WebCore)/Modules/WebGPU/GPURenderPassTimestampLocation.idl \
     $(WebCore)/Modules/WebGPU/GPURenderPassTimestampWrites.idl \
     $(WebCore)/Modules/WebGPU/GPURenderPipeline.idl \
     $(WebCore)/Modules/WebGPU/GPURenderPipelineDescriptor.idl \

Source/WebCore/Headers.cmake

@@ -48,7 +48,6 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
     Modules/WebGPU/GPUCompilationMessageType.h
     Modules/WebGPU/GPUComputePassDescriptor.h
     Modules/WebGPU/GPUComputePassEncoder.h
-    Modules/WebGPU/GPUComputePassTimestampLocation.h
     Modules/WebGPU/GPUComputePassTimestampWrites.h
     Modules/WebGPU/GPUComputePipeline.h
     Modules/WebGPU/GPUComputePipelineDescriptor.h
@@ -106,7 +105,6 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
     Modules/WebGPU/GPURenderPassDescriptor.h
     Modules/WebGPU/GPURenderPassEncoder.h
     Modules/WebGPU/GPURenderPassLayout.h
-    Modules/WebGPU/GPURenderPassTimestampLocation.h
     Modules/WebGPU/GPURenderPassTimestampWrites.h
     Modules/WebGPU/GPURenderPipeline.h
     Modules/WebGPU/GPURenderPipelineDescriptor.h
@@ -209,7 +207,6 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
     Modules/WebGPU/InternalAPI/WebGPUCompositorIntegration.h
     Modules/WebGPU/InternalAPI/WebGPUComputePassDescriptor.h
     Modules/WebGPU/InternalAPI/WebGPUComputePassEncoder.h
-    Modules/WebGPU/InternalAPI/WebGPUComputePassTimestampLocation.h
     Modules/WebGPU/InternalAPI/WebGPUComputePassTimestampWrites.h
     Modules/WebGPU/InternalAPI/WebGPUComputePipeline.h
     Modules/WebGPU/InternalAPI/WebGPUComputePipelineDescriptor.h
@@ -267,7 +264,6 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
     Modules/WebGPU/InternalAPI/WebGPURenderPassDescriptor.h
     Modules/WebGPU/InternalAPI/WebGPURenderPassEncoder.h
     Modules/WebGPU/InternalAPI/WebGPURenderPassLayout.h
-    Modules/WebGPU/InternalAPI/WebGPURenderPassTimestampLocation.h
     Modules/WebGPU/InternalAPI/WebGPURenderPassTimestampWrites.h
     Modules/WebGPU/InternalAPI/WebGPURenderPipeline.h
     Modules/WebGPU/InternalAPI/WebGPURenderPipelineDescriptor.h

Source/WebCore/Modules/WebGPU/GPUComputePassTimestampWrites.h

@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include "GPUComputePassTimestampLocation.h"
 #include "GPUIntegralTypes.h"
 #include "GPUQuerySet.h"
 #include "WebGPUComputePassTimestampWrites.h"

Source/WebCore/Modules/WebGPU/GPURenderPassTimestampWrites.h

@@ -27,7 +27,6 @@
 
 #include "GPUIntegralTypes.h"
 #include "GPUQuerySet.h"
-#include "GPURenderPassTimestampLocation.h"
 #include "WebGPURenderPassTimestampWrites.h"
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>

Source/WebCore/Modules/WebGPU/Implementation/WebGPUAdapterImpl.cpp

@@ -58,9 +58,6 @@ static Ref<SupportedFeatures> supportedFeatures(const Vector<WGPUFeatureName>& f
         case WGPUFeatureName_TimestampQuery:
             result.append("timestamp-query"_s);
             break;
-        case WGPUFeatureName_PipelineStatisticsQuery:
-            result.append("pipeline-statistics-query"_s);
-            break;
         case WGPUFeatureName_TextureCompressionBC:
             result.append("texture-compression-bc"_s);
             break;

Source/WebCore/Modules/WebGPU/Implementation/WebGPUCommandEncoderImpl.cpp

@@ -89,24 +89,20 @@ Ref<RenderPassEncoder> CommandEncoderImpl::beginRenderPass(const RenderPassDescr
         };
     }
 
-    Vector<WGPURenderPassTimestampWrite> timestampWrites;
-    if (descriptor.timestampWrites && descriptor.timestampWrites->querySet) {
-        timestampWrites.append(WGPURenderPassTimestampWrite {
-            m_convertToBackingContext->convertToBacking(*descriptor.timestampWrites->querySet),
-            descriptor.timestampWrites->beginningOfPassWriteIndex,
-            static_cast<WGPURenderPassTimestampLocation>(descriptor.timestampWrites->endOfPassWriteIndex)
-        });
-    }
+    WGPURenderPassTimestampWrites timestampWrites {
+        .querySet = descriptor.timestampWrites ? m_convertToBackingContext->convertToBacking(*descriptor.timestampWrites->querySet) : nullptr,
+        .beginningOfPassWriteIndex = descriptor.timestampWrites ? descriptor.timestampWrites->beginningOfPassWriteIndex : 0,
+        .endOfPassWriteIndex = descriptor.timestampWrites ? descriptor.timestampWrites->endOfPassWriteIndex : 0
+    };
 
     WGPURenderPassDescriptor backingDescriptor {
-        nullptr,
-        label.data(),
-        static_cast<uint32_t>(colorAttachments.size()),
-        colorAttachments.data(),
-        depthStencilAttachment ? &depthStencilAttachment.value() : nullptr,
-        descriptor.occlusionQuerySet ? m_convertToBackingContext->convertToBacking(*descriptor.occlusionQuerySet) : nullptr,
-        static_cast<uint32_t>(timestampWrites.size()),
-        timestampWrites.data(),
+        .nextInChain = nullptr,
+        .label = label.data(),
+        .colorAttachmentCount = static_cast<uint32_t>(colorAttachments.size()),
+        .colorAttachments = colorAttachments.data(),
+        .depthStencilAttachment = depthStencilAttachment ? &depthStencilAttachment.value() : nullptr,
+        .occlusionQuerySet = descriptor.occlusionQuerySet ? m_convertToBackingContext->convertToBacking(*descriptor.occlusionQuerySet) : nullptr,
+        .timestampWrites = timestampWrites.querySet ? &timestampWrites : nullptr
     };
 
     return RenderPassEncoderImpl::create(adoptWebGPU(wgpuCommandEncoderBeginRenderPass(m_backing.get(), &backingDescriptor)), m_convertToBackingContext);
@@ -116,20 +112,16 @@ Ref<ComputePassEncoder> CommandEncoderImpl::beginComputePass(const std::optional
 {
     CString label = descriptor ? descriptor->label.utf8() : CString("");
 
-    Vector<WGPUComputePassTimestampWrite> timestampWrites;
-    if (descriptor && descriptor->timestampWrites && descriptor->timestampWrites->querySet) {
-        timestampWrites.append(WGPUComputePassTimestampWrite {
-            m_convertToBackingContext->convertToBacking(*descriptor->timestampWrites->querySet),
-            descriptor->timestampWrites->beginningOfPassWriteIndex,
-            static_cast<WGPUComputePassTimestampLocation>(descriptor->timestampWrites->endOfPassWriteIndex)
-        });
-    }
+    WGPUComputePassTimestampWrites timestampWrites {
+        .querySet = (descriptor && descriptor->timestampWrites) ? m_convertToBackingContext->convertToBacking(*descriptor->timestampWrites->querySet) : nullptr,
+        .beginningOfPassWriteIndex = (descriptor && descriptor->timestampWrites) ? descriptor->timestampWrites->beginningOfPassWriteIndex : 0,
+        .endOfPassWriteIndex = (descriptor && descriptor->timestampWrites) ? descriptor->timestampWrites->endOfPassWriteIndex : 0
+    };
 
     WGPUComputePassDescriptor backingDescriptor {
-        nullptr,
-        label.data(),
-        static_cast<uint32_t>(timestampWrites.size()),
-        timestampWrites.data(),
+        .nextInChain = nullptr,
+        .label = label.data(),
+        .timestampWrites = timestampWrites.querySet ? &timestampWrites : nullptr
     };
 
     return ComputePassEncoderImpl::create(adoptWebGPU(wgpuCommandEncoderBeginComputePass(m_backing.get(), &backingDescriptor)), m_convertToBackingContext);

Source/WebCore/Modules/WebGPU/Implementation/WebGPUConvertToBackingContext.cpp

@@ -34,7 +34,6 @@
 #include "WebGPUBufferBindingType.h"
 #include "WebGPUCompareFunction.h"
 #include "WebGPUCompilationMessageType.h"
-#include "WebGPUComputePassTimestampLocation.h"
 #include "WebGPUCullMode.h"
 #include "WebGPUErrorFilter.h"
 #include "WebGPUFeatureName.h"
@@ -45,7 +44,6 @@
 #include "WebGPUPowerPreference.h"
 #include "WebGPUPrimitiveTopology.h"
 #include "WebGPUQueryType.h"
-#include "WebGPURenderPassTimestampLocation.h"
 #include "WebGPUSamplerBindingType.h"
 #include "WebGPUStencilOperation.h"
 #include "WebGPUStorageTextureAccess.h"
@@ -167,16 +165,6 @@ WGPUCompilationMessageType ConvertToBackingContext::convertToBacking(Compilation
     }
 }
 
-WGPUComputePassTimestampLocation ConvertToBackingContext::convertToBacking(ComputePassTimestampLocation computePassTimestampLocation)
-{
-    switch (computePassTimestampLocation) {
-    case ComputePassTimestampLocation::Beginning:
-        return WGPUComputePassTimestampLocation_Beginning;
-    case ComputePassTimestampLocation::End:
-        return WGPUComputePassTimestampLocation_End;
-    }
-}
-
 WGPUCullMode ConvertToBackingContext::convertToBacking(CullMode cullMode)
 {
     switch (cullMode) {
@@ -313,16 +301,6 @@ WGPUQueryType ConvertToBackingContext::convertToBacking(QueryType queryType)
     }
 }
 
-WGPURenderPassTimestampLocation ConvertToBackingContext::convertToBacking(RenderPassTimestampLocation renderPassTimestampLocation)
-{
-    switch (renderPassTimestampLocation) {
-    case RenderPassTimestampLocation::Beginning:
-        return WGPURenderPassTimestampLocation_Beginning;
-    case RenderPassTimestampLocation::End:
-        return WGPURenderPassTimestampLocation_End;
-    }
-}
-
 WGPUSamplerBindingType ConvertToBackingContext::convertToBacking(SamplerBindingType samplerBindingType)
 {
     switch (samplerBindingType) {