Separate the layer fetch functions

Author: gkjohnson

src/materials/PhysicalPathTracingMaterial.js

@@ -1,7 +1,7 @@
 import { Matrix4, Matrix3, Vector2 } from 'three';
 import { MaterialBase } from './MaterialBase.js';
 import {
-	MeshBVHUniformStruct, FloatVertexAttributeTexture, UIntVertexAttributeTexture,
+	MeshBVHUniformStruct, UIntVertexAttributeTexture,
 	shaderStructs, shaderIntersectFunction,
 } from 'three-mesh-bvh';
 import { shaderMaterialStructs, shaderLightStruct } from '../shader/shaderStructs.js';
@@ -11,6 +11,7 @@ import { shaderMaterialSampling } from '../shader/shaderMaterialSampling.js';
 import { shaderEnvMapSampling } from '../shader/shaderEnvMapSampling.js';
 import { shaderLightSampling } from '../shader/shaderLightSampling.js';
 import { shaderUtils } from '../shader/shaderUtils.js';
+import { shaderLayerTexelFetchFunctions } from '../shader/shaderLayerTexelFetchFunctions.js';
 import { PhysicalCameraUniform } from '../uniforms/PhysicalCameraUniform.js';
 import { EquirectHdrInfoUniform } from '../uniforms/EquirectHdrInfoUniform.js';
 import { LightsInfoUniformStruct } from '../uniforms/LightsInfoUniformStruct.js';
@@ -106,6 +107,7 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 				${ shaderMaterialStructs }
 				${ shaderLightStruct }
 
+				${ shaderLayerTexelFetchFunctions }
 				${ shaderUtils }
 				${ shaderMaterialSampling }
 				${ shaderEnvMapSampling }

src/shader/shaderLayerTexelFetchFunctions.js

@@ -0,0 +1,25 @@
+
+export const shaderLayerTexelFetchFunctions = /*glsl */`
+
+	// add texel fetch functions for texture arrays
+	vec4 texelFetch1D( sampler2DArray tex, int layer, uint index ) {
+
+		uint width = uint( textureSize( tex, 0 ).x );
+		uvec2 uv;
+		uv.x = index % width;
+		uv.y = index / width;
+
+		return texelFetch( tex, ivec3( uv, layer ), 0 );
+
+	}
+
+	vec4 textureSampleBarycoord( sampler2DArray tex, int layer, vec3 barycoord, uvec3 faceIndices ) {
+
+		return
+			barycoord.x * texelFetch1D( tex, layer, faceIndices.x ) +
+			barycoord.y * texelFetch1D( tex, layer, faceIndices.y ) +
+			barycoord.z * texelFetch1D( tex, layer, faceIndices.z );
+
+	}
+
+`;

src/shader/shaderUtils.js

@@ -361,25 +361,4 @@ export const shaderUtils = /* glsl */`
 
 	}
 
-	// add texel fetch functions for texture arrays
-	vec4 texelFetch1D( sampler2DArray tex, int layer, uint index ) {
-
-		uint width = uint( textureSize( tex, 0 ).x );
-		uvec2 uv;
-		uv.x = index % width;
-		uv.y = index / width;
-
-		return texelFetch( tex, ivec3( uv, layer ), 0 );
-
-	}
-
-	vec4 textureSampleBarycoord( sampler2DArray tex, int layer, vec3 barycoord, vec3 faceIndices ) {
-
-		return
-			barycoord.x * texelFetch1D( tex, layer, faceIndices.x ) +
-			barycoord.y * texelFetch1D( tex, layer, faceIndices.y ) +
-			barycoord.z * texelFetch1D( tex, layer, faceIndices.z );
-
-	}
-
 `;