commit 6b087819dd1ea56a50e15bcc34c97ad2fa01d463
author Corentin Wallez <cwallez@chromium.org> Tue Oct 27 15:35:56 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Oct 27 15:35:56 2020 +0000
tree 7f1d86c031f96736a629823d73010e38cdc31935
parent 25eeaa3d39afcc82fe9d384949d4e9c99e6e7903

s/OutputAttachment/RenderAttachment/g

But also keep OutputAttachment so it can be gradually changed in all
dependants.

See https://github.com/gpuweb/gpuweb/pull/1168 and
https://github.com/gpuweb/gpuweb/pull/1168

Bug: dawn:22
Change-Id: I6a1ec1de6c22ca4deac88b7fffde4b98d9d54a84
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/31040
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

examples/Animometer.cpp

diff --git a/examples/Animometer.cpp b/examples/Animometer.cpp
index 5c197c4..e090042 100644
--- a/examples/Animometer.cpp
+++ b/examples/Animometer.cpp
@@ -52,7 +52,7 @@
 
     queue = device.GetDefaultQueue();
     swapchain = GetSwapChain(device);
-    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::OutputAttachment,
+    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
                         640, 480);
 
     wgpu::ShaderModule vsModule =

examples/CHelloTriangle.cpp

diff --git a/examples/CHelloTriangle.cpp b/examples/CHelloTriangle.cpp
index 22d8202..4c5c7cc 100644
--- a/examples/CHelloTriangle.cpp
+++ b/examples/CHelloTriangle.cpp
@@ -34,7 +34,7 @@
         swapchain = wgpuDeviceCreateSwapChain(device, nullptr, &descriptor);
     }
     swapChainFormat = static_cast<WGPUTextureFormat>(GetPreferredSwapChainTextureFormat());
-    wgpuSwapChainConfigure(swapchain, swapChainFormat, WGPUTextureUsage_OutputAttachment, 640, 480);
+    wgpuSwapChainConfigure(swapchain, swapChainFormat, WGPUTextureUsage_RenderAttachment, 640, 480);
 
     const char* vs =
         "#version 450\n"

examples/ComputeBoids.cpp

diff --git a/examples/ComputeBoids.cpp b/examples/ComputeBoids.cpp
index f958ab4..08487da 100644
--- a/examples/ComputeBoids.cpp
+++ b/examples/ComputeBoids.cpp
@@ -292,7 +292,7 @@
 
     queue = device.GetDefaultQueue();
     swapchain = GetSwapChain(device);
-    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::OutputAttachment,
+    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
                         640, 480);
 
     initBuffers();

examples/CppHelloTriangle.cpp

diff --git a/examples/CppHelloTriangle.cpp b/examples/CppHelloTriangle.cpp
index c3548ab..cef8d6e 100644
--- a/examples/CppHelloTriangle.cpp
+++ b/examples/CppHelloTriangle.cpp
@@ -90,7 +90,7 @@
 
     queue = device.GetDefaultQueue();
     swapchain = GetSwapChain(device);
-    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::OutputAttachment,
+    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
                         640, 480);
 
     initBuffers();

examples/CubeReflection.cpp

diff --git a/examples/CubeReflection.cpp b/examples/CubeReflection.cpp
index 52d32b5..125ca6c 100644
--- a/examples/CubeReflection.cpp
+++ b/examples/CubeReflection.cpp
@@ -96,7 +96,7 @@
 
     queue = device.GetDefaultQueue();
     swapchain = GetSwapChain(device);
-    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::OutputAttachment,
+    swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
                         640, 480);
 
     initBuffers();

examples/ManualSwapChainTest.cpp

diff --git a/examples/ManualSwapChainTest.cpp b/examples/ManualSwapChainTest.cpp
index 9e3990d..8918fed 100644
--- a/examples/ManualSwapChainTest.cpp
+++ b/examples/ManualSwapChainTest.cpp
@@ -111,7 +111,7 @@
     glfwSetKeyCallback(window, OnKeyPress);
 
     wgpu::SwapChainDescriptor descriptor;
-    descriptor.usage = wgpu::TextureUsage::OutputAttachment;
+    descriptor.usage = wgpu::TextureUsage::RenderAttachment;
     descriptor.format = wgpu::TextureFormat::BGRA8Unorm;
     descriptor.width = 0;
     descriptor.height = 0;
@@ -165,8 +165,8 @@
 
 std::ostream& operator<<(std::ostream& o, const wgpu::SwapChainDescriptor& desc) {
     // For now only output attachment is possible.
-    ASSERT(desc.usage == wgpu::TextureUsage::OutputAttachment);
-    o << "OutputAttachment ";
+    ASSERT(desc.usage == wgpu::TextureUsage::RenderAttachment);
+    o << "RenderAttachment ";
     o << desc.width << "x" << desc.height << " ";
 
     // For now only BGRA is allowed

examples/SampleUtils.cpp

diff --git a/examples/SampleUtils.cpp b/examples/SampleUtils.cpp
index f1fbb6c..cab6cb0 100644
--- a/examples/SampleUtils.cpp
+++ b/examples/SampleUtils.cpp
@@ -188,7 +188,7 @@
     descriptor.sampleCount = 1;
     descriptor.format = wgpu::TextureFormat::Depth24PlusStencil8;
     descriptor.mipLevelCount = 1;
-    descriptor.usage = wgpu::TextureUsage::OutputAttachment;
+    descriptor.usage = wgpu::TextureUsage::RenderAttachment;
     auto depthStencilTexture = device.CreateTexture(&descriptor);
     return depthStencilTexture.CreateView();
 }