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

Complement ShaderLab syntax for glsl #1980

Merged
merged 24 commits into from
Jan 23, 2024
Merged

Complement ShaderLab syntax for glsl #1980

merged 24 commits into from
Jan 23, 2024

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Jan 22, 2024 •
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, ...)

  1. Complement ShaderLab missing syntax for glsl
    • macro in function argument
    • macro in struct
    • type qulifier for variable declaration
    • chained conditional statement
    • chained assignment
  2. Fix the global order issue when compiling shaderlab to glsl
  3. Fix parse include

@Sway007 Sway007 added enhancement New feature or request shader Shader related functions high priority High priority issue labels Jan 22, 2024
@Sway007 Sway007 added this to the 1.2 milestone Jan 22, 2024
@Sway007 Sway007 self-assigned this Jan 22, 2024
@Sway007 Sway007 marked this pull request as draft January 22, 2024 03:54
@Sway007 Sway007 marked this pull request as ready for review January 22, 2024 05:45
@Sway007 Sway007 changed the title Complement ShaderLab syntax for glsl and supplement e2e test case Complement ShaderLab syntax for glsl Jan 22, 2024
@GuoLei1990 GuoLei1990 merged commit 259ec40 into galacean:dev/1.2 Jan 23, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuoLei1990 GuoLei1990 Awaiting requested review from GuoLei1990

@zhuxudong zhuxudong Awaiting requested review from zhuxudong

Assignees

@Sway007 Sway007

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@Sway007 @GuoLei1990