Skip to content

WebGLPrograms: Add numMultiviewViews to parameters #17659

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
Oct 4, 2019
Merged

WebGLPrograms: Add numMultiviewViews to parameters #17659

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
19 changes: 8 additions & 11 deletions src/renderers/webgl/WebGLProgram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,6 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters

var prefixVertex, prefixFragment;

var renderTarget = renderer.getRenderTarget();
var numMultiviewViews = renderTarget && renderTarget.isWebGLMultiviewRenderTarget ? renderTarget.numViews : 0;

if ( material.isRawShaderMaterial ) {

prefixVertex = [
Expand Down Expand Up @@ -697,14 +694,14 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters

// Multiview

if ( numMultiviewViews > 0 ) {
if ( parameters.numMultiviewViews > 0 ) {

prefixVertex = prefixVertex.replace(
'#version 300 es\n',
[
'#version 300 es\n',
'#extension GL_OVR_multiview2 : require',
'layout(num_views = ' + numMultiviewViews + ') in;',
'layout(num_views = ' + parameters.numMultiviewViews + ') in;',
'#define VIEW_ID gl_ViewID_OVR'
].join( '\n' )
);
Expand All @@ -717,10 +714,10 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
'uniform mat3 normalMatrix;'
].join( '\n' ),
[
'uniform mat4 modelViewMatrices[' + numMultiviewViews + '];',
'uniform mat4 projectionMatrices[' + numMultiviewViews + '];',
'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
'uniform mat3 normalMatrices[' + numMultiviewViews + '];',
'uniform mat4 modelViewMatrices[' + parameters.numMultiviewViews + '];',
'uniform mat4 projectionMatrices[' + parameters.numMultiviewViews + '];',
'uniform mat4 viewMatrices[' + parameters.numMultiviewViews + '];',
'uniform mat3 normalMatrices[' + parameters.numMultiviewViews + '];',

'#define modelViewMatrix modelViewMatrices[VIEW_ID]',
'#define projectionMatrix projectionMatrices[VIEW_ID]',
Expand All @@ -741,7 +738,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
prefixFragment = prefixFragment.replace(
'uniform mat4 viewMatrix;',
[
'uniform mat4 viewMatrices[' + numMultiviewViews + '];',
'uniform mat4 viewMatrices[' + parameters.numMultiviewViews + '];',
'#define viewMatrix viewMatrices[VIEW_ID]'
].join( '\n' )
);
Expand Down Expand Up @@ -890,7 +887,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
this.program = program;
this.vertexShader = glVertexShader;
this.fragmentShader = glFragmentShader;
this.numMultiviewViews = numMultiviewViews;
this.numMultiviewViews = parameters.numMultiviewViews;

return this;

Expand Down
4 changes: 3 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 @@ -35,7 +35,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
};

var parameterNames = [
"precision", "supportsVertexTextures", "instancing",
"precision", "supportsVertexTextures", "instancing", "numMultiviewViews",
"map", "mapEncoding", "matcap", "matcapEncoding", "envMap", "envMapMode", "envMapEncoding",
"lightMap", "aoMap", "emissiveMap", "emissiveMapEncoding", "bumpMap", "normalMap", "objectSpaceNormalMap", "tangentSpaceNormalMap", "clearcoatNormalMap", "displacementMap", "specularMap",
"roughnessMap", "metalnessMap", "gradientMap",
Expand Down Expand Up @@ -138,6 +138,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
}

var currentRenderTarget = renderer.getRenderTarget();
var numMultiviewViews = currentRenderTarget && currentRenderTarget.isWebGLMultiviewRenderTarget ? currentRenderTarget.numViews : 0;

var parameters = {

Expand All @@ -150,6 +151,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
instancing: object.isInstancedMesh === true,

supportsVertexTextures: vertexTextures,
numMultiviewViews: numMultiviewViews,
outputEncoding: getTextureEncodingFromMap( ( ! currentRenderTarget ) ? null : currentRenderTarget.texture, renderer.gammaOutput ),
map: !! material.map,
mapEncoding: getTextureEncodingFromMap( material.map, renderer.gammaInput ),
Expand Down