Skip to content
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

Jump to bottom

Firefly-1247: fix GPU.js to create window.GPUX to no longer class with chrome GPU #1384

Merged
merged 1 commit into from
May 15, 2023
Merged

Firefly-1247: fix GPU.js to create window.GPUX to no longer class with chrome GPU #1384

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
14 changes: 14 additions & 0 deletions src/firefly/html/gpu-browser.min-2.15.0-FIX-GPUX.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/firefly/js/visualize/rawData/GpuJsConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

import {loadScript, getRootURL, getGlobalObj} from '../../util/WebUtil.js';

const GPU_JS_SCRIPT= 'gpu-browser.min-2.15.0.js';
// const GPU_JS_SCRIPT= 'gpu-browser.min-2.15.0.js';
const GPU_JS_SCRIPT= 'gpu-browser.min-2.15.0-FIX-GPUX.js';
const LOAD_ERR_MSG= 'Load Failed: could not load gpu.js';

let foundGPU;
Expand All @@ -25,7 +26,7 @@ function initGpuJsRetriever(loadNow) {
if (!gpuJsLoadBegin) {
gpuJsLoadBegin= true;
loadScript(script).then( () => {
loadedGpuJs= getGlobalObj().GPU;
loadedGpuJs= getGlobalObj().GPUX;
if (loadedGpuJs) {
foundGPU= loadedGpuJs;
waitingResolvers.forEach((r) => r(loadedGpuJs));
Expand Down