Skip to content

Commit c82097d

Browse files
authored
Merge pull request microsoft#236276 from microsoft/tyriar/236148
Remove workaround for swiftshader upstream issue
2 parents a09be5d + 24b8e3c commit c82097d

File tree

1 file changed

+2
-25
lines changed

1 file changed

+2
-25
lines changed

src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
9494
private readonly _capabilities: ITerminalCapabilityStore;
9595

9696
private static _suggestedRendererType: 'dom' | undefined = undefined;
97-
private static _checkedWebglCompatible = false;
9897
private _attached?: { container: HTMLElement; options: IXtermAttachToElementOptions };
9998
private _isPhysicalMouseWheel = MouseWheelClassifier.INSTANCE.isPhysicalMouseWheel();
10099

@@ -667,24 +666,6 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
667666
return;
668667
}
669668

670-
// Check if the the WebGL renderer is compatible with xterm.js:
671-
// - https://github.com/microsoft/vscode/issues/190195
672-
// - https://github.com/xtermjs/xterm.js/issues/4665
673-
// - https://bugs.chromium.org/p/chromium/issues/detail?id=1476475
674-
if (!XtermTerminal._checkedWebglCompatible) {
675-
XtermTerminal._checkedWebglCompatible = true;
676-
const checkCanvas = document.createElement('canvas');
677-
const checkGl = checkCanvas.getContext('webgl2');
678-
const debugInfo = checkGl?.getExtension('WEBGL_debug_renderer_info');
679-
if (checkGl && debugInfo) {
680-
const renderer = checkGl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL);
681-
if (renderer.startsWith('ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (Subzero)')) {
682-
this._disableWebglForThisSession();
683-
return;
684-
}
685-
}
686-
}
687-
688669
const Addon = await this._xtermAddonLoader.importAddon('webgl');
689670
this._webglAddon = new Addon();
690671
try {
@@ -706,15 +687,11 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
706687
// }, 5000);
707688
} catch (e) {
708689
this._logService.warn(`Webgl could not be loaded. Falling back to the DOM renderer`, e);
709-
this._disableWebglForThisSession();
690+
XtermTerminal._suggestedRendererType = 'dom';
691+
this._disposeOfWebglRenderer();
710692
}
711693
}
712694

713-
private _disableWebglForThisSession() {
714-
XtermTerminal._suggestedRendererType = 'dom';
715-
this._disposeOfWebglRenderer();
716-
}
717-
718695
@debounce(100)
719696
private async _refreshLigaturesAddon(): Promise<void> {
720697
if (!this.raw.element) {

0 commit comments

Comments
 (0)