Skip to content

Commit 4d36557

Browse files
ben-claytonDawn LUCI CQ
ben-clayton
authored and
Dawn LUCI CQ
committed
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 <[email protected]> Reviewed-by: Antonio Maiorano <[email protected]> Commit-Queue: Ben Clayton <[email protected]>
1 parent 6249b24 commit 4d36557

File tree

54 files changed

+1248
-1243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1248
-1243
lines changed

‎.gitattributes

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
* text=auto
2-
*.sh eol=lf
3-
*.gn eol=lf
4-
*.gni eol=lf
1+
* text=auto
2+
*.glsl eol=lf
3+
*.gn eol=lf
4+
*.gni eol=lf
5+
*.hlsl eol=lf
6+
*.msl eol=lf
7+
*.sh eol=lf
8+
*.spvasm eol=lf
9+
*.wgsl eol=lf

‎CMakeSettings.json

+100-100
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
{
2-
"configurations": [
3-
{
4-
"name": "x64-Debug",
5-
"generator": "Ninja",
6-
"configurationType": "Debug",
7-
"inheritEnvironments": [ "msvc_x64_x64" ],
8-
"buildRoot": "${projectDir}\\out\\build\\${name}",
9-
"installRoot": "${projectDir}\\out\\install\\${name}",
10-
"cmakeCommandArgs": "",
11-
"buildCommandArgs": "",
12-
"ctestCommandArgs": "",
13-
"variables": []
14-
},
15-
{
16-
"name": "x64-Release",
17-
"generator": "Ninja",
18-
"configurationType": "RelWithDebInfo",
19-
"buildRoot": "${projectDir}\\out\\build\\${name}",
20-
"installRoot": "${projectDir}\\out\\install\\${name}",
21-
"cmakeCommandArgs": "",
22-
"buildCommandArgs": "",
23-
"ctestCommandArgs": "",
24-
"inheritEnvironments": [ "msvc_x64_x64" ],
25-
"variables": []
26-
},
27-
{
28-
"name": "x86-Debug",
29-
"generator": "Ninja",
30-
"configurationType": "Debug",
31-
"buildRoot": "${projectDir}\\out\\build\\${name}",
32-
"installRoot": "${projectDir}\\out\\install\\${name}",
33-
"cmakeCommandArgs": "",
34-
"buildCommandArgs": "",
35-
"ctestCommandArgs": "",
36-
"inheritEnvironments": [ "msvc_x86" ],
37-
"variables": []
38-
},
39-
{
40-
"name": "x86-Release",
41-
"generator": "Ninja",
42-
"configurationType": "RelWithDebInfo",
43-
"buildRoot": "${projectDir}\\out\\build\\${name}",
44-
"installRoot": "${projectDir}\\out\\install\\${name}",
45-
"cmakeCommandArgs": "",
46-
"buildCommandArgs": "",
47-
"ctestCommandArgs": "",
48-
"inheritEnvironments": [ "msvc_x86" ],
49-
"variables": []
50-
},
51-
{
52-
"name": "x64-Clang-Debug",
53-
"generator": "Ninja",
54-
"configurationType": "Debug",
55-
"buildRoot": "${projectDir}\\out\\build\\${name}",
56-
"installRoot": "${projectDir}\\out\\install\\${name}",
57-
"cmakeCommandArgs": "",
58-
"buildCommandArgs": "",
59-
"ctestCommandArgs": "",
60-
"inheritEnvironments": [ "clang_cl_x64_x64" ],
61-
"variables": []
62-
},
63-
{
64-
"name": "x64-Clang-Release",
65-
"generator": "Ninja",
66-
"configurationType": "RelWithDebInfo",
67-
"buildRoot": "${projectDir}\\out\\build\\${name}",
68-
"installRoot": "${projectDir}\\out\\install\\${name}",
69-
"cmakeCommandArgs": "",
70-
"buildCommandArgs": "",
71-
"ctestCommandArgs": "",
72-
"inheritEnvironments": [ "clang_cl_x64_x64" ],
73-
"variables": []
74-
},
75-
{
76-
"name": "x86-Clang-Debug",
77-
"generator": "Ninja",
78-
"configurationType": "Debug",
79-
"buildRoot": "${projectDir}\\out\\build\\${name}",
80-
"installRoot": "${projectDir}\\out\\install\\${name}",
81-
"cmakeCommandArgs": "",
82-
"buildCommandArgs": "",
83-
"ctestCommandArgs": "",
84-
"inheritEnvironments": [ "clang_cl_x86" ],
85-
"variables": []
86-
},
87-
{
88-
"name": "x86-Clang-Release",
89-
"generator": "Ninja",
90-
"configurationType": "RelWithDebInfo",
91-
"buildRoot": "${projectDir}\\out\\build\\${name}",
92-
"installRoot": "${projectDir}\\out\\install\\${name}",
93-
"cmakeCommandArgs": "",
94-
"buildCommandArgs": "",
95-
"ctestCommandArgs": "",
96-
"inheritEnvironments": [ "clang_cl_x86" ],
97-
"variables": []
98-
}
99-
]
100-
}
1+
{
2+
"configurations": [
3+
{
4+
"name": "x64-Debug",
5+
"generator": "Ninja",
6+
"configurationType": "Debug",
7+
"inheritEnvironments": ["msvc_x64_x64"],
8+
"buildRoot": "${projectDir}\\out\\build\\${name}",
9+
"installRoot": "${projectDir}\\out\\install\\${name}",
10+
"cmakeCommandArgs": "",
11+
"buildCommandArgs": "",
12+
"ctestCommandArgs": "",
13+
"variables": []
14+
},
15+
{
16+
"name": "x64-Release",
17+
"generator": "Ninja",
18+
"configurationType": "RelWithDebInfo",
19+
"buildRoot": "${projectDir}\\out\\build\\${name}",
20+
"installRoot": "${projectDir}\\out\\install\\${name}",
21+
"cmakeCommandArgs": "",
22+
"buildCommandArgs": "",
23+
"ctestCommandArgs": "",
24+
"inheritEnvironments": ["msvc_x64_x64"],
25+
"variables": []
26+
},
27+
{
28+
"name": "x86-Debug",
29+
"generator": "Ninja",
30+
"configurationType": "Debug",
31+
"buildRoot": "${projectDir}\\out\\build\\${name}",
32+
"installRoot": "${projectDir}\\out\\install\\${name}",
33+
"cmakeCommandArgs": "",
34+
"buildCommandArgs": "",
35+
"ctestCommandArgs": "",
36+
"inheritEnvironments": ["msvc_x86"],
37+
"variables": []
38+
},
39+
{
40+
"name": "x86-Release",
41+
"generator": "Ninja",
42+
"configurationType": "RelWithDebInfo",
43+
"buildRoot": "${projectDir}\\out\\build\\${name}",
44+
"installRoot": "${projectDir}\\out\\install\\${name}",
45+
"cmakeCommandArgs": "",
46+
"buildCommandArgs": "",
47+
"ctestCommandArgs": "",
48+
"inheritEnvironments": ["msvc_x86"],
49+
"variables": []
50+
},
51+
{
52+
"name": "x64-Clang-Debug",
53+
"generator": "Ninja",
54+
"configurationType": "Debug",
55+
"buildRoot": "${projectDir}\\out\\build\\${name}",
56+
"installRoot": "${projectDir}\\out\\install\\${name}",
57+
"cmakeCommandArgs": "",
58+
"buildCommandArgs": "",
59+
"ctestCommandArgs": "",
60+
"inheritEnvironments": ["clang_cl_x64_x64"],
61+
"variables": []
62+
},
63+
{
64+
"name": "x64-Clang-Release",
65+
"generator": "Ninja",
66+
"configurationType": "RelWithDebInfo",
67+
"buildRoot": "${projectDir}\\out\\build\\${name}",
68+
"installRoot": "${projectDir}\\out\\install\\${name}",
69+
"cmakeCommandArgs": "",
70+
"buildCommandArgs": "",
71+
"ctestCommandArgs": "",
72+
"inheritEnvironments": ["clang_cl_x64_x64"],
73+
"variables": []
74+
},
75+
{
76+
"name": "x86-Clang-Debug",
77+
"generator": "Ninja",
78+
"configurationType": "Debug",
79+
"buildRoot": "${projectDir}\\out\\build\\${name}",
80+
"installRoot": "${projectDir}\\out\\install\\${name}",
81+
"cmakeCommandArgs": "",
82+
"buildCommandArgs": "",
83+
"ctestCommandArgs": "",
84+
"inheritEnvironments": ["clang_cl_x86"],
85+
"variables": []
86+
},
87+
{
88+
"name": "x86-Clang-Release",
89+
"generator": "Ninja",
90+
"configurationType": "RelWithDebInfo",
91+
"buildRoot": "${projectDir}\\out\\build\\${name}",
92+
"installRoot": "${projectDir}\\out\\install\\${name}",
93+
"cmakeCommandArgs": "",
94+
"buildCommandArgs": "",
95+
"ctestCommandArgs": "",
96+
"inheritEnvironments": ["clang_cl_x86"],
97+
"variables": []
98+
}
99+
]
100+
}

0 commit comments

Comments
 (0)