Skip to content

Commit

Permalink
Add attributes and settings for consistent line endings (#5021)
Browse files Browse the repository at this point in the history
* Add attributes

* Normalize line endings

* Trim trailing blankspaces

* Make endings consistent
  • Loading branch information
mehmetoguzderin authored Dec 14, 2024
1 parent 327948d commit a87657b
Show file tree
Hide file tree
Showing 18 changed files with 243 additions and 247 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
4 changes: 2 additions & 2 deletions .github/workflows/build-validate-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ name: build-validate-publish
on:
pull_request:
paths-ignore: [ "tools/custom-action/Dockerfile" ]

push:
branches: [main]
paths-ignore:
- "tools/custom-action/Dockerfile"
- "tools/custom-action/entrypoint.sh"

# Allows admins to trigger the workflow manually from GitHub's UI.
workflow_dispatch:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: ./tools/custom-action/
with:
check-repo-clean: 'OFF'

# Adjusts Bikeshed specs
- name: Adjust Bikeshed
if: ${{ github.event.workflow_run.event == 'pull_request' && env.PR }}
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"files.associations": {
"*.bs.include": "bikeshed",
},
"files.eol": "\n",
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"[bikeshed]": {
"editor.detectIndentation": false,
"editor.indentSize": 4,
Expand Down
1 change: 1 addition & 0 deletions correspondence/img/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

444 changes: 222 additions & 222 deletions design/AdapterIdentifiers.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion design/RejectedErrorHandling.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ interface GPUDeviceLostEvent : Event {
};
```

If `GPUAdapter`'s `isReady` attribute is false, `createDevice` will fail.
If `GPUAdapter`'s `isReady` attribute is false, `createDevice` will fail.
`isReady` may be set to `false` when a `"gpu-device-lost"` event fires.
It will always be set to `true` when a `"gpu-adapter-ready"` event fires.

Expand Down
2 changes: 0 additions & 2 deletions explainer/index.bs
Original file line number Diff line number Diff line change
Expand Up @@ -1267,5 +1267,3 @@ However investigation in WebGL show that GPU timings can be used to leak from su


# WebGPU Shading Language # {#wgsl}


4 changes: 2 additions & 2 deletions proposals/compatibility-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ See "Texture view dimension may be specified", below.

## Compatibility mode restrictions

### 1. Texture view dimension may be specified
### 1. Texture view dimension may be specified

When specifying a texture, a `textureBindingViewDimension` property determines the views which can be bound from that texture for sampling (see "Proposed IDL changes", above). Binding a view of a different dimension for sampling than specified at texture creation time will cause a validation error. If `textureBindingViewDimension` is unspecified, use [the same algorithm as `createView()`](https://gpuweb.github.io/gpuweb/#abstract-opdef-resolving-gputextureviewdescriptor-defaults):
```
Expand Down Expand Up @@ -193,7 +193,7 @@ Note: this does not affect textures made with depth formats bound to `texture_2d
If code is passed to `createShaderModule` that uses `@interpolation(flat)` or `@interpolation(flat, first)`
generate a validation error.

**Justification**: OpenGL ES 3.1 only supports the last vertex as the provoking vertex where as
**Justification**: OpenGL ES 3.1 only supports the last vertex as the provoking vertex where as
other APIs only support the first vertex so only `@interpolation(flat, either)` is supported in
compatibility mode.

Expand Down
1 change: 0 additions & 1 deletion tools/copy-if-different.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ fi
if [ ! -f "$output" ] || ! diff "$input" "$output" >/dev/null; then
cp "$input" "$output"
fi

1 change: 0 additions & 1 deletion tools/wgsl-meeting-helper
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,3 @@ async function run(targetFunction, ...args) {
}

argumentProcessor.parse();

1 change: 0 additions & 1 deletion wgsl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,3 @@ lalr_star: $(ANALYZER) analyze/test/star.json
.PHONY: lalr_442
lalr_442: $(ANALYZER) analyze/test/ex442.json
python3 $(ANALYZE_SCRIPT) -lalr analyze/test/ex442.json

1 change: 0 additions & 1 deletion wgsl/diagrams/uniformity_1.mmd
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ flowchart BT
textureSamplearg2[textureSample arg_2]
textureSamplereturnvalue[textureSample return_value]
CFaftertextureSample([CF_after_textureSample])

6 changes: 2 additions & 4 deletions wgsl/media-type-registration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Security considerations:
considerations, see [WebGPU] Section 2.1 Security Considerations.

Interoperability considerations:

Implementations of WebGPU may have different capabilities, and
these differences may affect what features may be exercised by
WGSL programs. See [WebGPU] Section 3.6 Optional capabilities,
Expand Down Expand Up @@ -46,7 +46,7 @@ Additional information:
Macintosh file type code(s): TEXT

Person & email address to contact for further information:
David Neto, dneto@google.com, or the Editors listed in [WGSL].
David Neto, dneto@google.com, or the Editors listed in [WGSL].

Intended usage: COMMON

Expand All @@ -61,5 +61,3 @@ Normative References:

[WGSL] W3C, “WebGPU Shading Language” W3C Working Draft, October
2022. <https://www.w3.org/TR/wgsl/>.


4 changes: 2 additions & 2 deletions wgsl/tools/TSPath.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
Examples:
/translation_unit
/translation_unit
The translation_unit node at the top of the tree
//enable_directive
Expand Down Expand Up @@ -197,7 +197,7 @@ class SeqNode(ExprNode):
def __init__(self,children):
super().__init__(ENKind.seq)
self.exprs = children

def match(self,ts_node):
result = []
# Walk through both lists
Expand Down
1 change: 0 additions & 1 deletion wgsl/tools/analyze/Grammar.py
Original file line number Diff line number Diff line change
Expand Up @@ -3023,4 +3023,3 @@ def LALR1_ItemSets(self, max_item_sets=None):

item_sets = self.LALR1(max_item_sets=max_item_sets).states
return item_sets

2 changes: 1 addition & 1 deletion wgsl/tools/analyze/ObjectRegistry.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def register(self,registerable):
assert registerable.reg_info.obj is not None
return registerable.reg_info.obj


key = registerable.key
if key in self.key_to_object:
return self.key_to_object[key]
Expand Down
10 changes: 5 additions & 5 deletions wgsl/tools/analyze/test.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#!/usr/bin/env python3
#
#
# Copyright 2022 Google LLC
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
#
# 1. Redistributions of works must retain the original copyright
# notice, this list of conditions and the following disclaimer.
#
#
# 2. Redistributions in binary form must reproduce the original
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
#
# 3. Neither the name of the W3C nor the names of its contributors
# may be used to endorse or promote products derived from this work
# without specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
Expand Down

0 comments on commit a87657b

Please sign in to comment.