Merge branch 'dev' into next

michaeljherrmann · Sep 7, 2022 · 7d9aed6 · 7d9aed6
2 parents c4b1322 + c1db3d8
commit 7d9aed6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/packages/core/src/shader/utils/generateUniformsSync.ts b/packages/core/src/shader/utils/generateUniformsSync.ts
@@ -158,9 +158,27 @@ const GLSL_TO_SINGLE_SETTERS_CACHED: Dict<string> = {
     mat3:     'gl.uniformMatrix3fv(location, false, v)',
     mat4:     'gl.uniformMatrix4fv(location, false, v)',
 
-    sampler2D:      'gl.uniform1i(location, v)',
-    samplerCube:    'gl.uniform1i(location, v)',
-    sampler2DArray: 'gl.uniform1i(location, v)',
+    sampler2D: `
+    if (cv !== v)
+    {
+        cu.value = v;
+
+        gl.uniform1i(location, v);
+    }`,
+    samplerCube: `
+    if (cv !== v)
+    {
+        cu.value = v;
+
+        gl.uniform1i(location, v);
+    }`,
+    sampler2DArray: `
+    if (cv !== v)
+    {
+        cu.value = v;
+
+        gl.uniform1i(location, v);
+    }`,
 };
 
 const GLSL_TO_ARRAY_SETTERS: Dict<string> = {

diff --git a/packages/core/src/shader/utils/uniformParsers.ts b/packages/core/src/shader/utils/uniformParsers.ts
@@ -39,9 +39,9 @@ export const uniformParsers: IUniformParser[] = [
     },
     // handling samplers
     {
-        test: (data: any): boolean =>
-            // eslint-disable-next-line max-len
-            (data.type === 'sampler2D' || data.type === 'samplerCube' || data.type === 'sampler2DArray') && data.size === 1 && !data.isArray,
+        test: (data: any, uniform: any): boolean =>
+            // eslint-disable-next-line max-len,no-eq-null,eqeqeq
+            (data.type === 'sampler2D' || data.type === 'samplerCube' || data.type === 'sampler2DArray') && data.size === 1 && !data.isArray && (uniform == null || uniform.castToBaseTexture !== undefined),
         code: (name: string): string => `t = syncData.textureCount++;
 
             renderer.texture.bind(uv["${name}"], t);