Skip to content

Imply webgl2 within conformance2/ for getDefault3DContextVersion(). #3725

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
kenrussell merged 1 commit into from
Mar 24, 2025
Merged

Imply webgl2 within conformance2/ for getDefault3DContextVersion(). #3725

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
27 changes: 22 additions & 5 deletions sdk/tests/js/webgl-test-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,7 @@ var getUrlOptions = (function() {
}
})();

var default3DContextVersion = 1;
var default3DContextVersion = null;

/**
* Set the default context version for create3DContext.
Expand All @@ -1598,7 +1598,26 @@ var setDefault3DContextVersion = function(version) {
* then look at the global default3DContextVersion variable.
*/
var getDefault3DContextVersion = function() {
return parseInt(getUrlOptions().webglVersion, 10) || default3DContextVersion;
const urlVersion = parseInt(getUrlOptions().webglVersion, 10);
if (urlVersion) return urlVersion;

if (!default3DContextVersion) {
const pathname = location.pathname;
const path_parts = pathname.split('/');
let in_conformance2_path = false;
while (path_parts.length) {
const part = path_parts.pop();
if (part.startsWith('conformance')) {
in_conformance2_path = (part == 'conformance2');
break;
}
}
// Found this first, so this must be a webgl2 test!

default3DContextVersion = in_conformance2_path ? 2 : 1;
console.warn(`getDefault3DContextVersion(): Implying webgl${default3DContextVersion} based on path.`);
}
return default3DContextVersion;
};

/**
Expand Down Expand Up @@ -1643,9 +1662,7 @@ var create3DContext = function(opt_canvas, opt_attributes, opt_version) {
}
}

if (!opt_version) {
opt_version = getDefault3DContextVersion();
}
opt_version = opt_version || getDefault3DContextVersion();
opt_canvas = opt_canvas || document.createElement("canvas");
if (typeof opt_canvas == 'string') {
opt_canvas = document.getElementById(opt_canvas);
Expand Down