From f1a887da33d0def87f4cc90131dc482c7ad72ca4 Mon Sep 17 00:00:00 2001
From: leod <100118+leod@users.noreply.github.com>
Date: Tue, 30 Jun 2026 16:25:14 +0200
Subject: [PATCH] Fix sampler params setting not respecting active texture unit

---
 src/gl/raw/context.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/gl/raw/context.rs b/src/gl/raw/context.rs
index 53bf00e..2063080 100644
--- a/src/gl/raw/context.rs
+++ b/src/gl/raw/context.rs
@@ -250,14 +250,17 @@ impl ContextShared {
             bound_ids.extend(std::iter::repeat_n(None, diff));
         }
 
+        let unit_gl = texture_unit_gl(unit);
+
+        unsafe {
+            self.gl.active_texture(unit_gl);
+        }
+
         if bound_ids[unit] == id {
             return;
         }
 
-        let unit_gl = texture_unit_gl(unit);
-
         unsafe {
-            self.gl.active_texture(unit_gl);
             self.gl.bind_texture(glow::TEXTURE_2D, id);
         }