Remove timestamp-query feature
This CL is the last one of the series whose goal is to rename the
timestamp-query-inside-passes dawn experimental feature to
chromium-experimental-timestamp-query-inside-passes.
Bug: dawn:1193
Change-Id: I34e6138d9f43b372d3236246142c46c1b4031bc6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/156680
Commit-Queue: Fr <beaufort.francois@gmail.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/dawn.json b/dawn.json
index 9dd89ce..c314bb8 100644
--- a/dawn.json
+++ b/dawn.json
@@ -1892,7 +1892,7 @@
{"value": 1003, "name": "dawn multi planar formats", "tags": ["dawn"]},
{"value": 1004, "name": "dawn native", "tags": ["dawn", "native"]},
{"value": 1005, "name": "chromium experimental dp4a", "tags": ["dawn"]},
- {"value": 1006, "name": "timestamp query inside passes", "tags": ["dawn"]},
+ {"value": 1006, "name": "chromium experimental timestamp query inside passes", "tags": ["dawn"]},
{"value": 1007, "name": "implicit device synchronization", "tags": ["dawn", "native"]},
{"value": 1008, "name": "surface capabilities", "tags": ["dawn", "native"]},
{"value": 1009, "name": "transient attachments", "tags": ["dawn"]},
@@ -1910,7 +1910,6 @@
{"value": 1021, "name": "multi planar format p010", "tags": ["dawn"]},
{"value": 1022, "name": "host mapped pointer", "tags": ["dawn"]},
{"value": 1023, "name": "multi planar render targets", "tags": ["dawn"]},
- {"value": 1024, "name": "chromium experimental timestamp query inside passes", "tags": ["dawn"]},
{"value": 1100, "name": "shared texture memory vk dedicated allocation", "tags": ["dawn", "native"]},
{"value": 1101, "name": "shared texture memory a hardware buffer", "tags": ["dawn", "native"]},
diff --git a/src/dawn/native/Features.cpp b/src/dawn/native/Features.cpp
index c6d416c..06beac6 100644
--- a/src/dawn/native/Features.cpp
+++ b/src/dawn/native/Features.cpp
@@ -65,10 +65,6 @@
{Feature::TimestampQuery,
{"Support Timestamp Query", "https://bugs.chromium.org/p/dawn/issues/detail?id=434",
FeatureInfo::FeatureState::Experimental}},
- {Feature::TimestampQueryInsidePasses,
- {"Support Timestamp Query inside render/compute pass",
- "https://bugs.chromium.org/p/dawn/issues/detail?id=434",
- FeatureInfo::FeatureState::Experimental}},
{Feature::ChromiumExperimentalTimestampQueryInsidePasses,
{"Support experimental Timestamp Query inside render/compute pass",
"https://bugs.chromium.org/p/dawn/issues/detail?id=434",
diff --git a/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp b/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp
index 7138808..35233f2 100644
--- a/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp
+++ b/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp
@@ -144,7 +144,6 @@
if (AreTimestampQueriesSupported()) {
EnableFeature(Feature::TimestampQuery);
- EnableFeature(Feature::TimestampQueryInsidePasses);
EnableFeature(Feature::ChromiumExperimentalTimestampQueryInsidePasses);
}
EnableFeature(Feature::PipelineStatisticsQuery);
diff --git a/src/dawn/native/metal/BackendMTL.mm b/src/dawn/native/metal/BackendMTL.mm
index 14737d3..5dbaa57 100644
--- a/src/dawn/native/metal/BackendMTL.mm
+++ b/src/dawn/native/metal/BackendMTL.mm
@@ -519,7 +519,6 @@
}
if (enableTimestampQueryInsidePasses) {
- EnableFeature(Feature::TimestampQueryInsidePasses);
EnableFeature(Feature::ChromiumExperimentalTimestampQueryInsidePasses);
}
}
diff --git a/src/dawn/native/vulkan/PhysicalDeviceVk.cpp b/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
index 1a461f8..7ac8775 100644
--- a/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
+++ b/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
@@ -220,7 +220,6 @@
if (mDeviceInfo.properties.limits.timestampComputeAndGraphics == VK_TRUE &&
!IsAndroidQualcomm()) {
EnableFeature(Feature::TimestampQuery);
- EnableFeature(Feature::TimestampQueryInsidePasses);
EnableFeature(Feature::ChromiumExperimentalTimestampQueryInsidePasses);
}
diff --git a/src/dawn/node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp
index 1765e48..cbeeb1e 100644
--- a/src/dawn/node/binding/Converter.cpp
+++ b/src/dawn/node/binding/Converter.cpp
@@ -1535,7 +1535,6 @@
case wgpu::FeatureName::SharedTextureMemoryVkDedicatedAllocation:
case wgpu::FeatureName::SharedTextureMemoryZirconHandle:
case wgpu::FeatureName::SurfaceCapabilities:
- case wgpu::FeatureName::TimestampQueryInsidePasses:
case wgpu::FeatureName::ChromiumExperimentalTimestampQueryInsidePasses:
case wgpu::FeatureName::TransientAttachments:
case wgpu::FeatureName::HostMappedPointer:
diff --git a/src/dawn/wire/SupportedFeatures.cpp b/src/dawn/wire/SupportedFeatures.cpp
index d1f3067..60333e2 100644
--- a/src/dawn/wire/SupportedFeatures.cpp
+++ b/src/dawn/wire/SupportedFeatures.cpp
@@ -57,7 +57,6 @@
return false;
case WGPUFeatureName_Depth32FloatStencil8:
case WGPUFeatureName_TimestampQuery:
- case WGPUFeatureName_TimestampQueryInsidePasses:
case WGPUFeatureName_ChromiumExperimentalTimestampQueryInsidePasses:
case WGPUFeatureName_PipelineStatisticsQuery:
case WGPUFeatureName_TextureCompressionBC:
