[webgpu-headers] Rename "count" fields and update usages.

Needs to wait for the following CLs to land before it can be submitted:
https://chromium-review.googlesource.com/c/chromium/src/+/4767426
https://skia-review.googlesource.com/c/skia/+/739596

github.com/webgpu-native/webgpu-headers/issues/193

Change-Id: Icae688352aa14d537819071ecca5d9c87197c5e5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/146040
Reviewed-by: Austin Eng <[email protected]>
Commit-Queue: Loko Kung <[email protected]>
Reviewed-by: Kai Ninomiya <[email protected]>
Kokoro: Kokoro <[email protected]>

Author: lokokung

dawn.json

@@ -161,8 +161,8 @@
         "extensible": "in",
         "members": [
             {"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
-            {"name": "required features count", "type": "size_t", "default": 0},
-            {"name": "required features", "type": "feature name", "annotation": "const*", "length": "required features count", "default": "nullptr"},
+            {"name": "required feature count", "type": "size_t", "default": 0},
+            {"name": "required features", "type": "feature name", "annotation": "const*", "length": "required feature count", "default": "nullptr"},
             {"name": "required limits", "type": "required limits", "annotation": "const*", "optional": true},
             {"name": "default queue", "type": "queue descriptor"},
             {"name": "device lost callback", "type": "device lost callback", "default": "nullptr"},
@@ -175,10 +175,10 @@
         "chained": "in",
         "chain roots": ["instance descriptor", "request adapter options", "device descriptor"],
         "members": [
-            {"name": "enabled toggles count", "type": "size_t", "default": 0},
-            {"name": "enabled toggles", "type": "char", "annotation": "const*const*", "length": "enabled toggles count"},
-            {"name": "disabled toggles count", "type": "size_t", "default": 0},
-            {"name": "disabled toggles", "type": "char", "annotation": "const*const*", "length": "disabled toggles count"}
+            {"name": "enabled toggle count", "type": "size_t", "default": 0},
+            {"name": "enabled toggles", "type": "char", "annotation": "const*const*", "length": "enabled toggle count"},
+            {"name": "disabled toggle count", "type": "size_t", "default": 0},
+            {"name": "disabled toggles", "type": "char", "annotation": "const*const*", "length": "disabled toggle count"}
         ]
     },
     "dawn cache device descriptor" : {
@@ -2105,8 +2105,8 @@
             {"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
             {"name": "type", "type": "query type"},
             {"name": "count", "type": "uint32_t"},
-            {"name": "pipeline statistics", "type": "pipeline statistic name", "annotation": "const*", "length": "pipeline statistics count"},
-            {"name": "pipeline statistics count", "type": "size_t", "default": "0"}
+            {"name": "pipeline statistics", "type": "pipeline statistic name", "annotation": "const*", "length": "pipeline statistic count"},
+            {"name": "pipeline statistic count", "type": "size_t", "default": "0"}
         ]
     },
     "query type": {
@@ -2348,8 +2348,8 @@
         "extensible": "in",
         "members": [
             {"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
-            {"name": "color formats count", "type": "size_t"},
-            {"name": "color formats", "type": "texture format", "annotation": "const*", "length": "color formats count"},
+            {"name": "color format count", "type": "size_t"},
+            {"name": "color formats", "type": "texture format", "annotation": "const*", "length": "color format count"},
             {"name": "depth stencil format", "type": "texture format", "default": "undefined"},
             {"name": "sample count", "type": "uint32_t", "default": "1"},
             {"name": "depth read only", "type": "bool", "default": "false"},

generator/templates/api.h

@@ -67,6 +67,8 @@
 #define {{API}}_NULLABLE
 #endif
 
+#define WGPU_BREAKING_CHANGE_COUNT_RENAME
+
 #include <stdint.h>
 #include <stddef.h>
 

src/dawn/native/Adapter.cpp

@@ -175,7 +175,7 @@ ResultOrError<Ref<DeviceBase>> AdapterBase::CreateDevice(const DeviceDescriptor*
     // that not supported by the adapter. We allow such toggles overriding for the convinience e.g.
     // creating a deivce for internal usage with AllowUnsafeAPI enabled from an adapter that
     // disabled AllowUnsafeAPIS.
-    for (uint32_t i = 0; i < descriptor->requiredFeaturesCount; ++i) {
+    for (uint32_t i = 0; i < descriptor->requiredFeatureCount; ++i) {
         wgpu::FeatureName feature = descriptor->requiredFeatures[i];
         DAWN_TRY(mPhysicalDevice->ValidateFeatureSupportedWithToggles(feature, deviceToggles));
     }

src/dawn/native/AttachmentState.cpp

@@ -25,9 +25,9 @@ namespace dawn::native {
 AttachmentState::AttachmentState(DeviceBase* device,
                                  const RenderBundleEncoderDescriptor* descriptor)
     : ObjectBase(device), mSampleCount(descriptor->sampleCount) {
-    ASSERT(descriptor->colorFormatsCount <= kMaxColorAttachments);
+    ASSERT(descriptor->colorFormatCount <= kMaxColorAttachments);
     for (ColorAttachmentIndex i(uint8_t(0));
-         i < ColorAttachmentIndex(static_cast<uint8_t>(descriptor->colorFormatsCount)); ++i) {
+         i < ColorAttachmentIndex(static_cast<uint8_t>(descriptor->colorFormatCount)); ++i) {
         wgpu::TextureFormat format = descriptor->colorFormats[static_cast<uint8_t>(i)];
         if (format != wgpu::TextureFormat::Undefined) {
             mColorAttachmentsSet.set(i);

src/dawn/native/Device.cpp

@@ -1392,9 +1392,9 @@ void DeviceBase::ApplyFeatures(const DeviceDescriptor* deviceDescriptor) {
     ASSERT(deviceDescriptor);
     // Validate all required features with device toggles.
     ASSERT(GetPhysicalDevice()->SupportsAllRequiredFeatures(
-        {deviceDescriptor->requiredFeatures, deviceDescriptor->requiredFeaturesCount}, mToggles));
+        {deviceDescriptor->requiredFeatures, deviceDescriptor->requiredFeatureCount}, mToggles));
 
-    for (uint32_t i = 0; i < deviceDescriptor->requiredFeaturesCount; ++i) {
+    for (uint32_t i = 0; i < deviceDescriptor->requiredFeatureCount; ++i) {
         mEnabledFeatures.EnableFeature(deviceDescriptor->requiredFeatures[i]);
     }
 }

src/dawn/native/QuerySet.cpp

@@ -47,7 +47,7 @@ MaybeError ValidateQuerySetDescriptor(DeviceBase* device, const QuerySetDescript
 
     switch (descriptor->type) {
         case wgpu::QueryType::Occlusion:
-            DAWN_INVALID_IF(descriptor->pipelineStatisticsCount != 0,
+            DAWN_INVALID_IF(descriptor->pipelineStatisticCount != 0,
                             "Pipeline statistics specified for a query of type %s.",
                             descriptor->type);
             break;
@@ -63,11 +63,11 @@ MaybeError ValidateQuerySetDescriptor(DeviceBase* device, const QuerySetDescript
                 !device->HasFeature(Feature::PipelineStatisticsQuery),
                 "Pipeline statistics query set created without the feature being enabled.");
 
-            DAWN_INVALID_IF(descriptor->pipelineStatisticsCount == 0,
+            DAWN_INVALID_IF(descriptor->pipelineStatisticCount == 0,
                             "Pipeline statistics query set created with 0 statistics.");
 
             std::set<wgpu::PipelineStatisticName> pipelineStatisticsSet;
-            for (uint32_t i = 0; i < descriptor->pipelineStatisticsCount; i++) {
+            for (uint32_t i = 0; i < descriptor->pipelineStatisticCount; i++) {
                 DAWN_TRY(ValidatePipelineStatisticName(descriptor->pipelineStatistics[i]));
 
                 auto [_, inserted] =
@@ -86,7 +86,7 @@ MaybeError ValidateQuerySetDescriptor(DeviceBase* device, const QuerySetDescript
                                 !device->HasFeature(Feature::TimestampQueryInsidePasses),
                             "Timestamp query set created without the feature being enabled.");
 
-            DAWN_INVALID_IF(descriptor->pipelineStatisticsCount != 0,
+            DAWN_INVALID_IF(descriptor->pipelineStatisticCount != 0,
                             "Pipeline statistics specified for a query of type %s.",
                             descriptor->type);
             break;
@@ -103,7 +103,7 @@ QuerySetBase::QuerySetBase(DeviceBase* device, const QuerySetDescriptor* descrip
       mQueryType(descriptor->type),
       mQueryCount(descriptor->count),
       mState(QuerySetState::Available) {
-    for (uint32_t i = 0; i < descriptor->pipelineStatisticsCount; i++) {
+    for (uint32_t i = 0; i < descriptor->pipelineStatisticCount; i++) {
         mPipelineStatistics.push_back(descriptor->pipelineStatistics[i]);
     }
 

src/dawn/native/RenderBundleEncoder.cpp

@@ -64,13 +64,13 @@ MaybeError ValidateRenderBundleEncoderDescriptor(DeviceBase* device,
                     "Sample count (%u) is not supported.", descriptor->sampleCount);
 
     uint32_t maxColorAttachments = device->GetLimits().v1.maxColorAttachments;
-    DAWN_INVALID_IF(descriptor->colorFormatsCount > maxColorAttachments,
+    DAWN_INVALID_IF(descriptor->colorFormatCount > maxColorAttachments,
                     "Color formats count (%u) exceeds maximum number of color attachements (%u).",
-                    descriptor->colorFormatsCount, maxColorAttachments);
+                    descriptor->colorFormatCount, maxColorAttachments);
 
     bool allColorFormatsUndefined = true;
     ColorAttachmentFormats colorAttachmentFormats;
-    for (uint32_t i = 0; i < descriptor->colorFormatsCount; ++i) {
+    for (uint32_t i = 0; i < descriptor->colorFormatCount; ++i) {
         wgpu::TextureFormat format = descriptor->colorFormats[i];
         if (format != wgpu::TextureFormat::Undefined) {
             DAWN_TRY_CONTEXT(ValidateColorAttachmentFormat(device, format),

src/dawn/native/Toggles.cpp

@@ -500,7 +500,7 @@ TogglesState TogglesState::CreateFromTogglesDescriptor(const DawnTogglesDescript
     }
 
     TogglesInfo togglesInfo;
-    for (uint32_t i = 0; i < togglesDesc->enabledTogglesCount; ++i) {
+    for (uint32_t i = 0; i < togglesDesc->enabledToggleCount; ++i) {
         Toggle toggle = togglesInfo.ToggleNameToEnum(togglesDesc->enabledToggles[i]);
         if (toggle != Toggle::InvalidEnum) {
             const ToggleInfo* toggleInfo = togglesInfo.GetToggleInfo(toggle);
@@ -512,7 +512,7 @@ TogglesState TogglesState::CreateFromTogglesDescriptor(const DawnTogglesDescript
             }
         }
     }
-    for (uint32_t i = 0; i < togglesDesc->disabledTogglesCount; ++i) {
+    for (uint32_t i = 0; i < togglesDesc->disabledToggleCount; ++i) {
         Toggle toggle = togglesInfo.ToggleNameToEnum(togglesDesc->disabledToggles[i]);
         if (toggle != Toggle::InvalidEnum) {
             const ToggleInfo* toggleInfo = togglesInfo.GetToggleInfo(toggle);

src/dawn/native/opengl/PhysicalDeviceGL.cpp

@@ -344,7 +344,7 @@ ResultOrError<Ref<DeviceBase>> PhysicalDevice::CreateDeviceImpl(AdapterBase* ada
         GetBackendType() == wgpu::BackendType::OpenGL ? EGL_OPENGL_API : EGL_OPENGL_ES_API;
     std::unique_ptr<Device::Context> context;
     bool useANGLETextureSharing = false;
-    for (size_t i = 0; i < descriptor->requiredFeaturesCount; ++i) {
+    for (size_t i = 0; i < descriptor->requiredFeatureCount; ++i) {
         if (descriptor->requiredFeatures[i] == wgpu::FeatureName::ANGLETextureSharing) {
             useANGLETextureSharing = true;
         }

src/dawn/node/binding/GPUAdapter.cpp

@@ -134,7 +134,7 @@ interop::Promise<interop::Interface<interop::GPUDevice>> GPUAdapter::requestDevi
         return promise;
     }
 
-    desc.requiredFeaturesCount = requiredFeatures.size();
+    desc.requiredFeatureCount = requiredFeatures.size();
     desc.requiredFeatures = requiredFeatures.data();
     desc.requiredLimits = &limits;