Remove typedefs and features for SharedFenceVkSemaphoreSyncFD
Chrome has updated to use the new SharedFenceSyncFD name.
Bug: 42241435
Change-Id: Ic694177304297980a9169fabe52622e49ec6f8e9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/214914
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Loko Kung <lokokung@google.com>
diff --git a/src/dawn/dawn.json b/src/dawn/dawn.json
index 3e42c39..fc01551 100644
--- a/src/dawn/dawn.json
+++ b/src/dawn/dawn.json
@@ -2373,11 +2373,6 @@
{"name": "handle", "type": "int"}
]
},
- "shared fence vk semaphore sync FD descriptor": {
- "category": "typedef",
- "tags": ["dawn", "native"],
- "type": "shared fence sync FD descriptor"
- },
"shared fence vk semaphore zircon handle descriptor": {
"category": "structure",
"chained": "in",
@@ -2443,11 +2438,6 @@
{"name": "handle", "type": "int"}
]
},
- "shared fence vk semaphore sync FD export info": {
- "category": "typedef",
- "tags": ["dawn", "native"],
- "type": "shared fence sync FD export info"
- },
"shared fence vk semaphore zircon handle export info": {
"category": "structure",
"chained": "out",
@@ -2552,8 +2542,7 @@
{"value": 53, "name": "dawn load resolve texture", "tags": ["dawn"]},
{"value": 54, "name": "dawn partial load resolve texture", "tags": ["dawn"]},
{"value": 55, "name": "multi draw indirect", "tags": ["dawn"]},
- {"value": 56, "name": "clip distances", "tags": ["dawn"]},
- {"value": 57, "name": "shared fence vk semaphore sync FD", "tags": ["dawn", "native"]}
+ {"value": 56, "name": "clip distances", "tags": ["dawn"]}
]
},
"filter mode": {
diff --git a/src/dawn/native/Features.cpp b/src/dawn/native/Features.cpp
index 277c085..f0c3944 100644
--- a/src/dawn/native/Features.cpp
+++ b/src/dawn/native/Features.cpp
@@ -288,10 +288,6 @@
{"Support for importing and exporting SyncFD used for GPU synchronization.",
"https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/shared_fence.md",
FeatureInfo::FeatureState::Stable}},
- {Feature::SharedFenceVkSemaphoreSyncFD,
- {"Support for importing and exporting VkSemaphoreSyncFD used for GPU synchronization.",
- "https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/shared_fence.md",
- FeatureInfo::FeatureState::Stable}},
{Feature::SharedFenceVkSemaphoreZirconHandle,
{"Support for importing and exporting VkSemaphoreZirconHandle used for GPU synchronization.",
"https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/shared_fence.md",
diff --git a/src/dawn/native/vulkan/DeviceVk.cpp b/src/dawn/native/vulkan/DeviceVk.cpp
index d7eb276..c88d294 100644
--- a/src/dawn/native/vulkan/DeviceVk.cpp
+++ b/src/dawn/native/vulkan/DeviceVk.cpp
@@ -132,7 +132,6 @@
mExternalMemoryService = std::make_unique<external_memory::Service>(this);
if (uint32_t(HasFeature(Feature::SharedFenceVkSemaphoreOpaqueFD)) +
- uint32_t(HasFeature(Feature::SharedFenceVkSemaphoreSyncFD)) +
uint32_t(HasFeature(Feature::SharedFenceSyncFD)) +
uint32_t(HasFeature(Feature::SharedFenceVkSemaphoreZirconHandle)) >
1) {
@@ -144,8 +143,7 @@
if (HasFeature(Feature::SharedFenceVkSemaphoreOpaqueFD)) {
mExternalSemaphoreService = std::make_unique<external_semaphore::Service>(
this, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR);
- } else if (HasFeature(Feature::SharedFenceSyncFD) ||
- HasFeature(Feature::SharedFenceVkSemaphoreSyncFD)) {
+ } else if (HasFeature(Feature::SharedFenceSyncFD)) {
mExternalSemaphoreService = std::make_unique<external_semaphore::Service>(
this, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT);
} else if (HasFeature(Feature::SharedFenceVkSemaphoreZirconHandle)) {
@@ -313,10 +311,8 @@
this, descriptor->label,
unpacked.Get<SharedFenceVkSemaphoreZirconHandleDescriptor>());
case wgpu::SType::SharedFenceSyncFDDescriptor:
- DAWN_INVALID_IF(!HasFeature(Feature::SharedFenceSyncFD) &&
- !HasFeature(Feature::SharedFenceVkSemaphoreSyncFD),
- "%s or %s are not enabled.", wgpu::FeatureName::SharedFenceSyncFD,
- wgpu::FeatureName::SharedFenceVkSemaphoreSyncFD);
+ DAWN_INVALID_IF(!HasFeature(Feature::SharedFenceSyncFD), "%s is not enabled.",
+ wgpu::FeatureName::SharedFenceSyncFD);
return SharedFence::Create(this, descriptor->label,
unpacked.Get<SharedFenceSyncFDDescriptor>());
case wgpu::SType::SharedFenceVkSemaphoreOpaqueFDDescriptor:
diff --git a/src/dawn/native/vulkan/PhysicalDeviceVk.cpp b/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
index ae5d79a..84499d3 100644
--- a/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
+++ b/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
@@ -475,7 +475,6 @@
}
if (CheckSemaphoreSupport(DeviceExt::ExternalSemaphoreFD,
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR)) {
- EnableFeature(Feature::SharedFenceVkSemaphoreSyncFD);
EnableFeature(Feature::SharedFenceSyncFD);
}
if (CheckSemaphoreSupport(DeviceExt::ExternalSemaphoreFD,
diff --git a/src/dawn/native/vulkan/SharedTextureMemoryVk.cpp b/src/dawn/native/vulkan/SharedTextureMemoryVk.cpp
index 65699f46..4bf68bd 100644
--- a/src/dawn/native/vulkan/SharedTextureMemoryVk.cpp
+++ b/src/dawn/native/vulkan/SharedTextureMemoryVk.cpp
@@ -1032,12 +1032,10 @@
wgpu::SharedFenceType::VkSemaphoreZirconHandle);
#elif DAWN_PLATFORM_IS(LINUX)
DAWN_INVALID_IF(!GetDevice()->HasFeature(Feature::SharedFenceSyncFD) &&
- !GetDevice()->HasFeature(Feature::SharedFenceVkSemaphoreSyncFD) &&
!GetDevice()->HasFeature(Feature::SharedFenceVkSemaphoreOpaqueFD),
- "Required feature (%s or %s or %s) for %s or %s is missing.",
+ "Required feature (%s or %s) for %s or %s is missing.",
wgpu::FeatureName::SharedFenceVkSemaphoreOpaqueFD,
wgpu::FeatureName::SharedFenceSyncFD,
- wgpu::FeatureName::SharedFenceVkSemaphoreSyncFD,
wgpu::SharedFenceType::VkSemaphoreOpaqueFD, wgpu::SharedFenceType::SyncFD);
#endif
@@ -1066,8 +1064,7 @@
DAWN_TRY_ASSIGN(fence,
SharedFence::Create(ToBackend(GetDevice()), "Internal VkSemaphore", &desc));
#elif DAWN_PLATFORM_IS(LINUX)
- if (GetDevice()->HasFeature(Feature::SharedFenceSyncFD) ||
- GetDevice()->HasFeature(Feature::SharedFenceVkSemaphoreSyncFD)) {
+ if (GetDevice()->HasFeature(Feature::SharedFenceSyncFD)) {
SharedFenceSyncFDDescriptor desc;
desc.handle = handle.Get();
diff --git a/src/dawn/node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp
index 25cc5cc..980a52f 100644
--- a/src/dawn/node/binding/Converter.cpp
+++ b/src/dawn/node/binding/Converter.cpp
@@ -1612,7 +1612,6 @@
case wgpu::FeatureName::SharedFenceMTLSharedEvent:
case wgpu::FeatureName::SharedFenceVkSemaphoreOpaqueFD:
case wgpu::FeatureName::SharedFenceSyncFD:
- case wgpu::FeatureName::SharedFenceVkSemaphoreSyncFD:
case wgpu::FeatureName::SharedFenceVkSemaphoreZirconHandle:
case wgpu::FeatureName::SharedTextureMemoryAHardwareBuffer:
case wgpu::FeatureName::SharedTextureMemoryD3D11Texture2D:
diff --git a/src/dawn/wire/SupportedFeatures.cpp b/src/dawn/wire/SupportedFeatures.cpp
index 03dc44d..ff26aa2 100644
--- a/src/dawn/wire/SupportedFeatures.cpp
+++ b/src/dawn/wire/SupportedFeatures.cpp
@@ -60,7 +60,6 @@
case WGPUFeatureName_SharedTextureMemoryEGLImage:
case WGPUFeatureName_SharedFenceVkSemaphoreOpaqueFD:
case WGPUFeatureName_SharedFenceSyncFD:
- case WGPUFeatureName_SharedFenceVkSemaphoreSyncFD:
case WGPUFeatureName_SharedFenceVkSemaphoreZirconHandle:
case WGPUFeatureName_SharedFenceDXGISharedHandle:
case WGPUFeatureName_SharedFenceMTLSharedEvent:
