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

Update WGSL struct syntax. 

This CL updates the Dawn tests to use the new WGSL struct syntax.

Bug: tint:175
Change-Id: I7ce43385f9107f1a133117c41325a344d2241657
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/30640
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
dan sinclair 2020-10-21 06:59:51 +00:00 committed by Commit Bot service account
parent 03e1400fce
commit 3f6bb08d00
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/end2end/EntryPointTests.cpp
View File

@ -121,7 +121,7 @@ TEST_P(EntryPointTests, TwoComputeInModule) {
DAWN_SKIP_TEST_IF(IsVulkan()); DAWN_SKIP_TEST_IF(IsVulkan());
wgpu::ShaderModule module = utils::CreateShaderModuleFromWGSL(device, R"( wgpu::ShaderModule module = utils::CreateShaderModuleFromWGSL(device, R"(
type Data = [[block]] struct { [[block]] struct Data {
[[offset(0)]] data : u32; [[offset(0)]] data : u32;
}; };
[[binding(0), set(0)]] var<storage_buffer> data : Data; [[binding(0), set(0)]] var<storage_buffer> data : Data;

2
src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp
View File

@ -830,7 +830,7 @@ TEST_F(GetBindGroupLayoutTests, Reflection) {
// TODO(dawn:216): Re-enable when we correctly reflect which bindings are used for an entryPoint. // TODO(dawn:216): Re-enable when we correctly reflect which bindings are used for an entryPoint.
TEST_F(GetBindGroupLayoutTests, DISABLED_FromCorrectEntryPoint) { TEST_F(GetBindGroupLayoutTests, DISABLED_FromCorrectEntryPoint) {
wgpu::ShaderModule module = utils::CreateShaderModuleFromWGSL(device, R"( wgpu::ShaderModule module = utils::CreateShaderModuleFromWGSL(device, R"(
type Data = [[block]] struct { [[block]] struct Data {
[[offset 0]] data : f32; [[offset 0]] data : f32;
}; };
[[binding 0, set 0]] var<storage_buffer> data0 : Data; [[binding 0, set 0]] var<storage_buffer> data0 : Data;

2
src/tests/unittests/validation/RenderPipelineValidationTests.cpp
View File

@ -744,7 +744,7 @@ TEST_F(RenderPipelineValidationTest, DISABLED_BindingsFromCorrectEntryPoint) {
DAWN_SKIP_TEST_IF(!HasWGSL()); DAWN_SKIP_TEST_IF(!HasWGSL());
wgpu::ShaderModule module = utils::CreateShaderModuleFromWGSL(device, R"( wgpu::ShaderModule module = utils::CreateShaderModuleFromWGSL(device, R"(
type Uniforms = [[block]] struct { [[block]] struct Uniforms {
[[offset 0]] data : vec4<f32>; [[offset 0]] data : vec4<f32>;
}; };
[[binding 0, set 0]] var<uniform> var0 : Uniforms; [[binding 0, set 0]] var<uniform> var0 : Uniforms;