commit 27e17a6aad1f80786baa413b67e054a40e119ab2
author Brandon Jones <bajones@chromium.org> Tue Aug 10 04:07:37 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 10 04:07:37 2021 +0000
tree 6d14eff8d1b0d314fb936f957acbc772a4b329d8
parent f99d5aa7d407055061a2693254fff1c38853b745

Update deprecated TextureUsage flag names

Older names are kept around as an alias for a while. Unfortunately we
have no mechanism for producing deprecation error messages when they
are used.

Bug: dawn:1035
Change-Id: Ic6716fd526ecbedaa8e7925ab93e3ff32f642d97
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/61382
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Brandon Jones <bajones@chromium.org>

src/tests/unittests/validation/CopyTextureForBrowserTests.cpp

diff --git a/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp b/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
index ad93f7d..a242625 100644
--- a/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
+++ b/src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
@@ -71,7 +71,7 @@
 TEST_F(CopyTextureForBrowserTest, Success) {
     wgpu::Texture source =
         Create2DTexture(16, 16, 5, 4, wgpu::TextureFormat::RGBA8Unorm,
-                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::Sampled);
+                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::TextureBinding);
     wgpu::Texture destination =
         Create2DTexture(16, 16, 5, 4, wgpu::TextureFormat::RGBA8Unorm,
                         wgpu::TextureUsage::CopyDst | wgpu::TextureUsage::RenderAttachment);
@@ -127,7 +127,7 @@
 TEST_F(CopyTextureForBrowserTest, IncorrectUsage) {
     wgpu::Texture validSource =
         Create2DTexture(16, 16, 5, 1, wgpu::TextureFormat::RGBA8Unorm,
-                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::Sampled);
+                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::TextureBinding);
     wgpu::Texture validDestination =
         Create2DTexture(16, 16, 5, 1, wgpu::TextureFormat::RGBA8Unorm,
                         wgpu::TextureUsage::CopyDst | wgpu::TextureUsage::RenderAttachment);
@@ -135,8 +135,8 @@
         Create2DTexture(16, 16, 5, 1, wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureUsage::CopySrc);
     wgpu::Texture noRenderAttachmentUsageDestination =
         Create2DTexture(16, 16, 5, 2, wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureUsage::CopyDst);
-    wgpu::Texture noCopySrcUsageSource =
-        Create2DTexture(16, 16, 5, 1, wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureUsage::Sampled);
+    wgpu::Texture noCopySrcUsageSource = Create2DTexture(
+        16, 16, 5, 1, wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureUsage::TextureBinding);
     wgpu::Texture noCopyDstUsageSource = Create2DTexture(
         16, 16, 5, 2, wgpu::TextureFormat::RGBA8Unorm, wgpu::TextureUsage::RenderAttachment);
 
@@ -161,7 +161,7 @@
 TEST_F(CopyTextureForBrowserTest, OutOfBounds) {
     wgpu::Texture source =
         Create2DTexture(16, 16, 5, 1, wgpu::TextureFormat::RGBA8Unorm,
-                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::Sampled);
+                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::TextureBinding);
     wgpu::Texture destination =
         Create2DTexture(16, 16, 5, 4, wgpu::TextureFormat::RGBA8Unorm,
                         wgpu::TextureUsage::CopyDst | wgpu::TextureUsage::RenderAttachment);
@@ -221,7 +221,7 @@
 TEST_F(CopyTextureForBrowserTest, InvalidDstFormat) {
     wgpu::Texture source =
         Create2DTexture(16, 16, 5, 1, wgpu::TextureFormat::RGBA8Unorm,
-                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::Sampled);
+                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::TextureBinding);
     wgpu::Texture destination =
         Create2DTexture(16, 16, 5, 2, wgpu::TextureFormat::RG8Uint,
                         wgpu::TextureUsage::CopyDst | wgpu::TextureUsage::RenderAttachment);
@@ -235,13 +235,13 @@
 TEST_F(CopyTextureForBrowserTest, InvalidSampleCount) {
     wgpu::Texture sourceMultiSampled1x =
         Create2DTexture(16, 16, 1, 1, wgpu::TextureFormat::RGBA8Unorm,
-                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::Sampled, 1);
+                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::TextureBinding, 1);
     wgpu::Texture destinationMultiSampled1x =
         Create2DTexture(16, 16, 1, 1, wgpu::TextureFormat::RGBA8Unorm,
                         wgpu::TextureUsage::CopyDst | wgpu::TextureUsage::RenderAttachment, 1);
     wgpu::Texture sourceMultiSampled4x =
         Create2DTexture(16, 16, 1, 1, wgpu::TextureFormat::RGBA8Unorm,
-                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::Sampled, 4);
+                        wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::TextureBinding, 4);
     wgpu::Texture destinationMultiSampled4x =
         Create2DTexture(16, 16, 1, 1, wgpu::TextureFormat::RGBA8Unorm,
                         wgpu::TextureUsage::CopyDst | wgpu::TextureUsage::RenderAttachment, 4);