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.

Sign up for GitHub

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

Jump to bottom

Provide shaderlab compiled AST related context for the VSCode extension #1882

Merged
merged 27 commits into from
Nov 24, 2023
Merged

Provide shaderlab compiled AST related context for the VSCode extension #1882

merged 27 commits into from
Nov 24, 2023

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Nov 20, 2023 •
edited

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

  • Provide shaderlab compiled AST related context for the VSCode extension
  • fix several shaderlab syntax bugs
  • add a complex shader test case

@Sway007
fix(shader-lab): compatible with empty macro
5a26f3d
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
5ecc318
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
cafc24f
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
dc69489
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
221b7b6
@Sway007
fix(shader-lab): add break and continue syntax
0d45d9c
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
0f14c3f
@Sway007
fix: typo
8871d9b
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
3b4ffd7
@Sway007
fix(shader-lab): Make usepass compatible with buitin shader
f649a58
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
598fc56
@Sway007
fix(shader-lab): compatible with no varying variable
e33a66f
@Sway007
feat(shader-lab): detect mismatch return type
41ef06f
@Sway007
fix(shader-lab): renderState assignment
b5214fc
@Sway007
feat: extend material loader data type
f36ce02
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
ff8b7c2
@Sway007
fix(shader-lab): glsl type pattern
634236f
@Sway007
fix(shader-lab): glsl type pattern
91e6fa4
@Sway007
fix: switch case break
3932448
@Sway007
feat: opt code
d299c60
@Sway007
fix: conditional expression support multiple relation expression
259a0d7
@Sway007
fix: global reference reset
2634212
@Sway007
test(shader-lab): waterfull
51c4c81
@Sway007
feat: merge
4315c40
@Sway007
feat: merge
f16d281
@Sway007 Sway007 added enhancement New feature or request shader Shader related functions labels Nov 20, 2023
@Sway007 Sway007 self-assigned this Nov 20, 2023
@GuoLei1990 GuoLei1990 merged commit ea72dde into galacean:main Nov 24, 2023
5 checks passed
GuoLei1990 added a commit that referenced this pull request Dec 3, 2023
@GuoLei1990
Merge branch 'main' into dev/1.2
03d3d87 
* main:
  "v1.1.0-beta.24"
  Fix rollup shaderlab es module package (#1888)
  fix(transform): fix translate error (#1889)
  Fix set texture ref count error in ShaderData (#1887)
  "v1.1.0-beta.23"
  feat: add adapter miniprogram config (#1886)
  "v1.1.0-beta.22"
  Provide `shaderlab` compiled AST related context for the VSCode extension (#1882)
  KTX2Loader support auto priority (#1885)
  "v1.1.0-beta.21"
  fix(scene): fix merge scene error (#1883)
  "v1.1.0-beta.20"
  feat: atlas support ktx2 (#1879)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuoLei1990 GuoLei1990 GuoLei1990 approved these changes

@zhuxudong zhuxudong zhuxudong approved these changes

Assignees

@Sway007 Sway007

Labels
enhancement New feature or request shader Shader related functions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Sway007 @GuoLei1990 @zhuxudong