mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-22 07:21:04 +01:00
Implement SHADER_PRIMITIVE_INDEX on all Backends (#3272)
* Fix bunnymark on GL * Implement SHADER_PRIMITIVE_INDEX on all backends * Changelog
This commit is contained in:
1 parent
a50836e0cb
commit
458fb9bed7
7 files changed
+20
-1
No files matched your search
@@ -132,6 +132,7 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non
|
||||
- Implement `Clone` for `ShaderSource` and `ShaderModuleDescriptor` in `wgpu`. By @daxpedda in [#3086](https://github.com/gfx-rs/wgpu/pull/3086).
|
||||
- Add `get_default_config` for `Surface` to simplify user creation of `SurfaceConfiguration`. By @jinleili in [#3034](https://github.com/gfx-rs/wgpu/pull/3034)
|
||||
- Native adapters can now use MSAA x2 and x8 if it's supported , previously only x1 and x4 were supported . By @39ali in [3140](https://github.com/gfx-rs/wgpu/pull/3140)
|
||||
- Added support for `Features::SHADER_PRIMITIVE_INDEX` on all backends. By @cwfitzgerald in [#3272](https://github.com/gfx-rs/wgpu/pull/3272)
|
||||
|
||||
#### GLES
|
||||
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
struct Globals {
|
||||
mvp: mat4x4<f32>,
|
||||
size: vec2<f32>,
|
||||
_pad0: u32,
|
||||
_pad1: u32,
|
||||
};
|
||||
|
||||
struct Locals {
|
||||
position: vec2<f32>,
|
||||
velocity: vec2<f32>,
|
||||
color: u32,
|
||||
_pad0: u32,
|
||||
_pad1: u32,
|
||||
_pad2: u32,
|
||||
};
|
||||
|
||||
@group(0)
|
||||
|
||||
@@ -123,6 +123,7 @@ impl super::Adapter {
|
||||
features |= wgt::Features::DEPTH_CLIP_CONTROL;
|
||||
features |= wgt::Features::TIMESTAMP_QUERY;
|
||||
features |= wgt::Features::PIPELINE_STATISTICS_QUERY;
|
||||
features |= wgt::Features::SHADER_PRIMITIVE_INDEX;
|
||||
}
|
||||
|
||||
if feature_level >= FL10_1 {
|
||||
|
||||
@@ -209,7 +209,8 @@ impl super::Adapter {
|
||||
| wgt::Features::TEXTURE_COMPRESSION_BC
|
||||
| wgt::Features::CLEAR_TEXTURE
|
||||
| wgt::Features::TEXTURE_FORMAT_16BIT_NORM
|
||||
| wgt::Features::PUSH_CONSTANTS;
|
||||
| wgt::Features::PUSH_CONSTANTS
|
||||
| wgt::Features::SHADER_PRIMITIVE_INDEX;
|
||||
//TODO: in order to expose this, we need to run a compute shader
|
||||
// that extract the necessary statistics out of the D3D12 result.
|
||||
// Alternatively, we could allocate a buffer for the query set,
|
||||
|
||||
@@ -338,6 +338,10 @@ impl super::Adapter {
|
||||
wgt::Features::MULTIVIEW,
|
||||
extensions.contains("OVR_multiview2"),
|
||||
);
|
||||
features.set(
|
||||
wgt::Features::SHADER_PRIMITIVE_INDEX,
|
||||
ver >= (3, 2) || extensions.contains("OES_geometry_shader"),
|
||||
);
|
||||
let gles_bcn_exts = [
|
||||
"GL_EXT_texture_compression_s3tc_srgb",
|
||||
"GL_EXT_texture_compression_rgtc",
|
||||
|
||||
@@ -726,6 +726,8 @@ impl super::PrivateCapabilities {
|
||||
supports_depth_clip_control: os_is_mac
|
||||
|| device.supports_feature_set(MTLFeatureSet::iOS_GPUFamily4_v1),
|
||||
supports_preserve_invariance: version.at_least((11, 0), (13, 0)),
|
||||
// Metal 2.2 on mac, 2.3 on iOS.
|
||||
supports_shader_primitive_index: version.at_least((10, 15), (14, 0)),
|
||||
has_unified_memory: if version.at_least((10, 15), (13, 0)) {
|
||||
Some(device.has_unified_memory())
|
||||
} else {
|
||||
@@ -764,6 +766,10 @@ impl super::PrivateCapabilities {
|
||||
features.set(F::TEXTURE_COMPRESSION_ETC2, self.format_eac_etc);
|
||||
|
||||
features.set(F::DEPTH_CLIP_CONTROL, self.supports_depth_clip_control);
|
||||
features.set(
|
||||
F::SHADER_PRIMITIVE_INDEX,
|
||||
self.supports_shader_primitive_index,
|
||||
);
|
||||
|
||||
features.set(
|
||||
F::TEXTURE_BINDING_ARRAY
|
||||
|
||||
@@ -230,6 +230,7 @@ struct PrivateCapabilities {
|
||||
supports_mutability: bool,
|
||||
supports_depth_clip_control: bool,
|
||||
supports_preserve_invariance: bool,
|
||||
supports_shader_primitive_index: bool,
|
||||
has_unified_memory: Option<bool>,
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user