mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-09 05:27:49 +00:00
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>
This commit is contained in:
committed by
Commit Bot service account
parent
25eeaa3d39
commit
6b087819dd
@@ -52,7 +52,7 @@ void init() {
|
||||
|
||||
queue = device.GetDefaultQueue();
|
||||
swapchain = GetSwapChain(device);
|
||||
swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::OutputAttachment,
|
||||
swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
|
||||
640, 480);
|
||||
|
||||
wgpu::ShaderModule vsModule =
|
||||
|
||||
@@ -34,7 +34,7 @@ void init() {
|
||||
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"
|
||||
|
||||
@@ -292,7 +292,7 @@ void init() {
|
||||
|
||||
queue = device.GetDefaultQueue();
|
||||
swapchain = GetSwapChain(device);
|
||||
swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::OutputAttachment,
|
||||
swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
|
||||
640, 480);
|
||||
|
||||
initBuffers();
|
||||
|
||||
@@ -90,7 +90,7 @@ void init() {
|
||||
|
||||
queue = device.GetDefaultQueue();
|
||||
swapchain = GetSwapChain(device);
|
||||
swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::OutputAttachment,
|
||||
swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
|
||||
640, 480);
|
||||
|
||||
initBuffers();
|
||||
|
||||
@@ -96,7 +96,7 @@ void init() {
|
||||
|
||||
queue = device.GetDefaultQueue();
|
||||
swapchain = GetSwapChain(device);
|
||||
swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::OutputAttachment,
|
||||
swapchain.Configure(GetPreferredSwapChainTextureFormat(), wgpu::TextureUsage::RenderAttachment,
|
||||
640, 480);
|
||||
|
||||
initBuffers();
|
||||
|
||||
@@ -111,7 +111,7 @@ void AddWindow() {
|
||||
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 @@ void DoRender(WindowData* data) {
|
||||
|
||||
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
|
||||
|
||||
@@ -188,7 +188,7 @@ wgpu::TextureView CreateDefaultDepthStencilView(const wgpu::Device& device) {
|
||||
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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user