Skip to content

Commit a4c992f

Browse files
committed
WebGLProgram: Clean up.
1 parent 0841f19 commit a4c992f

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/renderers/webgl/WebGLProgram.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,8 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
401401

402402
var prefixVertex, prefixFragment;
403403

404+
var numMultiviewViews = parameters.numMultiviewViews;
405+
404406
if ( material.isRawShaderMaterial ) {
405407

406408
prefixVertex = [
@@ -694,14 +696,14 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
694696

695697
// Multiview
696698

697-
if ( parameters.numMultiviewViews > 0 ) {
699+
if ( numMultiviewViews > 0 ) {
698700

699701
prefixVertex = prefixVertex.replace(
700702
'#version 300 es\n',
701703
[
702704
'#version 300 es\n',
703705
'#extension GL_OVR_multiview2 : require',
704-
'layout(num_views = ' + parameters.numMultiviewViews + ') in;',
706+
'layout(num_views = ' + numMultiviewViews + ') in;',
705707
'#define VIEW_ID gl_ViewID_OVR'
706708
].join( '\n' )
707709
);
@@ -714,10 +716,10 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
714716
'uniform mat3 normalMatrix;'
715717
].join( '\n' ),
716718
[
717-
'uniform mat4 modelViewMatrices[' + parameters.numMultiviewViews + '];',
718-
'uniform mat4 projectionMatrices[' + parameters.numMultiviewViews + '];',
719-
'uniform mat4 viewMatrices[' + parameters.numMultiviewViews + '];',
720-
'uniform mat3 normalMatrices[' + parameters.numMultiviewViews + '];',
719+
'uniform mat4 modelViewMatrices[' + numMultiviewViews + '];',
720+
'uniform mat4 projectionMatrices[' + numMultiviewViews + '];',
721+
'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
722+
'uniform mat3 normalMatrices[' + numMultiviewViews + '];',
721723

722724
'#define modelViewMatrix modelViewMatrices[VIEW_ID]',
723725
'#define projectionMatrix projectionMatrices[VIEW_ID]',
@@ -738,7 +740,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
738740
prefixFragment = prefixFragment.replace(
739741
'uniform mat4 viewMatrix;',
740742
[
741-
'uniform mat4 viewMatrices[' + parameters.numMultiviewViews + '];',
743+
'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
742744
'#define viewMatrix viewMatrices[VIEW_ID]'
743745
].join( '\n' )
744746
);
@@ -887,7 +889,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
887889
this.program = program;
888890
this.vertexShader = glVertexShader;
889891
this.fragmentShader = glFragmentShader;
890-
this.numMultiviewViews = parameters.numMultiviewViews;
892+
this.numMultiviewViews = numMultiviewViews;
891893

892894
return this;
893895

0 commit comments

Comments
 (0)