|
@@ -334,17 +334,20 @@ THREE.WebGLProgram = ( function () {
|
|
|
|
|
|
_gl.linkProgram( program );
|
|
|
|
|
|
+ var programLogInfo = _gl.getProgramInfoLog( program );
|
|
|
+
|
|
|
if ( _gl.getProgramParameter( program, _gl.LINK_STATUS ) === false ) {
|
|
|
|
|
|
- THREE.error( 'THREE.WebGLProgram: Could not initialise shader.' );
|
|
|
- THREE.error( 'gl.VALIDATE_STATUS', _gl.getProgramParameter( program, _gl.VALIDATE_STATUS ) );
|
|
|
- THREE.error( 'gl.getError()', _gl.getError() );
|
|
|
+ THREE.error( 'THREE.WebGLProgram: shader error: ' + _gl.getError(), {
|
|
|
+ 'gl.VALIDATE_STATUS': _gl.getProgramParameter( program, _gl.VALIDATE_STATUS ),
|
|
|
+ 'gl.getPRogramInfoLog': programLogInfo
|
|
|
+ });
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ if ( programLogInfo !== '' ) {
|
|
|
|
|
|
- if ( _gl.getProgramInfoLog( program ) !== '' ) {
|
|
|
-
|
|
|
- THREE.warning( 'THREE.WebGLProgram: gl.getProgramInfoLog()', _gl.getProgramInfoLog( program ) );
|
|
|
+ THREE.warning( 'THREE.WebGLProgram: gl.getProgramInfoLog()', programLogInfo );
|
|
|
// THREE.warning( _gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( glVertexShader ) );
|
|
|
// THREE.warning( _gl.getExtension( 'WEBGL_debug_shaders' ).getTranslatedShaderSource( glFragmentShader ) );
|
|
|
|