Revert "[YCbCr Samplers] Rename SamplerYCbCrVulkanDesc to YCbCrVulkanDesc"
This reverts commit 93d2c7f83a67404504da80411d8c8eb809616f70.
Reason for revert: Rename raced with another CL
https://dawn-review.googlesource.com/c/dawn/+/184301 so now there are
compile errors.
Original change's description:
> [YCbCr Samplers] Rename SamplerYCbCrVulkanDesc to YCbCrVulkanDesc
>
> Rename SamplerYCbCrVulkanDescriptor to YCbCrVulkanDescriptor prior to
> using it with TextureViewDescriptor.
>
> Change-Id: I4b3aa734fd98b44e0e64eac7b47ad1aa66f28c15
> Bug: dawn:2476
> Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/184780
> Reviewed-by: Austin Eng <enga@chromium.org>
> Commit-Queue: Saifuddin Hitawala <hitawala@chromium.org>
TBR=cwallez@chromium.org,enga@chromium.org,dawn-scoped@luci-project-accounts.iam.gserviceaccount.com,hitawala@chromium.org
Change-Id: I027c9e314d3a71977e8333ce95446827ef480cde
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: dawn:2476
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/184860
Commit-Queue: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Austin Eng <enga@chromium.org>
diff --git a/include/dawn/native/VulkanBackend.h b/include/dawn/native/VulkanBackend.h
index bc644ec..0aad920 100644
--- a/include/dawn/native/VulkanBackend.h
+++ b/include/dawn/native/VulkanBackend.h
@@ -83,8 +83,8 @@
};
// Can be chained in WGPUSamplerDescriptor
-struct DAWN_NATIVE_EXPORT YCbCrVulkanDescriptor : wgpu::ChainedStruct {
- YCbCrVulkanDescriptor();
+struct DAWN_NATIVE_EXPORT SamplerYCbCrVulkanDescriptor : wgpu::ChainedStruct {
+ SamplerYCbCrVulkanDescriptor();
::VkSamplerYcbcrConversionCreateInfo vulkanYCbCrInfo;
};
diff --git a/src/dawn/dawn.json b/src/dawn/dawn.json
index 4e103af..fa93285 100644
--- a/src/dawn/dawn.json
+++ b/src/dawn/dawn.json
@@ -3745,7 +3745,7 @@
{"value": 1214, "name": "shared fence MTL shared event export info", "tags": ["dawn", "native"]},
{"value": 1215, "name": "shared buffer memory D3D12 resource descriptor", "tags": ["dawn", "native"]},
{"value": 1216, "name": "static sampler binding layout", "tags": ["dawn"]},
- {"value": 1217, "name": "y cb cr vulkan descriptor", "tags": ["dawn", "native"]}
+ {"value": 1217, "name": "sampler y cb cr vulkan descriptor", "tags": ["dawn", "native"]}
]
},
"texture": {
diff --git a/src/dawn/native/ChainUtilsImpl.inl b/src/dawn/native/ChainUtilsImpl.inl
index 6850ad3..8b36ce7 100644
--- a/src/dawn/native/ChainUtilsImpl.inl
+++ b/src/dawn/native/ChainUtilsImpl.inl
@@ -50,7 +50,7 @@
}
namespace vulkan {
-struct YCbCrVulkanDescriptor;
+struct SamplerYCbCrVulkanDescriptor;
}
namespace detail {
@@ -104,13 +104,13 @@
};
template <>
-constexpr inline wgpu::SType STypeForImpl<vulkan::YCbCrVulkanDescriptor> =
- wgpu::SType(WGPUSType_YCbCrVulkanDescriptor);
+constexpr inline wgpu::SType STypeForImpl<vulkan::SamplerYCbCrVulkanDescriptor> =
+ wgpu::SType(WGPUSType_SamplerYCbCrVulkanDescriptor);
template <>
struct AdditionalExtensions<SamplerDescriptor> {
using List =
- AdditionalExtensionsList<const vulkan::YCbCrVulkanDescriptor*>;
+ AdditionalExtensionsList<const vulkan::SamplerYCbCrVulkanDescriptor*>;
};
} // namespace detail
diff --git a/src/dawn/native/Sampler.cpp b/src/dawn/native/Sampler.cpp
index 3940715..098a564 100644
--- a/src/dawn/native/Sampler.cpp
+++ b/src/dawn/native/Sampler.cpp
@@ -37,7 +37,7 @@
namespace dawn::native {
namespace vulkan {
-struct YCbCrVulkanDescriptor;
+struct SamplerYCbCrVulkanDescriptor;
}
MaybeError ValidateSamplerDescriptor(DeviceBase* device, const SamplerDescriptor* descriptor) {
@@ -76,7 +76,7 @@
UnpackedPtr<SamplerDescriptor> unpacked = Unpack(descriptor);
- if (unpacked.Get<vulkan::YCbCrVulkanDescriptor>()) {
+ if (unpacked.Get<vulkan::SamplerYCbCrVulkanDescriptor>()) {
DAWN_INVALID_IF(!device->HasFeature(Feature::YCbCrVulkanSamplers), "%s is not enabled.",
wgpu::FeatureName::YCbCrVulkanSamplers);
}
diff --git a/src/dawn/native/vulkan/BackendVk.cpp b/src/dawn/native/vulkan/BackendVk.cpp
index 001a988..acad9cdb 100644
--- a/src/dawn/native/vulkan/BackendVk.cpp
+++ b/src/dawn/native/vulkan/BackendVk.cpp
@@ -283,8 +283,8 @@
} // anonymous namespace
-YCbCrVulkanDescriptor::YCbCrVulkanDescriptor() {
- sType = wgpu::SType::YCbCrVulkanDescriptor;
+SamplerYCbCrVulkanDescriptor::SamplerYCbCrVulkanDescriptor() {
+ sType = wgpu::SType::SamplerYCbCrVulkanDescriptor;
}
VulkanInstance::VulkanInstance() = default;
diff --git a/src/dawn/native/vulkan/SamplerVk.cpp b/src/dawn/native/vulkan/SamplerVk.cpp
index 4f3e334..e931213 100644
--- a/src/dawn/native/vulkan/SamplerVk.cpp
+++ b/src/dawn/native/vulkan/SamplerVk.cpp
@@ -122,7 +122,8 @@
}
VkSamplerYcbcrConversionInfo samplerYCbCrInfo = {};
- if (auto* vulkanYCbCrDescriptor = Unpack(descriptor).Get<vulkan::YCbCrVulkanDescriptor>()) {
+ if (auto* vulkanYCbCrDescriptor =
+ Unpack(descriptor).Get<vulkan::SamplerYCbCrVulkanDescriptor>()) {
const VkSamplerYcbcrConversionCreateInfo& vulkanYCbCrInfo =
vulkanYCbCrDescriptor->vulkanYCbCrInfo;
#if DAWN_PLATFORM_IS(ANDROID)
diff --git a/src/dawn/tests/end2end/YCbCrSamplerTests.cpp b/src/dawn/tests/end2end/YCbCrSamplerTests.cpp
index 795b3f1..fadb9a6 100644
--- a/src/dawn/tests/end2end/YCbCrSamplerTests.cpp
+++ b/src/dawn/tests/end2end/YCbCrSamplerTests.cpp
@@ -59,7 +59,7 @@
// Test that it is possible to create the sampler with ycbcr sampler descriptor.
TEST_P(YCbCrSamplerTest, YCbCrSamplerValidWhenFeatureEnabled) {
wgpu::SamplerDescriptor samplerDesc = {};
- native::vulkan::YCbCrVulkanDescriptor samplerYCbCrDesc = {};
+ native::vulkan::SamplerYCbCrVulkanDescriptor samplerYCbCrDesc = {};
samplerYCbCrDesc.vulkanYCbCrInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO;
samplerYCbCrDesc.vulkanYCbCrInfo.pNext = nullptr;
samplerYCbCrDesc.vulkanYCbCrInfo.format = VK_FORMAT_R8G8B8A8_UNORM;
@@ -73,7 +73,7 @@
// format set.
TEST_P(YCbCrSamplerTest, YCbCrSamplerValidWithOnlyVkFormat) {
wgpu::SamplerDescriptor samplerDesc = {};
- native::vulkan::YCbCrVulkanDescriptor samplerYCbCrDesc = {};
+ native::vulkan::SamplerYCbCrVulkanDescriptor samplerYCbCrDesc = {};
samplerYCbCrDesc.vulkanYCbCrInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO;
samplerYCbCrDesc.vulkanYCbCrInfo.pNext = nullptr;
samplerYCbCrDesc.vulkanYCbCrInfo.format = VK_FORMAT_R8G8B8A8_UNORM;
@@ -97,7 +97,7 @@
// format set.
TEST_P(YCbCrSamplerTest, YCbCrSamplerValidWithOnlyExternalFormat) {
wgpu::SamplerDescriptor samplerDesc = {};
- native::vulkan::YCbCrVulkanDescriptor samplerYCbCrDesc = {};
+ native::vulkan::SamplerYCbCrVulkanDescriptor samplerYCbCrDesc = {};
samplerYCbCrDesc.vulkanYCbCrInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO;
samplerYCbCrDesc.vulkanYCbCrInfo.pNext = nullptr;
// format is set as externalFormat.
@@ -121,7 +121,7 @@
// set.
TEST_P(YCbCrSamplerTest, YCbCrSamplerInvalidWithNoFormat) {
wgpu::SamplerDescriptor samplerDesc = {};
- native::vulkan::YCbCrVulkanDescriptor samplerYCbCrDesc = {};
+ native::vulkan::SamplerYCbCrVulkanDescriptor samplerYCbCrDesc = {};
samplerYCbCrDesc.vulkanYCbCrInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO;
samplerYCbCrDesc.vulkanYCbCrInfo.pNext = nullptr;
samplerYCbCrDesc.vulkanYCbCrInfo.format = VK_FORMAT_UNDEFINED;
diff --git a/src/dawn/tests/unittests/validation/YCbCrSamplerValidationTests.cpp b/src/dawn/tests/unittests/validation/YCbCrSamplerValidationTests.cpp
index e20e1ac..1ad87a4 100644
--- a/src/dawn/tests/unittests/validation/YCbCrSamplerValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/YCbCrSamplerValidationTests.cpp
@@ -44,7 +44,7 @@
// if the required feature is not enabled.
TEST_F(YCbCrSamplerValidationTest, YCbCrSamplerNotSupportedWithoutFeatureEnabled) {
wgpu::SamplerDescriptor samplerDesc = {};
- native::vulkan::YCbCrVulkanDescriptor samplerYCbCrDesc = {};
+ native::vulkan::SamplerYCbCrVulkanDescriptor samplerYCbCrDesc = {};
samplerDesc.nextInChain = &samplerYCbCrDesc;
ASSERT_DEVICE_ERROR(device.CreateSampler(&samplerDesc));
@@ -64,7 +64,7 @@
// required feature is enabled.
TEST_F(YCbCrSamplerWithFeatureValidationTest, YCbCrSamplerSupportedWhenFeatureEnabled) {
wgpu::SamplerDescriptor samplerDesc = {};
- native::vulkan::YCbCrVulkanDescriptor samplerYCbCrDesc = {};
+ native::vulkan::SamplerYCbCrVulkanDescriptor samplerYCbCrDesc = {};
samplerYCbCrDesc.vulkanYCbCrInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO;
samplerDesc.nextInChain = &samplerYCbCrDesc;
