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

gles: implement blending and write masks #126

Merged
merged 1 commit into from
Jun 15, 2024
Merged

Conversation

lukaslihotzki
Copy link
Contributor

Blending fixes the current mostly-transparent-window bug in zed-industries/zed#9581 (screenshot is attached there). Write masks weren't necessary, but easy to do.

@lukaslihotzki lukaslihotzki changed the title Implement blending and write masks gles: implement blending and write masks Jun 2, 2024
Copy link
Owner

@kvark kvark left a comment

Choose a reason for hiding this comment

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

Thank you! A few changes are needed

blade-graphics/src/gles/command.rs Outdated Show resolved Hide resolved
blade-graphics/src/gles/command.rs Outdated Show resolved Hide resolved
blade-graphics/src/gles/pipeline.rs Outdated Show resolved Hide resolved
blade-graphics/src/gles/command.rs Outdated Show resolved Hide resolved
blade-graphics/src/gles/command.rs Outdated Show resolved Hide resolved
blade-graphics/src/gles/command.rs Outdated Show resolved Hide resolved
Copy link
Owner

@kvark kvark left a comment

Choose a reason for hiding this comment

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

Thank you for updating it! One last thing

blade-graphics/src/gles/mod.rs Outdated Show resolved Hide resolved
@lukaslihotzki lukaslihotzki requested a review from kvark June 7, 2024 13:59
@lukaslihotzki
Copy link
Contributor Author

I have merged the blend states and write masks according to your preference.

@lukaslihotzki lukaslihotzki requested a review from kvark June 15, 2024 22:49
Copy link
Owner

@kvark kvark left a comment

Choose a reason for hiding this comment

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

Great, thank you!

@kvark kvark enabled auto-merge (rebase) June 15, 2024 23:18
@kvark kvark disabled auto-merge June 15, 2024 23:18
@kvark kvark merged commit bb7d1f2 into kvark:main Jun 15, 2024
5 checks passed
@lukaslihotzki
Copy link
Contributor Author

Thanks also for your work on supporting GLES! Can you, please, make a release? Then, Zed could be built with --cfg gles after a version bump.

@kvark
Copy link
Owner

kvark commented Jun 17, 2024

Thank you for contributing!
You've figured out that a release is not necessary for zed-industries/zed#13114

mikayla-maki pushed a commit to zed-industries/zed that referenced this pull request Jun 20, 2024
Based on the work on GLES support of @kvark, only two pieces were
missing for usable GLES support:
- kvark/blade#125 was upstreamed 2 weeks ago and
is contained in the currently referenced zed-industries/blade fork
- kvark/blade#126 was upstreamed 17 hours ago
and is not contained in the zed-industries fork. As the zed-industries
fork was also upstreamed in kvark/blade#128, we
can switch back to mainline blade.

If you don't want to switch back to mainline blade, please integrate
kvark/blade#126 to your fork.

Release Notes:

- Fix GLES backend (#9581)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants