Browse Source

WebGLRenderer.setupVertexAttributes: Simplified ANGLE_instanced_arrays check.

Mr.doob 5 years ago
parent
commit
06e83ff583
1 changed files with 2 additions and 18 deletions
  1. 2 18
      src/renderers/WebGLRenderer.js

+ 2 - 18
src/renderers/WebGLRenderer.js

@@ -891,25 +891,9 @@ function WebGLRenderer( parameters ) {
 
 
 	function setupVertexAttributes( object, geometry, material, program ) {
 	function setupVertexAttributes( object, geometry, material, program ) {
 
 
-		if ( object.isInstancedMesh ) {
-
-			if ( extensions.get( 'ANGLE_instanced_arrays' ) === null ) {
-
-				console.error( 'THREE.WebGLRenderer.setupVertexAttributes: using THREE.InstancedBufferGeometry but hardware does not support extension ANGLE_instanced_arrays.' );
-				return;
-
-			}
+		if ( capabilities.isWebGL2 === false && ( object.isInstancedMesh || geometry.isInstancedBufferGeometry ) ) {
 
 
-		} else if ( geometry && geometry.isInstancedBufferGeometry && ! capabilities.isWebGL2 ) {
-
-			// TODO Remove
-
-			if ( extensions.get( 'ANGLE_instanced_arrays' ) === null ) {
-
-				console.error( 'THREE.WebGLRenderer.setupVertexAttributes: using THREE.InstancedBufferGeometry but hardware does not support extension ANGLE_instanced_arrays.' );
-				return;
-
-			}
+			if ( extensions.get( 'ANGLE_instanced_arrays' ) === null ) return;
 
 
 		}
 		}