commit 5b196463bebe3efbd5d5f9a5daf33dc23d19dd6e
author Corentin Wallez <cwallez@chromium.org> Fri Apr 02 06:38:53 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Apr 02 06:38:53 2021 +0000
tree 595a74f9ab7918c61ff083289c9c6f4830f956c7
parent b9cab8157e161eb52907482979a636e4fb971118

Remove unnecessary check for null TextureDescriptor.

Bug: None
Change-Id: I59904565c5cb3ec9e035c213d3b3baf3afd49ec3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46624
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Jiawei Shao <jiawei.shao@intel.com>

src/dawn_native/Texture.cpp

diff --git a/src/dawn_native/Texture.cpp b/src/dawn_native/Texture.cpp
index a8d153d..f03c202 100644
--- a/src/dawn_native/Texture.cpp
+++ b/src/dawn_native/Texture.cpp
@@ -266,9 +266,6 @@
 
     MaybeError ValidateTextureDescriptor(const DeviceBase* device,
                                          const TextureDescriptor* descriptor) {
-        if (descriptor == nullptr) {
-            return DAWN_VALIDATION_ERROR("Texture descriptor is nullptr");
-        }
         if (descriptor->nextInChain != nullptr) {
             return DAWN_VALIDATION_ERROR("nextInChain must be nullptr");
         }

src/tests/white_box/VulkanImageWrappingTestsDmaBuf.cpp

diff --git a/src/tests/white_box/VulkanImageWrappingTestsDmaBuf.cpp b/src/tests/white_box/VulkanImageWrappingTestsDmaBuf.cpp
index c5b36e6..d5a9adc 100644
--- a/src/tests/white_box/VulkanImageWrappingTestsDmaBuf.cpp
+++ b/src/tests/white_box/VulkanImageWrappingTestsDmaBuf.cpp
@@ -180,15 +180,6 @@
         IgnoreSignalSemaphore(texture);
     }
 
-    // Test an error occurs if the texture descriptor is missing
-    TEST_P(VulkanImageWrappingValidationTests, MissingTextureDescriptor) {
-        ASSERT_DEVICE_ERROR(wgpu::Texture texture =
-                                WrapVulkanImage(device, nullptr, defaultFd, defaultStride,
-                                                defaultModifier, {}, true, false));
-        EXPECT_EQ(texture.Get(), nullptr);
-        close(defaultFd);
-    }
-
     // Test an error occurs if the texture descriptor is invalid
     TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDescriptor) {
         wgpu::ChainedStruct chainedDescriptor;

src/tests/white_box/VulkanImageWrappingTestsOpaqueFD.cpp

diff --git a/src/tests/white_box/VulkanImageWrappingTestsOpaqueFD.cpp b/src/tests/white_box/VulkanImageWrappingTestsOpaqueFD.cpp
index 9e16567..3c353b2 100644
--- a/src/tests/white_box/VulkanImageWrappingTestsOpaqueFD.cpp
+++ b/src/tests/white_box/VulkanImageWrappingTestsOpaqueFD.cpp
@@ -268,15 +268,6 @@
         IgnoreSignalSemaphore(texture);
     }
 
-    // Test an error occurs if the texture descriptor is missing
-    TEST_P(VulkanImageWrappingValidationTests, MissingTextureDescriptor) {
-        DAWN_SKIP_TEST_IF(UsesWire());
-        ASSERT_DEVICE_ERROR(wgpu::Texture texture =
-                                WrapVulkanImage(device, nullptr, defaultFd, defaultAllocationSize,
-                                                defaultMemoryTypeIndex, {}, true, false));
-        EXPECT_EQ(texture.Get(), nullptr);
-    }
-
     // Test an error occurs if the texture descriptor is invalid
     TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDescriptor) {
         DAWN_SKIP_TEST_IF(UsesWire());