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

Fix ShaderLab compatible with no varying variable #1859

Merged
merged 13 commits into from
Nov 6, 2023
Merged

Fix ShaderLab compatible with no varying variable #1859

merged 13 commits into from
Nov 6, 2023

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Nov 2, 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)

@Sway007 Sway007 added bug Something isn't working shader Shader related functions labels Nov 2, 2023
@Sway007 Sway007 self-assigned this Nov 2, 2023
@codecov Codecov
Copy link

codecov bot commented Nov 2, 2023 •
edited

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (948aaa1) 67.02% compared to head (e57a806) 67.04%.

❗ Current head e57a806 differs from pull request most recent head 41ef06f. Consider uploading reports for the commit 41ef06f to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1859      +/-   ##
==========================================
+ Coverage   67.02%   67.04%   +0.02%     
==========================================
  Files         471      471              
  Lines       23741    23744       +3     
  Branches     3379     3382       +3     
==========================================
+ Hits        15912    15920       +8     
+ Misses       6625     6622       -3     
+ Partials     1204     1202       -2
Files Coverage Δ
packages/shader-lab/src/Ast2GLSLUtils.ts 66.66% <100.00%> (+9.52%) ⬆️
packages/shader-lab/src/ast-node/AstNode.ts 81.12% <40.00%> (-0.59%) ⬇️

... and 4 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@GuoLei1990 GuoLei1990 changed the title Fix ShaderLab: compatible with no varying variable Fix ShaderLab compatible with no varying variable Nov 6, 2023
@GuoLei1990 GuoLei1990 merged commit 1cb5bfc into galacean:main Nov 6, 2023
5 checks passed
GuoLei1990 added a commit that referenced this pull request Nov 13, 2023
@GuoLei1990
Merge branch 'main' into dev/1.2
d233eef 
* main:
  fix: material destroy bug (#1864)
  Fix asset promise (#1867)
  Set `SpriteMask.sprite` to null after destroying the sprite.  (#1866)
  "v1.1.0-beta.19"
  Add recursive class and methods (#1865)
  Fix url clamp bug (#1860)
  feat: add recursive object parse (#1863)
  Fix ShaderLab compatible with no varying variable (#1859)
  Fix ShaderLab umd package compilation and circle reference (#1856)
  Add unit test case of `ColliderShape` (#1740)
@Sway007 Sway007 mentioned this pull request Dec 7, 2023
Closed
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

Assignees

@Sway007 Sway007

Labels
bug Something isn't working shader Shader related functions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Sway007 @GuoLei1990