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

Ensure POINT_SIZE takes effect in the canvas item shader #80323

Merged
merged 1 commit into from Aug 21, 2023
Merged

Ensure POINT_SIZE takes effect in the canvas item shader #80323

merged 1 commit into from Aug 21, 2023

Conversation

garychia
Copy link
Contributor

@garychia garychia commented Aug 6, 2023

Fixes #80291.

@garychia garychia requested a review from a team as a code owner August 6, 2023 08:46
@Calinou Calinou added bug topic:rendering topic:2d topic:shaders cherrypick:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Aug 6, 2023
@Calinou Calinou added this to the 4.2 milestone Aug 6, 2023
@bluenote10
Copy link
Contributor

Thanks for fixing this! I can confirm that this fixes my reproduction example, and also the actual shaders I was porting to Godot 4 (but I'm lacking the context to judge if this is the best way to solve it).

clayjohn
clayjohn approved these changes Aug 11, 2023
View reviewed changes
Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

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

Looks correct! This matches how it works in the shader and in the GLES3 backend.

@akien-mga akien-mga changed the title Ensure POINT_SIZE takes effect in the canvas item shader Ensure POINT_SIZE takes effect in the canvas item shader Aug 21, 2023
@akien-mga akien-mga merged commit 10b1f82 into godotengine:master Aug 21, 2023
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@garychia garychia deleted the canvas_point_size branch August 21, 2023 07:21
@bluenote10
Copy link
Contributor

I see that his has been labelled for cherry picking. Does that mean it will be backported to 4.0 and 4.1 somehow automatically or is a manual PR required? It would be great if it gets included in the next 4.1 patch release, but I'm not quite sure what I'd have to do to make that happen.

@Zireael07
Copy link
Contributor

@bluenote10 Whether a dedicated PR is needed depends on the complexity of the change. As you're not a maintainer nor the PR creator, I think there's nothing you can do to make this happen

@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.3.

@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Oct 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clayjohn clayjohn clayjohn approved these changes

Assignees
No one assigned
Labels
bug topic:rendering topic:shaders topic:2d
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

POINT_SIZE does not work in canvas item shader (Godot 3 to 4 regression)
7 participants
@garychia @bluenote10 @akien-mga @Zireael07 @YuriSizov @clayjohn @Calinou