encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-07 13:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Roll Tint and update WGSL syntax for overrides

Browse Source 
The syntax for pipeline-overridable constants has changed in
WGSL. Since this feature is still hidden behind the
disallow-unsafe-APIs flag in Dawn, we removed support for the old
syntax in Tint. This commit rolls Tint forward to get that change, and
updates the WGSL syntax in affected tests at the same time.

Bug: tint:1403
Change-Id: I1d081d9dea0c1de9def5cd123020700df3419f35
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/80500
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
James Price 2022-02-15 18:36:10 +00:00 committed by Dawn LUCI CQ
parent 7a8006033a
commit 0fe8d27903
5 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -113,7 +113,7 @@ deps = {
# WGSL support # WGSL support
'third_party/tint': { 'third_party/tint': {
'url': '{dawn_git}/tint@f1d570a11eba0f6cd14608b85ae0df8a279a21df', 'url': '{dawn_git}/tint@d0ec88ce6161497eb268c633d3f2453b30df66da',
}, },
# GLFW for tests and samples # GLFW for tests and samples

44
src/dawn/tests/end2end/ShaderTests.cpp
View File

@ -400,17 +400,17 @@ TEST_P(ShaderTests, OverridableConstants) {
wgpu::Buffer buffer = CreateBuffer(kCount); wgpu::Buffer buffer = CreateBuffer(kCount);
std::string shader = R"( std::string shader = R"(
@override let c0: bool; // type: bool override c0: bool; // type: bool
@override let c1: bool = false; // default override override c1: bool = false; // default override
@override let c2: f32; // type: float32 override c2: f32; // type: float32
@override let c3: f32 = 0.0; // default override override c3: f32 = 0.0; // default override
@override let c4: f32 = 4.0; // default override c4: f32 = 4.0; // default
@override let c5: i32; // type: int32 override c5: i32; // type: int32
@override let c6: i32 = 0; // default override override c6: i32 = 0; // default override
@override let c7: i32 = 7; // default override c7: i32 = 7; // default
@override let c8: u32; // type: uint32 override c8: u32; // type: uint32
@override let c9: u32 = 0u; // default override override c9: u32 = 0u; // default override
@override let c10: u32 = 10u; // default override c10: u32 = 10u; // default
struct Buf { struct Buf {
data : array<u32, 11>; data : array<u32, 11>;
@ -477,10 +477,10 @@ TEST_P(ShaderTests, OverridableConstantsNumericIdentifiers) {
wgpu::Buffer buffer = CreateBuffer(kCount); wgpu::Buffer buffer = CreateBuffer(kCount);
std::string shader = R"( std::string shader = R"(
@override(1001) let c1: u32; // some big numeric id @id(1001) override c1: u32; // some big numeric id
@override(1) let c2: u32 = 0u; // id == 1 might collide with some generated constant id @id(1) override c2: u32 = 0u; // id == 1 might collide with some generated constant id
@override(1003) let c3: u32 = 3u; // default @id(1003) override c3: u32 = 3u; // default
@override(1004) let c4: u32; // default unspecified @id(1004) override c4: u32; // default unspecified
struct Buf { struct Buf {
data : array<u32, 4>; data : array<u32, 4>;
@ -536,8 +536,8 @@ TEST_P(ShaderTests, OverridableConstantsPrecision) {
wgpu::Buffer buffer = CreateBuffer(kCount); wgpu::Buffer buffer = CreateBuffer(kCount);
std::string shader = R"( std::string shader = R"(
@override(1001) let c1: f32; @id(1001) override c1: f32;
@override(1002) let c2: f32; @id(1002) override c2: f32;
struct Buf { struct Buf {
data : array<f32, 2>; data : array<f32, 2>;
@ -590,8 +590,8 @@ TEST_P(ShaderTests, OverridableConstantsMultipleEntryPoints) {
wgpu::Buffer buffer3 = CreateBuffer(kCount); wgpu::Buffer buffer3 = CreateBuffer(kCount);
std::string shader = R"( std::string shader = R"(
@override(1001) let c1: u32; @id(1001) override c1: u32;
@override(1002) let c2: u32; @id(1002) override c2: u32;
struct Buf { struct Buf {
data : array<u32, 1>; data : array<u32, 1>;
@ -681,8 +681,8 @@ TEST_P(ShaderTests, OverridableConstantsRenderPipeline) {
DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES()); DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
wgpu::ShaderModule vsModule = utils::CreateShaderModule(device, R"( wgpu::ShaderModule vsModule = utils::CreateShaderModule(device, R"(
@override(1111) let xright: f32; @id(1111) override xright: f32;
@override(2222) let ytop: f32; @id(2222) override ytop: f32;
@stage(vertex) @stage(vertex)
fn main(@builtin(vertex_index) VertexIndex : u32) fn main(@builtin(vertex_index) VertexIndex : u32)
-> @builtin(position) vec4<f32> { -> @builtin(position) vec4<f32> {
@ -695,7 +695,7 @@ fn main(@builtin(vertex_index) VertexIndex : u32)
})"); })");
wgpu::ShaderModule fsModule = utils::CreateShaderModule(device, R"( wgpu::ShaderModule fsModule = utils::CreateShaderModule(device, R"(
@override(1000) let intensity: f32 = 0.0; @id(1000) override intensity: f32 = 0.0;
@stage(fragment) fn main() @stage(fragment) fn main()
-> @location(0) vec4<f32> { -> @location(0) vec4<f32> {
return vec4<f32>(intensity, intensity, intensity, 1.0); return vec4<f32>(intensity, intensity, intensity, 1.0);

44
src/dawn/tests/unittests/validation/OverridableConstantsValidationTests.cpp
View File

@ -20,17 +20,17 @@ class ComputePipelineOverridableConstantsValidationTest : public ValidationTest
protected: protected:
void SetUpShadersWithDefaultValueConstants() { void SetUpShadersWithDefaultValueConstants() {
computeModule = utils::CreateShaderModule(device, R"( computeModule = utils::CreateShaderModule(device, R"(
@override let c0: bool = true; // type: bool override c0: bool = true; // type: bool
@override let c1: bool = false; // default override override c1: bool = false; // default override
@override let c2: f32 = 0.0; // type: float32 override c2: f32 = 0.0; // type: float32
@override let c3: f32 = 0.0; // default override override c3: f32 = 0.0; // default override
@override let c4: f32 = 4.0; // default override c4: f32 = 4.0; // default
@override let c5: i32 = 0; // type: int32 override c5: i32 = 0; // type: int32
@override let c6: i32 = 0; // default override override c6: i32 = 0; // default override
@override let c7: i32 = 7; // default override c7: i32 = 7; // default
@override let c8: u32 = 0u; // type: uint32 override c8: u32 = 0u; // type: uint32
@override let c9: u32 = 0u; // default override override c9: u32 = 0u; // default override
@override(1000) let c10: u32 = 10u; // default @id(1000) override c10: u32 = 10u; // default
@stage(compute) @workgroup_size(1) fn main() { @stage(compute) @workgroup_size(1) fn main() {
// make sure the overridable constants are not optimized out // make sure the overridable constants are not optimized out
@ -50,17 +50,17 @@ class ComputePipelineOverridableConstantsValidationTest : public ValidationTest
void SetUpShadersWithUninitializedConstants() { void SetUpShadersWithUninitializedConstants() {
computeModule = utils::CreateShaderModule(device, R"( computeModule = utils::CreateShaderModule(device, R"(
@override let c0: bool; // type: bool override c0: bool; // type: bool
@override let c1: bool = false; // default override override c1: bool = false; // default override
@override let c2: f32; // type: float32 override c2: f32; // type: float32
@override let c3: f32 = 0.0; // default override override c3: f32 = 0.0; // default override
@override let c4: f32 = 4.0; // default override c4: f32 = 4.0; // default
@override let c5: i32; // type: int32 override c5: i32; // type: int32
@override let c6: i32 = 0; // default override override c6: i32 = 0; // default override
@override let c7: i32 = 7; // default override c7: i32 = 7; // default
@override let c8: u32; // type: uint32 override c8: u32; // type: uint32
@override let c9: u32 = 0u; // default override override c9: u32 = 0u; // default override
@override(1000) let c10: u32 = 10u; // default @id(1000) override c10: u32 = 10u; // default
@stage(compute) @workgroup_size(1) fn main() { @stage(compute) @workgroup_size(1) fn main() {
// make sure the overridable constants are not optimized out // make sure the overridable constants are not optimized out

4
src/dawn/tests/unittests/validation/ShaderModuleValidationTests.cpp
View File

@ -497,8 +497,8 @@ TEST_F(ShaderModuleValidationTest, ComputeWorkgroupStorageSizeLimits) {
// Test that numeric ID must be unique // Test that numeric ID must be unique
TEST_F(ShaderModuleValidationTest, OverridableConstantsNumericIDConflicts) { TEST_F(ShaderModuleValidationTest, OverridableConstantsNumericIDConflicts) {
ASSERT_DEVICE_ERROR(utils::CreateShaderModule(device, R"( ASSERT_DEVICE_ERROR(utils::CreateShaderModule(device, R"(
@override(1234) let c0: u32; @id(1234) override c0: u32;
@override(1234) let c1: u32; @id(1234) override c1: u32;
struct Buf { struct Buf {
data : array<u32, 2>; data : array<u32, 2>;

4
src/dawn/tests/unittests/validation/UnsafeAPIValidationTests.cpp
View File

@ -61,8 +61,8 @@ TEST_F(UnsafeAPIValidationTest, PipelineOverridableConstants) {
// Error case: shader with overridable constant with default value // Error case: shader with overridable constant with default value
{ {
ASSERT_DEVICE_ERROR(utils::CreateShaderModule(device, R"( ASSERT_DEVICE_ERROR(utils::CreateShaderModule(device, R"(
@override(1000) let c0: u32 = 1u; @id(1000) override c0: u32 = 1u;
@override(1000) let c1: u32; @id(1000) override c1: u32;
@stage(compute) @workgroup_size(1) fn main() { @stage(compute) @workgroup_size(1) fn main() {
_ = c0; _ = c0;