|
@@ -79,15 +79,15 @@ function getToneMappingFunction( functionName, toneMapping ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
-function generateExtensions( extensions, parameters, rendererExtensions, isWebGL2 ) {
|
|
|
|
|
|
+function generateExtensions( extensions, parameters, rendererExtensions ) {
|
|
|
|
|
|
extensions = extensions || {};
|
|
extensions = extensions || {};
|
|
|
|
|
|
var chunks = [
|
|
var chunks = [
|
|
- ( ! isWebGL2 && ( extensions.derivatives || parameters.envMapCubeUV || parameters.bumpMap || parameters.normalMap || parameters.flatShading ) ) ? '#extension GL_OES_standard_derivatives : enable' : '',
|
|
|
|
- ( ! isWebGL2 && ( extensions.fragDepth || parameters.logarithmicDepthBuffer ) && rendererExtensions.get( 'EXT_frag_depth' ) ) ? '#extension GL_EXT_frag_depth : enable' : '',
|
|
|
|
|
|
+ ( extensions.derivatives || parameters.envMapCubeUV || parameters.bumpMap || parameters.normalMap || parameters.flatShading ) ? '#extension GL_OES_standard_derivatives : enable' : '',
|
|
|
|
+ ( extensions.fragDepth || parameters.logarithmicDepthBuffer ) && rendererExtensions.get( 'EXT_frag_depth' ) ? '#extension GL_EXT_frag_depth : enable' : '',
|
|
( extensions.drawBuffers ) && rendererExtensions.get( 'WEBGL_draw_buffers' ) ? '#extension GL_EXT_draw_buffers : require' : '',
|
|
( extensions.drawBuffers ) && rendererExtensions.get( 'WEBGL_draw_buffers' ) ? '#extension GL_EXT_draw_buffers : require' : '',
|
|
- ( ! isWebGL2 && ( extensions.shaderTextureLOD || parameters.envMap ) && rendererExtensions.get( 'EXT_shader_texture_lod' ) ) ? '#extension GL_EXT_shader_texture_lod : enable' : ''
|
|
|
|
|
|
+ ( extensions.shaderTextureLOD || parameters.envMap ) && rendererExtensions.get( 'EXT_shader_texture_lod' ) ? '#extension GL_EXT_shader_texture_lod : enable' : ''
|
|
];
|
|
];
|
|
|
|
|
|
return chunks.filter( filterEmptyLine ).join( '\n' );
|
|
return chunks.filter( filterEmptyLine ).join( '\n' );
|
|
@@ -287,7 +287,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
|
|
|
|
|
|
//
|
|
//
|
|
|
|
|
|
- var customExtensions = generateExtensions( material.extensions, parameters, extensions, isWebGL2 );
|
|
|
|
|
|
+ var customExtensions = isWebGL2 ? '' : generateExtensions( material.extensions, parameters, extensions );
|
|
|
|
|
|
var customDefines = generateDefines( defines );
|
|
var customDefines = generateDefines( defines );
|
|
|
|
|