Browse Source

WebGLShader: Simplified logic.

Mr.doob 11 years ago
parent
commit
73d0e9ab59
2 changed files with 4 additions and 24 deletions
  1. 2 2
      src/renderers/WebGLRenderer.js
  2. 2 22
      src/renderers/webgl/WebGLShader.js

+ 2 - 2
src/renderers/WebGLRenderer.js

@@ -5600,8 +5600,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		].join( '\n' );
 
-		var glVertexShader = new THREE.WebGLShader( _gl, 'vertex', prefix_vertex + vertexShader );
-		var glFragmentShader = new THREE.WebGLShader( _gl, 'fragment', prefix_fragment + fragmentShader );
+		var glVertexShader = new THREE.WebGLShader( _gl, _gl.VERTEX_SHADER, prefix_vertex + vertexShader );
+		var glFragmentShader = new THREE.WebGLShader( _gl, _gl.FRAGMENT_SHADER, prefix_fragment + fragmentShader );
 
 		_gl.attachShader( program, glVertexShader );
 		_gl.attachShader( program, glFragmentShader );

+ 2 - 22
src/renderers/webgl/WebGLShader.js

@@ -16,32 +16,12 @@ THREE.WebGLShader = ( function () {
 
 	return function ( gl, type, string ) {
 
-		var shader; 
-
-		if ( type === 'vertex' ) {
-
-			shader = gl.createShader( gl.VERTEX_SHADER );
-
-		} else if ( type === 'fragment' ) {
-
-			shader = gl.createShader( gl.FRAGMENT_SHADER );
-
-		} else {
-
-			console.error( 'THREE.WebGLShader:', 'Unrecognised shader type', type );
-			return null;
-
-		}
+		var shader = gl.createShader( type ); 
 
 		gl.shaderSource( shader, string );
 		gl.compileShader( shader );
 
-		/*
-		if ( gl.getShaderParameter( shader, gl.COMPILE_STATUS ) === false ) {
-
-
-		}
-		*/
+		// if ( gl.getShaderParameter( shader, gl.COMPILE_STATUS ) === false ) {}
 
 		if ( gl.getShaderInfoLog( shader ) !== '' ) {