Normalize all line endings to LF

And force shader code to always use LF endings.

Post merge, there were a number of files that crept in with CRLF endings.

Some Tint end-to-end tests take objection to CRLF endings.

CRLF endings can be detected with:

```
git grep -I --files-with-matches --perl-regexp '\r' HEAD
```

And fixed with:

```
find . -type f -exec dos2unix {} \;
```

Bug: dawn:1339
Change-Id: Iee054bafd15875de744b86e28393cd8229bd3cfa
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86140
Kokoro-Run: Ben Clayton <bclayton@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton
2022-04-08 14:18:28 +00:00
committed by Dawn LUCI CQ
parent 6249b24581
commit 4d36557bce
54 changed files with 1248 additions and 1243 deletions

View File

@@ -1,22 +1,22 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
for (var i: i32 = 0; i < 4; i = i + 1) {
s1.a1[uniforms.i] = v;
}
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
for (var i: i32 = 0; i < 4; i = i + 1) {
s1.a1[uniforms.i] = v;
}
}

View File

@@ -1,22 +1,22 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
for (var i: i32 = 0; i < 4; s1.a1[uniforms.i] = v) {
i = i + 1;
}
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
for (var i: i32 = 0; i < 4; s1.a1[uniforms.i] = v) {
i = i + 1;
}
}

View File

@@ -1,22 +1,22 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
var i: i32 = 0;
for (s1.a1[uniforms.i] = v; i < 4; i = i + 1) {
}
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
var i: i32 = 0;
for (s1.a1[uniforms.i] = v; i < 4; i = i + 1) {
}
}

View File

@@ -1,31 +1,31 @@
struct Uniforms {
i : u32,
j : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
a2 : array<InnerS, 8>,
};
struct OuterS {
a1 : array<S1, 8>,
};
var<private> nextIndex : u32;
fn getNextIndex() -> u32 {
nextIndex = nextIndex + 1u;
return nextIndex;
}
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s : OuterS;
s.a1[getNextIndex()].a2[uniforms.j] = v;
}
struct Uniforms {
i : u32,
j : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
a2 : array<InnerS, 8>,
};
struct OuterS {
a1 : array<S1, 8>,
};
var<private> nextIndex : u32;
fn getNextIndex() -> u32 {
nextIndex = nextIndex + 1u;
return nextIndex;
}
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s : OuterS;
s.a1[getNextIndex()].a2[uniforms.j] = v;
}

View File

@@ -1,21 +1,21 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.a1[uniforms.i] = v;
//s1.a1[0] = v;
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.a1[uniforms.i] = v;
//s1.a1[0] = v;
}

View File

@@ -1,21 +1,21 @@
struct Uniforms {
i : u32,
j : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<array<InnerS, 8>, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.a1[uniforms.i][uniforms.j] = v;
}
struct Uniforms {
i : u32,
j : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<array<InnerS, 8>, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.a1[uniforms.i][uniforms.j] = v;
}

View File

@@ -1,24 +1,24 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
s2 : InnerS,
};
struct OuterS {
a1 : array<S1, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.a1[uniforms.i].s2 = v;
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
s2 : InnerS,
};
struct OuterS {
a1 : array<S1, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.a1[uniforms.i].s2 = v;
}

View File

@@ -1,25 +1,25 @@
struct Uniforms {
i : u32,
j : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
a2 : array<InnerS, 8>,
};
struct OuterS {
a1 : array<S1, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s : OuterS;
s.a1[uniforms.i].a2[uniforms.j] = v;
}
struct Uniforms {
i : u32,
j : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
a2 : array<InnerS, 8>,
};
struct OuterS {
a1 : array<S1, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s : OuterS;
s.a1[uniforms.i].a2[uniforms.j] = v;
}

View File

@@ -1,20 +1,20 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@binding(0) @group(0) var<storage, read_write> s1 : OuterS;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
s1.a1[uniforms.i] = v;
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@binding(0) @group(0) var<storage, read_write> s1 : OuterS;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
s1.a1[uniforms.i] = v;
}

View File

@@ -1,25 +1,25 @@
struct Uniforms {
i : u32,
j : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
a2 : array<InnerS, 8>,
};
struct OuterS {
a1 : array<S1>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@binding(0) @group(0) var<storage, read_write> s : OuterS;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
s.a1[uniforms.i].a2[uniforms.j] = v;
}
struct Uniforms {
i : u32,
j : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
a2 : array<InnerS, 8>,
};
struct OuterS {
a1 : array<S1>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@binding(0) @group(0) var<storage, read_write> s : OuterS;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
s.a1[uniforms.i].a2[uniforms.j] = v;
}

View File

@@ -1,16 +1,16 @@
struct Uniforms {
i : u32,
};
struct OuterS {
m1 : mat2x4<f32>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
s1.m1[uniforms.i] = vec4<f32>(1.0);
s1.m1[uniforms.i][uniforms.i] = 1.0;
}
struct Uniforms {
i : u32,
};
struct OuterS {
m1 : mat2x4<f32>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
s1.m1[uniforms.i] = vec4<f32>(1.0);
s1.m1[uniforms.i][uniforms.i] = 1.0;
}

View File

@@ -1,22 +1,22 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
a2 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.a1[uniforms.i] = v;
s1.a2[uniforms.i] = v;
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
a2 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.a1[uniforms.i] = v;
s1.a2[uniforms.i] = v;
}

View File

@@ -1,24 +1,24 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
a : array<InnerS, 8>,
};
struct OuterS {
s2 : S1,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.s2.a[uniforms.i] = v;
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct S1 {
a : array<InnerS, 8>,
};
struct OuterS {
s2 : S1,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
s1.s2.a[uniforms.i] = v;
}

View File

@@ -1,15 +1,15 @@
struct Uniforms {
i : u32,
};
struct OuterS {
v1 : vec3<f32>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
s1.v1[uniforms.i] = 1.0;
}
struct Uniforms {
i : u32,
};
struct OuterS {
v1 : vec3<f32>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
s1.v1[uniforms.i] = 1.0;
}

View File

@@ -1,21 +1,21 @@
struct Uniforms {
i : u32,
};
struct OuterS {
a1 : array<u32, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
fn f(i: u32) -> u32 {
return i + 1u;
}
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
var v : vec3<f32>;
v[s1.a1[uniforms.i]] = 1.0;
v[f(s1.a1[uniforms.i])] = 1.0;
}
struct Uniforms {
i : u32,
};
struct OuterS {
a1 : array<u32, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
fn f(i: u32) -> u32 {
return i + 1u;
}
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
var v : vec3<f32>;
v[s1.a1[uniforms.i]] = 1.0;
v[f(s1.a1[uniforms.i])] = 1.0;
}

View File

@@ -1,21 +1,21 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
let p = &(s1.a1[uniforms.i]);
*p = v;
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
@stage(compute) @workgroup_size(1)
fn main() {
var v : InnerS;
var s1 : OuterS;
let p = &(s1.a1[uniforms.i]);
*p = v;
}

View File

@@ -1,21 +1,21 @@
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
fn f(p : ptr<function, OuterS>) {
var v : InnerS;
(*p).a1[uniforms.i] = v;
}
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
f(&s1);
}
struct Uniforms {
i : u32,
};
struct InnerS {
v : i32,
};
struct OuterS {
a1 : array<InnerS, 8>,
};
@group(1) @binding(4) var<uniform> uniforms : Uniforms;
fn f(p : ptr<function, OuterS>) {
var v : InnerS;
(*p).a1[uniforms.i] = v;
}
@stage(compute) @workgroup_size(1)
fn main() {
var s1 : OuterS;
f(&s1);
}