8000 Refactor shaderlab by GuoLei1990 · Pull Request #2737 · galacean/engine · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Refactor shaderlab #2737

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

Draft
wants to merge 117 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
0dda43f
refactor: opt code
GuoLei1990 Jun 9, 2025
01f2d38
refactor: rename `ShaderContent` to `ShaderSource`
GuoLei1990 Jun 10, 2025
4b016fd
refactor: opt code
GuoLei1990 Jun 10, 2025
2b5665f
refactor: rename scanner to lexer
GuoLei1990 Jun 10, 2025
13afff3
refactor: opt code
GuoLei1990 Jun 10, 2025
725f70f
fix: delete Attribute keyword
zhuxudong Jun 10, 2025
b4056c6
fix: scan world error
zhuxudong Jun 10, 2025
f61a87b
refactor: opt code
GuoLei1990 Jun 10, 2025
80ea5a8
Merge branch 'refactor-shaderlab' of https://github.com/galacean/engi…
GuoLei1990 Jun 10, 2025
e229a95
refactor: opt code
GuoLei1990 Jun 10, 2025
ba53527
refactor: opt lexer
GuoLei1990 Jun 10, 2025
606658a
refactor: opt lexer (#2732)
GuoLei1990 Jun 11, 2025
62c3686
Merge branch 'refactor-shaderlab' of https://github.com/galacean/engi…
GuoLei1990 Jun 11, 2025
5986d76
refactor: opt code
GuoLei1990 Jun 12, 2025
624a832
refactor: opt code
GuoLei1990 Jun 12, 2025
3d59987
refactor: opt code
GuoLei1990 Jun 12, 2025
e50aa15
refactor: opt code
GuoLei1990 Jun 12, 2025
efd219e
refactor: opt code
GuoLei1990 Jun 12, 2025
c1cb0eb
refactor: opt code
GuoLei1990 Jun 12, 2025
a90303b
refactor: rename `ShaderContentParser` to `ShaderSourceParser`
GuoLei1990 Jun 12, 2025
a7589a8
test: add logger
GuoLei1990 Jun 12, 2025
f28317c
refactor: opt code
GuoLei1990 Jun 12, 2025
01c5eb3
fix: render queue declaration (#2736)
Sway007 Jun 13, 2025
b19e2f0
fix: lint error
GuoLei1990 Jun 13, 2025
15f4c33
refactor: fix bug
GuoLei1990 Jun 13, 2025
a9f50d0
refactor: clear code
GuoLei1990 Jun 13, 2025
003269e
refactor: opt code
GuoLei1990 Jun 13, 2025
37d4dc1
Opt symbol table (#2738)
zhuxudong Jun 13, 2025
57dcf06
refactor: opt code
GuoLei1990 Jun 13, 2025
4927a16
Merge branch 'refactor-shaderlab' of https://github.com/galacean/engi…
GuoLei1990 Jun 13, 2025
590f989
refactor: improve `scanPairedChar` performance 3X
GuoLei1990 Jun 13, 2025
2e935da
refactor: reduce repeat code
GuoLei1990 Jun 13, 2025
3e525cf
refactor: delete unused function
GuoLei1990 Jun 13, 2025
c335d7a
refactor: delete unused callback
GuoLei1990 Jun 13, 2025
f7c19cc
refactor: improve `scanNumber` performance
GuoLei1990 Jun 13, 2025
908d113
refactor: opt code
GuoLei1990 Jun 13, 2025
ccd8a68
refactor: opt type and name
GuoLei1990 Jun 13, 2025
85eae8b
refactor: opt code
GuoLei1990 Jun 14, 2025
db131d8
refactor: opt code
GuoLei1990 Jun 14, 2025
cfdf2aa
refactor: opt code
GuoLei1990 Jun 14, 2025
ecceded
fix: unit test
GuoLei1990 Jun 14, 2025
58778ad
refactor: update e2e
GuoLei1990 Jun 14, 2025
a8b03cf
Fix renderstate var not define bug and remove invalid syntax (#2741)
GuoLei1990 Jun 15, 2025
d9f534e
fix: lint error
GuoLei1990 Jun 15, 2025
56a3dcc
fix: e2e
GuoLei1990 Jun 15, 2025
f7eedb0
refactor: clear code
GuoLei1990 Jun 15, 2025
cac158e
refactor: reduce token
GuoLei1990 Jun 15, 2025
c618f24
fix: lint error
GuoLei1990 Jun 15, 2025
8fc4321
refactor: simple code
GuoLei1990 Jun 15, 2025
a67b16f
refactor: update `.y`
GuoLei1990 Jun 15, 2025
30622c7
refactor: delete `_advance`
GuoLei1990 Jun 15, 2025
712938c
fix: compile error
GuoLei1990 Jun 15, 2025
e6132d5
refactor: opt performance
GuoLei1990 Jun 15, 2025
5fe8b22
refactor: reduce `SourceLexer` GC
GuoLei1990 Jun 16, 2025
f5767d3
refactor: reduce lexer param pass
GuoLei1990 Jun 16, 2025
0854aa8
refactor: additional return types
GuoLei1990 Jun 16, 2025
829732a
refactor: opt type create
GuoLei1990 Jun 16, 2025
1db8ee4
refactor: simplify the code
GuoLei1990 Jun 17, 2025
a3fb377
refactor: opt code
GuoLei1990 Jun 17, 2025
d1d64c7
refactor: opt SymbolTableStack
GuoLei1990 Jun 17, 2025
9bd728d
refactor: update SymbolTable
GuoLei1990 Jun 17, 2025
c0e91c8
refactor: opt Symbol file syruct
GuoLei1990 Jun 17, 2025
70ca749
refactor: opt code
GuoLei1990 Jun 17, 2025
50b5093
refactor: opt Symbol
GuoLei1990 Jun 17, 2025
686fc63
refactor: clear SymbolTable
GuoLei1990 Jun 18, 2025
13f4ee1
refactor: opt SymbolTable
GuoLei1990 Jun 18, 2025
a1d0733
refactor: opt type
GuoLei1990 Jun 18, 2025
0e8e2c4
refactor: opt code
GuoLei1990 Jun 18, 2025
d8242df
refactor: opt code
GuoLei1990 Jun 18, 2025
6d7c6de
refactor: opt code
GuoLei1990 Jun 18, 2025
666514c
refactor: opt switch performance
GuoLei1990 Jun 18, 2025
3f617be
Fix global symbol (#2742)
zhuxudong Jun 19, 2025
7ebb6f8
chore: return directly if there is no global variable
zhuxudong Jun 19, 2025
1d77c04
refactor: reduce blank strings to improve performance in subsequent s…
GuoLei1990 Jun 20, 2025
d81b0ca
Merge branch 'refactor-shaderlab' of https://github.com/galacean/engi…
GuoLei1990 Jun 20, 2025
ad237ca
refactor: delete 'TargetSymbolTable'
GuoLei1990 Jun 21, 2025
3927911
refactor: opt code
GuoLei1990 Jun 21, 2025
0ec070a
refactor: opt code
GuoLei1990 Jun 21, 2025
3387052
fix: unit test
GuoLei1990 Jun 21, 2025
3f62921
refactor: opt code
GuoLei1990 Jun 21, 2025
fd487f1
refactor: delete `Preprocessor`
GuoLei1990 Jun 21, 2025
62e5a32
refactor: opt code
GuoLei1990 Jun 21, 2025
1cbd4bf
refactor: opt performance
GuoLei1990 Jun 22, 2025
991eb5d
refactor: opt code
GuoLei1990 Jun 22, 2025
8e63e39
refactor: clear code
GuoLei1990 Jun 22, 2025 8000
72bf54d
refactor: delete Utils file
GuoLei1990 Jun 22, 2025
c9a9f82
refactor: opt code
GuoLei1990 Jun 22, 2025
ad29540
refactor: opt code
GuoLei1990 Jun 22, 2025
bfadedb
refactor: opt code
GuoLei1990 Jun 22, 2025
26acf92
refactor: optimize function and variable naming
GuoLei1990 Jun 23, 2025
692ca2a
refactor: merge `getShaderPosition` and `getCurPosition`
GuoLei1990 Jun 23, 2025
2d37f4b
refactor: fix and clear `scanWord`
GuoLei1990 Jun 23, 2025
5718570
refactor: reduce `this._getExpandSegments().pop()`
GuoLei1990 Jun 23, 2025
314178f
refactor: merge ExpandSegments
GuoLei1990 Jun 23, 2025
cee3751
refactor: reduce repeat code
GuoLei1990 Jun 23, 2025
7c8341b
refactor: reduce duplication of code
GuoLei1990 Jun 23, 2025
c834f4f
refactor: educe duplication of code
GuoLei1990 Jun 23, 2025
4f47561
refactor: reduce duplication of code
GuoLei1990 Jun 23, 2025
11793d0
refactor: improve performance
GuoLei1990 Jun 23, 2025
a7d1acf
refactor: opt variable Name
GuoLei1990 Jun 23, 2025
22b2579
refactor: opt code
GuoLei1990 Jun 23, 2025
80c2f2a
refactor: merge `ifndef` and `ifdef` logic
GuoLei1990 Jun 23, 2025
631dbfd
refactor: delete _parseIf function
GuoLei1990 Jun 23, 2025
de844b4
fix: parseDefine bug when has multi-line comments
GuoLei1990 Jun 24, 2025
4d185d1
refactor: opt func name
GuoLei1990 Jun 24, 2025
cb759e8
chore: delete unused method
zhuxudong Jun 25, 2025
acff7a8
fix: need scan float suffix after dot
zhuxudong Jun 25, 2025
9b476a6
fix: shader position error
zhuxudong Jun 25, 2025
2c2c9d4
refactor: opt code
zhuxudong Jun 25, 2025
e317862
chore: opt repeat code
zhuxudong Jun 25, 2025
35ca221
chore: opt code
zhuxudong Jun 25, 2025
bd182b4
refactor: opt `_parseUndef`
GuoLei1990 Jun 27, 2025
2e42cce
refactor: opt code
GuoLei1990 Jun 27, 2025
711bc6f
refactor: opt code
GuoLei1990 Jun 27, 2025
1118859
refactor: simplify Macro body expand
GuoLei1990 Jun 28, 2025
b524e14
refactor: opt _expandMacroBody
GuoLei1990 Jun 28, 2025
4763541
refactor: opt code
GuoLei1990 Jun 28, 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
12 changes: 9 additions & 3 deletions e2e/case/shaderLab-renderState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,27 @@ const shaderLab = new ShaderLab();
const shaderSource = `Shader "Test RenderState" {
SubShader "Default" {
Pass "0" {
DepthState {
DepthState customDepthState {
WriteEnabled = depthWriteEnabled;
}

BlendState {
BlendState customBlendState {
Enabled = blendEnabled;
SourceColorBlendFactor = sourceColorBlendFactor;
DestinationColorBlendFactor = destinationColorBlendFactor;
SourceAlphaBlendFactor = sourceAlphaBlendFactor;
DestinationAlphaBlendFactor = destinationAlphaBlendFactor;
}

RasterState{
RasterState customRasterState {
CullMode = rasterStateCullMode;
}

DepthState = customDepthState;
BlendState = customBlendState;
RasterState = customRasterState;


// RenderQueueType = renderQueueType;
RenderQueueType = Transparent;

Expand Down
Loading
Loading
0