encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deprecated API usages in samples 

Bug: None
Change-Id: I13a05e6edf5dbd9419d6f2fa813ca0651c5ff6a1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/84764
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Loko Kung <lokokung@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2022-03-31 09:30:35 +00:00 committed by Dawn LUCI CQ
parent f57867264a
commit 9c0faa8500
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/dawn/Animometer.cpp
View File

@ -168,7 +168,7 @@ void frame() {
pass.Draw(3); pass.Draw(3);
} }
pass.EndPass(); pass.End();
} }
wgpu::CommandBuffer commands = encoder.Finish(); wgpu::CommandBuffer commands = encoder.Finish();

4
samples/dawn/CHelloTriangle.cpp
View File

@ -112,7 +112,7 @@ void frame() {
{ {
colorAttachment.view = backbufferView; colorAttachment.view = backbufferView;
colorAttachment.resolveTarget = nullptr; colorAttachment.resolveTarget = nullptr;
colorAttachment.clearColor = {0.0f, 0.0f, 0.0f, 0.0f}; colorAttachment.clearValue = {0.0f, 0.0f, 0.0f, 0.0f};
colorAttachment.loadOp = WGPULoadOp_Clear; colorAttachment.loadOp = WGPULoadOp_Clear;
colorAttachment.storeOp = WGPUStoreOp_Store; colorAttachment.storeOp = WGPUStoreOp_Store;
renderpassInfo.colorAttachmentCount = 1; renderpassInfo.colorAttachmentCount = 1;
@ -126,7 +126,7 @@ void frame() {
WGPURenderPassEncoder pass = wgpuCommandEncoderBeginRenderPass(encoder, &renderpassInfo); WGPURenderPassEncoder pass = wgpuCommandEncoderBeginRenderPass(encoder, &renderpassInfo);
wgpuRenderPassEncoderSetPipeline(pass, pipeline); wgpuRenderPassEncoderSetPipeline(pass, pipeline);
wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0); wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0);
wgpuRenderPassEncoderEndPass(pass); wgpuRenderPassEncoderEnd(pass);
wgpuRenderPassEncoderRelease(pass); wgpuRenderPassEncoderRelease(pass);
commands = wgpuCommandEncoderFinish(encoder, nullptr); commands = wgpuCommandEncoderFinish(encoder, nullptr);

6
samples/dawn/ComputeBoids.cpp
View File

@ -165,7 +165,7 @@ void initSim() {
particles : array<Particle>; particles : array<Particle>;
}; };
@binding(0) @group(0) var<uniform> params : SimParams; @binding(0) @group(0) var<uniform> params : SimParams;
@binding(1) @group(0) var<storage, read> particlesA : Particles; @binding(1) @group(0) var<storage, read_write> particlesA : Particles;
@binding(2) @group(0) var<storage, read_write> particlesB : Particles; @binding(2) @group(0) var<storage, read_write> particlesB : Particles;
// https://github.com/austinEng/Project6-Vulkan-Flocking/blob/master/data/shaders/computeparticles/particle.comp // https://github.com/austinEng/Project6-Vulkan-Flocking/blob/master/data/shaders/computeparticles/particle.comp
@ -276,7 +276,7 @@ wgpu::CommandBuffer createCommandBuffer(const wgpu::TextureView backbufferView,
pass.SetPipeline(updatePipeline); pass.SetPipeline(updatePipeline);
pass.SetBindGroup(0, updateBGs[i]); pass.SetBindGroup(0, updateBGs[i]);
pass.Dispatch(kNumParticles); pass.Dispatch(kNumParticles);
pass.EndPass(); pass.End();
} }
{ {
@ -286,7 +286,7 @@ wgpu::CommandBuffer createCommandBuffer(const wgpu::TextureView backbufferView,
pass.SetVertexBuffer(0, bufferDst); pass.SetVertexBuffer(0, bufferDst);
pass.SetVertexBuffer(1, modelBuffer); pass.SetVertexBuffer(1, modelBuffer);
pass.Draw(3, kNumParticles); pass.Draw(3, kNumParticles);
pass.EndPass(); pass.End();
} }
return encoder.Finish(); return encoder.Finish();

2
samples/dawn/CppHelloTriangle.cpp
View File

@ -161,7 +161,7 @@ void frame() {
pass.SetVertexBuffer(0, vertexBuffer); pass.SetVertexBuffer(0, vertexBuffer);
pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint32); pass.SetIndexBuffer(indexBuffer, wgpu::IndexFormat::Uint32);
pass.DrawIndexed(3); pass.DrawIndexed(3);
pass.EndPass(); pass.End();
} }
wgpu::CommandBuffer commands = encoder.Finish(); wgpu::CommandBuffer commands = encoder.Finish();

6
samples/dawn/ManualSwapChainTest.cpp
View File

@ -142,7 +142,7 @@ void DoRender(WindowData* data) {
wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&desc); wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&desc);
pass.SetPipeline(trianglePipeline); pass.SetPipeline(trianglePipeline);
pass.Draw(3); pass.Draw(3);
pass.EndPass(); pass.End();
} else { } else {
data->clearCycle -= 1.0 / 60.f; data->clearCycle -= 1.0 / 60.f;
if (data->clearCycle < 0.0) { if (data->clearCycle < 0.0) {
@ -151,11 +151,11 @@ void DoRender(WindowData* data) {
utils::ComboRenderPassDescriptor desc({view}); utils::ComboRenderPassDescriptor desc({view});
desc.cColorAttachments[0].loadOp = wgpu::LoadOp::Clear; desc.cColorAttachments[0].loadOp = wgpu::LoadOp::Clear;
desc.cColorAttachments[0].clearColor = {data->clearCycle, 1.0f - data->clearCycle, 0.0f, desc.cColorAttachments[0].clearValue = {data->clearCycle, 1.0f - data->clearCycle, 0.0f,
1.0f}; 1.0f};
wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&desc); wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&desc);
pass.EndPass(); pass.End();
} }
wgpu::CommandBuffer commands = encoder.Finish(); wgpu::CommandBuffer commands = encoder.Finish();