From 0f1de6297453d5d37c16bfcfcc3b3a141bf92824 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Wed, 12 Feb 2025 19:27:36 -0500 Subject: [PATCH] Try to Fix Issues --- Cargo.toml | 1 + wgpu-hal/src/gles/adapter.rs | 1 + wgpu-hal/src/gles/mod.rs | 1 + wgpu-hal/src/gles/queue.rs | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 01c5f4a77c..5d324b468d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,6 +65,7 @@ wgpu = { version = "24.0.0", path = "./wgpu", default-features = false, features "dx12", "metal", "static-dxc", + "webgl", ] } wgpu-core = { version = "24.0.0", path = "./wgpu-core" } wgpu-hal = { version = "24.0.0", path = "./wgpu-hal" } diff --git a/wgpu-hal/src/gles/adapter.rs b/wgpu-hal/src/gles/adapter.rs index 85bae59457..c56611da0e 100644 --- a/wgpu-hal/src/gles/adapter.rs +++ b/wgpu-hal/src/gles/adapter.rs @@ -825,6 +825,7 @@ impl super::Adapter { private_caps, workarounds, features, + limits: limits.clone(), options: backend_options, shading_language_version, next_shader_id: Default::default(), diff --git a/wgpu-hal/src/gles/mod.rs b/wgpu-hal/src/gles/mod.rs index 478f2c433c..c462d7b2ec 100644 --- a/wgpu-hal/src/gles/mod.rs +++ b/wgpu-hal/src/gles/mod.rs @@ -274,6 +274,7 @@ struct AdapterShared { context: AdapterContext, private_caps: PrivateCapabilities, features: wgt::Features, + limits: wgt::Limits, workarounds: Workarounds, options: wgt::GlBackendOptions, shading_language_version: naga::back::glsl::Version, diff --git a/wgpu-hal/src/gles/queue.rs b/wgpu-hal/src/gles/queue.rs index 1be46ceed2..50126a76c1 100644 --- a/wgpu-hal/src/gles/queue.rs +++ b/wgpu-hal/src/gles/queue.rs @@ -1078,8 +1078,8 @@ impl super::Queue { 0, ) }; - for i in 0..crate::MAX_COLOR_ATTACHMENTS { - let target = glow::COLOR_ATTACHMENT0 + i as u32; + for i in 0..self.shared.limits.max_color_attachments { + let target = glow::COLOR_ATTACHMENT0 + i; unsafe { gl.framebuffer_texture_2d( glow::DRAW_FRAMEBUFFER,