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

allow gles float textures to be multisampled if available #3183

Merged
merged 4 commits into from
Nov 23, 2022
Merged

allow gles float textures to be multisampled if available #3183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7b05fa
allow gles float textures to be multisampled if available
Wumpf Nov 7, 2022
caa84c0
update changelog
Wumpf Nov 7, 2022
f72568e
Merge remote-tracking branch 'upstream/master' into fix-gl-msaa-float
Wumpf Nov 19, 2022
7de72e3
fixup for 2x/8x msaa pr
Wumpf Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ Bottom level categories:
#### GLES

- Fixed WebGL not displaying srgb targets correctly if a non-screen filling viewport was previously set. By @Wumpf in [#3093](https://github.com/gfx-rs/wgpu/pull/3093)
- Fix disallowing multisampling for float textures if otherwise supported. By @Wumpf in [#3183](https://github.com/gfx-rs/wgpu/pull/3183)

#### deno-webgpu

Expand Down
10 changes: 8 additions & 2 deletions wgpu-hal/src/gles/adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,12 +716,18 @@ impl crate::Adapter<super::Api> for super::Adapter {

let half_float_renderable = private_caps_fn(
super::PrivateCapabilities::COLOR_BUFFER_HALF_FLOAT,
Tfc::COLOR_ATTACHMENT | Tfc::COLOR_ATTACHMENT_BLEND,
Tfc::COLOR_ATTACHMENT
| Tfc::COLOR_ATTACHMENT_BLEND
| sample_count
| Tfc::MULTISAMPLE_RESOLVE,
);

let float_renderable = private_caps_fn(
super::PrivateCapabilities::COLOR_BUFFER_FLOAT,
Tfc::COLOR_ATTACHMENT | Tfc::COLOR_ATTACHMENT_BLEND,
Tfc::COLOR_ATTACHMENT
| Tfc::COLOR_ATTACHMENT_BLEND
| sample_count
| Tfc::MULTISAMPLE_RESOLVE,
);

match format {
Expand Down