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

Shaderlab detect shader with duplicate name #1897

Merged
merged 25 commits into from
Dec 8, 2023

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Dec 7, 2023

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

Shaderlab detect shader with duplicate name

What is the current behavior? (You can also link to an open issue here)

Shaders with same name can compiled successfully

What is the new behavior (if this is a feature change)?

An error will be thrown when compiling a shader with the same name

close #1896

@Sway007 Sway007 added the shader Shader related functions label Dec 7, 2023
@Sway007 Sway007 self-assigned this Dec 7, 2023
@Sway007 Sway007 added this to the 1.2 milestone Dec 7, 2023
@GuoLei1990 GuoLei1990 merged commit 34aee2f into galacean:main Dec 8, 2023
5 checks passed
@GuoLei1990 GuoLei1990 added the enhancement New feature or request label Dec 8, 2023
@Sway007 Sway007 deleted the fix/shaderlab/name-duplicate branch December 8, 2023 09:06
GuoLei1990 added a commit that referenced this pull request Dec 15, 2023
* main:
  SceneLoader add shadow cascade splits parser (#1899)
  "v1.1.0-beta.27"
  "v1.1.0-beta.26"
  refactor: complement texture loader params (#1898)
  ci: upgrade husky version (#1900)
  "v1.1.0-beta.25"
  Shaderlab detect shader with duplicate name (#1897)
  `ParticleGradient` support  `colorKeys` and `alphaKeys` modification (#1894)
  Fix by passing 0.0 avoids precision issues and optimizes performance (#1890)
  Adds protection for value infinity in `BoundingBox` (#1892)

# Conflicts:
#	package.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request shader Shader related functions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shaderlab should detect and report shaders with duplicate name
2 participants