WebGLPrograms: Improve performance of getParameters().

mrdoob · Jun 16, 2020 · 924a6d3 · 924a6d3
1 parent 92ad8c5
commit 924a6d3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
@@ -1539,7 +1539,7 @@ function WebGLRenderer( parameters ) {
 			program = programCache.acquireProgram( parameters, programCacheKey );
 
 			materialProperties.program = program;
-			materialProperties.uniforms = parameters.uniforms;
+			materialProperties.uniforms = programCache.getUniforms( material );
 			materialProperties.outputEncoding = parameters.outputEncoding;
 			material.program = program;
 

diff --git a/src/renderers/webgl/WebGLPrograms.d.ts b/src/renderers/webgl/WebGLPrograms.d.ts
@@ -21,6 +21,7 @@ export class WebGLPrograms {
 		object: any
 	): any;
 	getProgramCacheKey( parameters: any ): string;
+	getUniforms( material: Material ): object;
 	acquireProgram(
 		parameters: any,
 		cacheKey: string

diff --git a/src/renderers/webgl/WebGLPrograms.js b/src/renderers/webgl/WebGLPrograms.js
@@ -63,7 +63,6 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 			shaderobject = {
 				name: material.name || material.type,
-				uniforms: UniformsUtils.clone( shader.uniforms ),
 				vertexShader: shader.vertexShader,
 				fragmentShader: shader.fragmentShader
 			};
@@ -72,7 +71,6 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 			shaderobject = {
 				name: material.name || material.type,
-				uniforms: material.uniforms,
 				vertexShader: material.vertexShader,
 				fragmentShader: material.fragmentShader
 			};
@@ -180,7 +178,6 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 			shaderID: shaderID,
 			shaderName: shaderobject.name,
 
-			uniforms: shaderobject.uniforms,
 			vertexShader: shaderobject.vertexShader,
 			fragmentShader: shaderobject.fragmentShader,
 			defines: material.defines,
@@ -342,6 +339,26 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 	}
 
+	function getUniforms( material ) {
+
+		const shaderID = shaderIDs[ material.type ];
+		let uniforms;
+
+		if ( shaderID ) {
+
+			const shader = ShaderLib[ shaderID ];
+			uniforms = UniformsUtils.clone( shader.uniforms );
+
+		} else {
+
+			uniforms = material.uniforms;
+
+		}
+
+		return uniforms;
+
+	}
+
 	function acquireProgram( parameters, cacheKey ) {
 
 		let program;
@@ -392,6 +409,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 	return {
 		getParameters: getParameters,
 		getProgramCacheKey: getProgramCacheKey,
+		getUniforms: getUniforms,
 		acquireProgram: acquireProgram,
 		releaseProgram: releaseProgram,
 		// Exposed for resource monitoring & error feedback via renderer.info: