github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add OpenGL support for TEXTURE_FORMAT_16BIT_NORM on supported versions (#5330)

Browse Source
This commit is contained in:
Erik Živković
2024-03-03 22:38:38 +01:00
committed by GitHub
parent f0ed4cf520
commit 352cb3d40b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -119,6 +119,7 @@ By @cwfitzgerald in [#5325](https://github.com/gfx-rs/wgpu/pull/5325).
#### GLES
- Log an error when GLES texture format heuristics fail. By @PolyMeilex in [#5266](https://github.com/gfx-rs/wgpu/issues/5266)
- Enable `TEXTURE_FORMAT_16BIT_NORM` for OpenGL 3.3+. By @bes in [#5330](https://github.com/gfx-rs/wgpu/pull/5330).
### Bug Fixes

12
wgpu-hal/src/gles/adapter.rs
View File

@@ -628,6 +628,11 @@ impl super::Adapter {
// that's the only way to get gl_InstanceID to work correctly.
features.set(wgt::Features::INDIRECT_FIRST_INSTANCE, supported);
}
// Supported by GL 3.3+, Not supported by GLES 3.0+
features.set(
wgt::Features::TEXTURE_FORMAT_16BIT_NORM,
es_ver.is_none() && full_ver >= Some((3, 3)),
);
let max_texture_size = unsafe { gl.get_parameter_i32(glow::MAX_TEXTURE_SIZE) } as u32;
let max_texture_3d_size = unsafe { gl.get_parameter_i32(glow::MAX_3D_TEXTURE_SIZE) } as u32;
@@ -1049,6 +1054,9 @@ impl crate::Adapter<super::Api> for super::Adapter {
let texture_float_linear = feature_fn(wgt::Features::FLOAT32_FILTERABLE, filterable);
let texture_rgb16bit_renderable =
feature_fn(wgt::Features::TEXTURE_FORMAT_16BIT_NORM, renderable);
match format {
Tf::R8Unorm => filterable_renderable,
Tf::R8Snorm => filterable,
@@ -1085,8 +1093,8 @@ impl crate::Adapter<super::Api> for super::Adapter {
Tf::Rg32Float => unfilterable | float_renderable | texture_float_linear,
Tf::Rgba16Uint => renderable | storage,
Tf::Rgba16Sint => renderable | storage,
Tf::Rgba16Unorm => empty,
Tf::Rgba16Snorm => empty,
Tf::Rgba16Unorm => texture_rgb16bit_renderable,
Tf::Rgba16Snorm => texture_rgb16bit_renderable,
Tf::Rgba16Float => filterable | storage | half_float_renderable,
Tf::Rgba32Uint => renderable | storage,
Tf::Rgba32Sint => renderable | storage,