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

Fix ShaderLab diagnostics position error when source include EditorProperties & EditorMacros module #1966

Merged
merged 43 commits into from
Jan 16, 2024

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Jan 11, 2024

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

  • When ShaderLab source include EditorProperties and EditorMacros module, the position of diagnostic ignore some line offset, now fixed.
  • ShaderProgramPools._recursiveDestroy will run in a infinite loop when destroy shader

@Sway007 Sway007 added bug Something isn't working shader Shader related functions high priority High priority issue labels Jan 11, 2024
@Sway007 Sway007 self-assigned this Jan 11, 2024
@Sway007 Sway007 added this to the 1.2 milestone Jan 11, 2024
export class AstNodeUtils {
/** EditorProperties offset */
static positionOffset: IPositionOffset[] | undefined;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't cache instance data in Util class

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never used

@GuoLei1990 GuoLei1990 changed the title Fix ShaderProgramPool._recursiveDestroy and ShaderLab diagnostics' postion info when source include EditorProperties & EditorMacros module Fix ShaderLab diagnostics' position error when source include EditorProperties & EditorMacros module Jan 16, 2024
@GuoLei1990 GuoLei1990 changed the title Fix ShaderLab diagnostics' position error when source include EditorProperties & EditorMacros module Fix ShaderLab diagnostics position error when source include EditorProperties & EditorMacros module Jan 16, 2024
@GuoLei1990 GuoLei1990 merged commit bf77c68 into galacean:dev/1.2 Jan 16, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working high priority High priority issue shader Shader related functions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants