Skip to content

Commit ae5f165

Browse files
fernandojsgphemavax
authored andcommitted
Update multiview implementation to use OVR_multiview2
1 parent 7977fa9 commit ae5f165

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

aquarium/aquarium.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ function createProgramFromTags(
568568

569569
var vsPrefix = ["#version 300 es"];
570570
if (opt_multiview) {
571-
vsPrefix.push("#extension GL_OVR_multiview : require");
571+
vsPrefix.push("#extension GL_OVR_multiview2 : require");
572572
vsPrefix.push("layout(num_views = 2) in;");
573573

574574
var addToMain = '';
@@ -588,7 +588,7 @@ function createProgramFromTags(
588588

589589
var fsPrefix = ["#version 300 es"];
590590
if (opt_multiview) {
591-
fsPrefix.push("#extension GL_OVR_multiview : require");
591+
fsPrefix.push("#extension GL_OVR_multiview2 : require");
592592
}
593593
fsPrefix.push("out mediump vec4 my_FragColor;");
594594
fs = fsPrefix.join('\n') + fs;
@@ -1004,7 +1004,7 @@ function main() {
10041004
g_fpsTimer = new tdl.fps.FPSTimer();
10051005
if (isMultiviewSupportEnabled()) {
10061006
gl = tdl.webgl.setupWebGL(canvas, {antialias: false}, undefined, 'webgl2');
1007-
multiview = gl.getExtension('WEBGL_multiview');
1007+
multiview = gl.getExtension('OVR_multiview2');
10081008
} else {
10091009
gl = tdl.webgl.setupWebGL(canvas);
10101010
}
@@ -2154,14 +2154,14 @@ function setupMultiviewFbIfNeeded() {
21542154
gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
21552155
gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
21562156
gl.texImage3D(gl.TEXTURE_2D_ARRAY, 0, gl.RGBA8, halfWidth, canvas.height, 2, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
2157-
multiview.framebufferTextureMultiviewWEBGL(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, g_multiviewTex, 0, 0, 2);
2157+
multiview.framebufferTextureMultiviewOVR(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, g_multiviewTex, 0, 0, 2);
21582158

21592159
g_multiviewDepth = gl.createTexture();
21602160
gl.bindTexture(gl.TEXTURE_2D_ARRAY, g_multiviewDepth);
21612161
gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
21622162
gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
21632163
gl.texImage3D(gl.TEXTURE_2D_ARRAY, 0, gl.DEPTH24_STENCIL8, halfWidth, canvas.height, 2, 0, gl.DEPTH_STENCIL, gl.UNSIGNED_INT_24_8, null);
2164-
multiview.framebufferTextureMultiviewWEBGL(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT, g_multiviewDepth, 0, 0, 2);
2164+
multiview.framebufferTextureMultiviewOVR(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT, g_multiviewDepth, 0, 0, 2);
21652165

21662166
g_multiviewViewFb = [null, null];
21672167
for (var viewIndex = 0; viewIndex < 2; ++viewIndex) {

tdl/particles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ tdl.particles.ParticleSystem = function(gl,
294294
var makeShaderSourceMultiview = function(shaderType, shaderString) {
295295
// Replace shader code to get ESSL3 shader code and enable multiview (huge hack, do not do this at home kids)
296296
var prefix = ["#version 300 es"];
297-
prefix.push("#extension GL_OVR_multiview : require");
297+
prefix.push("#extension GL_OVR_multiview2 : require");
298298
if (shaderType == 'vs') {
299299
prefix.push("layout(num_views = 2) in;");
300300
} else {
@@ -327,7 +327,7 @@ tdl.particles.ParticleSystem = function(gl,
327327
};
328328

329329
var multiviewShaders = [];
330-
if (gl.getExtension('WEBGL_multiview')) {
330+
if (gl.getExtension('OVR_multiview2')) {
331331
multiviewShaders.push(new tdl.shader.Shader(gl,
332332
makeShaderSourceMultiview('vs', tdl.particles.SHADER_STRINGS[0]),
333333
makeShaderSourceMultiview('fs', tdl.particles.SHADER_STRINGS[2])));

0 commit comments

Comments
 (0)