From 2ab3b6da8dd6dd5973cbc9cc044ef9b03146b511 Mon Sep 17 00:00:00 2001 From: teoxoy <28601907+teoxoy@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:27:04 +0100 Subject: [PATCH] guarantee `DownlevelFlags::COMPUTE_SHADERS` when `DownlevelFlags::INDIRECT_EXECUTION` is enabled --- wgpu-hal/src/gles/adapter.rs | 5 +++-- wgpu-types/src/lib.rs | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wgpu-hal/src/gles/adapter.rs b/wgpu-hal/src/gles/adapter.rs index ff476645b..a4370f819 100644 --- a/wgpu-hal/src/gles/adapter.rs +++ b/wgpu-hal/src/gles/adapter.rs @@ -377,8 +377,9 @@ impl super::Adapter { } else { vertex_shader_storage_textures.min(fragment_shader_storage_textures) }; - let indirect_execution = - supported((3, 1), (4, 3)) || extensions.contains("GL_ARB_multi_draw_indirect"); + // NOTE: GL_ARB_compute_shader adds support for indirect dispatch + let indirect_execution = supported((3, 1), (4, 3)) + || (extensions.contains("GL_ARB_draw_indirect") && supports_compute); let mut downlevel_flags = wgt::DownlevelFlags::empty() | wgt::DownlevelFlags::NON_POWER_OF_TWO_MIPMAPPED_TEXTURES diff --git a/wgpu-types/src/lib.rs b/wgpu-types/src/lib.rs index 293b7ee2c..b53d31871 100644 --- a/wgpu-types/src/lib.rs +++ b/wgpu-types/src/lib.rs @@ -965,6 +965,8 @@ bitflags::bitflags! { const FRAGMENT_WRITABLE_STORAGE = 1 << 1; /// Supports indirect drawing and dispatching. /// + /// [`Self::COMPUTE_SHADERS`] must be present for this flag. + /// /// WebGL2, GLES 3.0, and Metal on Apple1/Apple2 GPUs do not support indirect. const INDIRECT_EXECUTION = 1 << 2; /// Supports non-zero `base_vertex` parameter to direct indexed draw calls.