Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ShaderLab variable list declaration & CRLF break & macro #if bug #2465

Merged
merged 26 commits into from
Jan 8, 2025
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6613ba2
feat: supprot global declaration list
Sway007 Dec 16, 2024
4130a87
feat: update unitest
Sway007 Dec 16, 2024
b27c4bd
feat: update unitest
Sway007 Dec 16, 2024
637d884
fix: last comment
Sway007 Dec 16, 2024
6f1fa10
feat: code opt
Sway007 Dec 16, 2024
e348595
feat: disable glsl compress for non mini package
Sway007 Dec 18, 2024
6c99773
Merge branch 'dev/1.4' of github.com:galacean/engine into dev/1.4
Sway007 Dec 25, 2024
c9fd98c
Merge branch 'dev/1.4' of github.com:galacean/engine into fix/shaderl…
Sway007 Dec 25, 2024
47da18a
feat: code opt
Sway007 Dec 26, 2024
8b0de12
feat: code opt
Sway007 Dec 26, 2024
cd47edc
fix: compatible with empty macro in if branch
Sway007 Dec 27, 2024
bc17b5e
Merge branch 'dev/1.4' of github.com:galacean/engine into dev/1.4
Sway007 Jan 2, 2025
b80c07d
Merge branch 'dev/1.4' of github.com:galacean/engine into dev/1.4
Sway007 Jan 2, 2025
6dac155
fix: shaderlab compatible with CRLF format
Sway007 Jan 2, 2025
3131488
Merge branch 'fix/shaderlab/crlf' into fix/shaderlab/global_decl_list
Sway007 Jan 2, 2025
fe9a4bd
Merge branch 'dev/1.4' of github.com:galacean/engine into dev/1.4
Sway007 Jan 2, 2025
f1efb56
Merge branch 'dev/1.4' of github.com:galacean/engine into dev/1.4
Sway007 Jan 6, 2025
d9a142a
Merge branch 'dev/1.4' of github.com:galacean/engine into dev/1.4
Sway007 Jan 7, 2025
3ec3b99
fix: ci
Sway007 Jan 3, 2025
35b5926
Merge branch 'dev/1.4' of github.com:galacean/engine into dev/1.4
Sway007 Jan 8, 2025
3748049
Merge branch 'dev/1.4' into fix/shaderlab/global_decl_list
Sway007 Jan 8, 2025
6cd03dd
feat: skip space compatible with multiple line
Sway007 Jan 8, 2025
f775ee5
feat: code opt
Sway007 Jan 8, 2025
b814758
feat: code opt
Sway007 Jan 8, 2025
ec9f4da
feat: code opt
Sway007 Jan 8, 2025
434742e
feat: code opt
Sway007 Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'dev/1.4' of github.com:galacean/engine into dev/1.4
Sway007 committed Jan 2, 2025
commit fe9a4bde4af71c47f05a9f28e4bb18e6e67cd41d

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.