Skip to content

WebGLProgram: remove capabilities from constructor #17513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2019
Merged

WebGLProgram: remove capabilities from constructor #17513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/renderers/webgl/WebGLProgram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ function generateEnvMapBlendingDefine( parameters, material ) {

}

function WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities ) {
function WebGLProgram( renderer, extensions, code, material, shader, parameters ) {

var gl = renderer.getContext();

Expand All @@ -387,7 +387,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,

var gammaFactorDefine = ( renderer.gammaFactor > 0 ) ? renderer.gammaFactor : 1.0;

var customExtensions = capabilities.isWebGL2 ? '' : generateExtensions( material.extensions, parameters, extensions );
var customExtensions = parameters.isWebGL2 ? '' : generateExtensions( material.extensions, parameters, extensions );

var customDefines = generateDefines( defines );

Expand Down Expand Up @@ -481,7 +481,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
parameters.sizeAttenuation ? '#define USE_SIZEATTENUATION' : '',

parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
parameters.logarithmicDepthBuffer && ( capabilities.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
parameters.logarithmicDepthBuffer && ( parameters.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
'uniform mat4 modelMatrix;',
'uniform vec3 cameraPosition;',

Expand Down Expand Up @@ -614,9 +614,9 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
parameters.physicallyCorrectLights ? '#define PHYSICALLY_CORRECT_LIGHTS' : '',

parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
parameters.logarithmicDepthBuffer && ( capabilities.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
parameters.logarithmicDepthBuffer && ( parameters.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',

( ( material.extensions ? material.extensions.shaderTextureLOD : false ) || parameters.envMap ) && ( capabilities.isWebGL2 || extensions.get( 'EXT_shader_texture_lod' ) ) ? '#define TEXTURE_LOD_EXT' : '',
( ( material.extensions ? material.extensions.shaderTextureLOD : false ) || parameters.envMap ) && ( parameters.isWebGL2 || extensions.get( 'EXT_shader_texture_lod' ) ) ? '#define TEXTURE_LOD_EXT' : '',

'uniform vec3 cameraPosition;',

Expand Down Expand Up @@ -660,7 +660,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
vertexShader = unrollLoops( vertexShader );
fragmentShader = unrollLoops( fragmentShader );

if ( capabilities.isWebGL2 && ! material.isRawShaderMaterial ) {
if ( parameters.isWebGL2 && ! material.isRawShaderMaterial ) {

var isGLSL3ShaderMaterial = false;

Expand Down
3 changes: 2 additions & 1 deletion src/renderers/webgl/WebGLPrograms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
shaderID: shaderID,

precision: precision,
isWebGL2: capabilities.isWebGL2,
supportsVertexTextures: capabilities.vertexTextures,
outputEncoding: getTextureEncodingFromMap( ( ! currentRenderTarget ) ? null : currentRenderTarget.texture, renderer.gammaOutput ),
map: !! material.map,
Expand Down Expand Up @@ -289,7 +290,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {

if ( program === undefined ) {

program = new WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities );
program = new WebGLProgram( renderer, extensions, code, material, shader, parameters );
programs.push( program );

}
Expand Down