eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #5927 from xtermjs/cursor/webgl-vao-dispose-ef2f

Browse Source 
fix(addon-webgl): delete VAOs on renderer dispose
This commit is contained in:
Daniel Imms
2026-05-27 09:34:46 -07:00
committed by GitHub
parent ebe8cb749a f757c965ee
commit 280dc0a36a
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/addon-webgl/src/GlyphRenderer.ts
+3 -2
View File
@@ -137,8 +137,9 @@ export class GlyphRenderer extends Disposable {
this._textureLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_texture')); this._textureLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_texture'));
// Create and set the vertex array object // Create and set the vertex array object
this._vertexArrayObject = gl.createVertexArray(); const vertexArrayObject = this._vertexArrayObject = gl.createVertexArray();
gl.bindVertexArray(this._vertexArrayObject); this._register(toDisposable(() => gl.deleteVertexArray(vertexArrayObject)));
gl.bindVertexArray(vertexArrayObject);
// Setup a_unitquad, this defines the 4 vertices of a rectangle // Setup a_unitquad, this defines the 4 vertices of a rectangle
const unitQuadVertices = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]); const unitQuadVertices = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]);
addons/addon-webgl/src/RectangleRenderer.ts
+3 -2
View File
@@ -104,8 +104,9 @@ export class RectangleRenderer extends Disposable {
this._projectionLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_projection')); this._projectionLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_projection'));
// Create and set the vertex array object // Create and set the vertex array object
this._vertexArrayObject = gl.createVertexArray(); const vertexArrayObject = this._vertexArrayObject = gl.createVertexArray();
gl.bindVertexArray(this._vertexArrayObject); this._register(toDisposable(() => gl.deleteVertexArray(vertexArrayObject)));
gl.bindVertexArray(vertexArrayObject);
// Setup a_unitquad, this defines the 4 vertices of a rectangle // Setup a_unitquad, this defines the 4 vertices of a rectangle
const unitQuadVertices = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]); const unitQuadVertices = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]);
addons/addon-webgl/src/Types.ts
+1
View File
@@ -28,6 +28,7 @@ export interface ICursorRenderModel {
export interface IWebGL2RenderingContext extends WebGLRenderingContext { export interface IWebGL2RenderingContext extends WebGLRenderingContext {
vertexAttribDivisor(index: number, divisor: number): void; vertexAttribDivisor(index: number, divisor: number): void;
createVertexArray(): IWebGLVertexArrayObject; createVertexArray(): IWebGLVertexArrayObject;
deleteVertexArray(vao: IWebGLVertexArrayObject): void;
bindVertexArray(vao: IWebGLVertexArrayObject): void; bindVertexArray(vao: IWebGLVertexArrayObject): void;
drawElementsInstanced(mode: number, count: number, type: number, offset: number, instanceCount: number): void; drawElementsInstanced(mode: number, count: number, type: number, offset: number, instanceCount: number): void;
} }