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

Add Preprocessor in ShaderLab #2009

Merged
merged 17 commits into from
Feb 26, 2024
Merged

Add Preprocessor in ShaderLab #2009

merged 17 commits into from
Feb 26, 2024

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Feb 26, 2024 •
edited
Loading

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, ...)

  • [feat]Add Preprocessor module in ShaderLab
    • extend #define and #include macro with preprocessor
    • fix compile error caused by order issue of #define macro

Sway007 added 17 commits January 8, 2024 16:56
@Sway007
refactor: syntax for include code fragment
88c0916
@Sway007
Merge branch 'dev/1.2' of https://github.com/galacean/engine into dev…
464e889 
…/1.2
@Sway007
Merge branch 'dev/1.2' of https://github.com/galacean/engine into dev…
b1f151f 
…/1.2
@Sway007
Merge branch 'dev/1.2' of https://github.com/galacean/engine into dev…
bf1ea21 
…/1.2
@Sway007
Merge branch 'dev/1.2' of https://github.com/galacean/engine into dev…
4258823 
…/1.2
@Sway007
Merge branch 'dev/1.2' of https://github.com/galacean/engine into dev…
5e9868c 
…/1.2
@Sway007
Merge branch 'dev/1.2' of https://github.com/galacean/engine into dev…
a3d8751 
…/1.2
@Sway007
fix: function overload serialization
6584026
@Sway007
feat(wip): add shaderlab preprocessor
b8ff1a4
@Sway007
feat(wip): add shaderfactory unregister
da6a3ec
@Sway007
fix: void args fn call
a0d5e3f
@Sway007
fix: include regex
ef00f2f
@Sway007
feat: add position prop
ce44b67
@Sway007
Merge branch 'dev/1.2' of https://github.com/galacean/engine into fix…
821584e 
…/shaderlab/function_overload
@Sway007
Merge branch 'fix/shaderlab/function_overload' into feat/shaderlab/pr…
034f110 
…eprocessor
@Sway007
feat(shaderlab): add preprocessor
19da18c
@Sway007
feat: merge dev/1.2
f42cf4d
@Sway007 Sway007 added enhancement New feature or request shader Shader related functions high priority High priority issue labels Feb 26, 2024
@Sway007 Sway007 added this to the 1.2 milestone Feb 26, 2024
@Sway007 Sway007 self-assigned this Feb 26, 2024
@GuoLei1990 GuoLei1990 merged commit 55ea510 into galacean:dev/1.2 Feb 26, 2024
6 checks passed
@GuoLei1990 GuoLei1990 added the ignore for release ignore for release label Feb 26, 2024
GuoLei1990 added a commit to GuoLei1990/galacean-engine that referenced this pull request Feb 26, 2024
@GuoLei1990
Merge branch 'dev/1.2' into pr/camera-opaque-texture
ecb402a 
* dev/1.2: (29 commits)
  Add `Preprocessor` in `ShaderLab` (galacean#2009)
  "v1.2.0-alpha.11"
  Add ShaderLab package umd entry (galacean#2006)
  Fix primitive e2e error (galacean#2007)
  "v1.2.0-alpha.10"
  "v1.1.0-beta.49"
  "v1.1.0-beta.48"
  Physics raycast hitResult add shape (galacean#2004)
  Fix output glsl error when `function overload` exists in shaderlab source code (galacean#2001)
  refactor: adapter shadowFadeBorder exported from editor (galacean#1999)
  refactor(render-sort-compare): opt compare code (galacean#2002)
  feat: modify the method of generating the path (galacean#2000)
  "v1.1.0-beta.47"
  Fix`gl.MIN` and `gl.MAX` doesn't exist in `webgl1` (galacean#1990)
  Fix glb/gltf use extension parse (galacean#1992)
  "v1.1.0-beta.46"
  Fix query path error (galacean#1986)
  "v1.1.0-beta.45"
  "v1.1.0-beta.44"
  Fix the problem of resetting `HtmlCanvas.ClientXXX` when call `canvas.resizeByClientSize()` (galacean#1984)
  ...
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 Awaiting requested review from zhuxudong

Assignees

@Sway007 Sway007

Labels
enhancement New feature or request high priority High priority issue ignore for release ignore for release shader Shader related functions
Projects
None yet
Milestone
1.2
Development

Successfully merging this pull request may close these issues.
2 participants
@Sway007 @GuoLei1990