Skip to content

Caching Uniform Locations upon ShaderProgram creation #594

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
merged 4 commits into from
Jun 26, 2025
Merged

Caching Uniform Locations upon ShaderProgram creation #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24bd8ec
read / cache all uniform locations per program
jfboeve Jun 24, 2025
cdaa4a8
make isDestroyed public
jfboeve Jun 25, 2025
c430c78
Merge branch 'main' into feat/cached-program-uniforms
jfboeve Jun 25, 2025
1bd186e
fix array uniforms
jfboeve Jun 25, 2025
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
144 changes: 69 additions & 75 deletions src/core/lib/WebGlContextWrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export class WebGlContextWrapper {
private boundArrayBuffer: WebGLBuffer | null;
private boundElementArrayBuffer: WebGLBuffer | null;
private curProgram: WebGLProgram | null;
private curUniformLocations: Record<string, WebGLUniformLocation> = {};
//#endregion Cached WebGL State

//#region Canvas
Expand Down Expand Up @@ -689,16 +690,23 @@ export class WebGlContextWrapper {
* @param program
* @returns object with numbers
*/
getUniformLocations(program: WebGLProgram): Record<string, number> {
getUniformLocations(
program: WebGLProgram,
): Record<string, WebGLUniformLocation> {
const gl = this.gl;
const length = gl.getProgramParameter(
program,
gl.ACTIVE_UNIFORMS,
) as number;
const result = {} as Record<string, number>;
const result = {} as Record<string, WebGLUniformLocation>;
for (let i = 0; i < length; i++) {
const { name } = gl.getActiveUniform(program, i) as WebGLActiveInfo;
result[name] = i;
const info = gl.getActiveUniform(program, i) as WebGLActiveInfo;
//remove bracket + value from uniform name;
let name = info.name.replace(/\[.*?\]/g, '');
result[name] = gl.getUniformLocation(
program,
name,
) as WebGLUniformLocation;
}
return result;
}
Expand Down Expand Up @@ -730,12 +738,16 @@ export class WebGlContextWrapper {
* @param program
* @returns
*/
useProgram(program: WebGLProgram | null) {
useProgram(
program: WebGLProgram | null,
uniformLocations: Record<string, WebGLUniformLocation>,
) {
if (this.curProgram === program) {
return;
}
this.gl.useProgram(program);
this.curProgram = program;
this.curUniformLocations = uniformLocations;
}

/**
Expand All @@ -745,10 +757,7 @@ export class WebGlContextWrapper {
* @param v0 - The value to set.
*/
uniform1f(location: string, v0: number) {
this.gl.uniform1f(
this.gl.getUniformLocation(this.curProgram!, location),
v0,
);
this.gl.uniform1f(this.curUniformLocations[location] || null, v0);
}

/**
Expand All @@ -758,10 +767,7 @@ export class WebGlContextWrapper {
* @param value - The array of values to set.
*/
uniform1fv(location: string, value: Float32Array) {
this.gl.uniform1fv(
this.gl.getUniformLocation(this.curProgram!, location),
value,
);
this.gl.uniform1fv(this.curUniformLocations[location] || null, value);
}

/**
Expand All @@ -771,10 +777,7 @@ export class WebGlContextWrapper {
* @param v0 - The value to set.
*/
uniform1i(location: string, v0: number) {
this.gl.uniform1i(
this.gl.getUniformLocation(this.curProgram!, location),
v0,
);
this.gl.uniform1i(this.curUniformLocations[location] || null, v0);
}

/**
Expand All @@ -784,10 +787,7 @@ export class WebGlContextWrapper {
* @param value - The array of values to set.
*/
uniform1iv(location: string, value: Int32Array) {
this.gl.uniform1iv(
this.gl.getUniformLocation(this.curProgram!, location),
value,
);
this.gl.uniform1iv(this.curUniformLocations[location] || null, value);
}

/**
Expand All @@ -798,11 +798,7 @@ export class WebGlContextWrapper {
* @param v1 - The second component of the vector.
*/
uniform2f(location: string, v0: number, v1: number) {
this.gl.uniform2f(
this.gl.getUniformLocation(this.curProgram!, location),
v0,
v1,
);
this.gl.uniform2f(this.curUniformLocations[location] || null, v0, v1);
}

/**
Expand All @@ -813,7 +809,7 @@ export class WebGlContextWrapper {
*/
uniform2fa(location: string, value: Vec2) {
this.gl.uniform2f(
this.gl.getUniformLocation(this.curProgram!, location),
this.curUniformLocations[location] || null,
value[0],
value[1],
);
Expand All @@ -826,10 +822,7 @@ export class WebGlContextWrapper {
* @param value - The array of vec2 values to set.
*/
uniform2fv(location: string, value: Float32Array) {
this.gl.uniform2fv(
this.gl.getUniformLocation(this.curProgram!, location),
value,
);
this.gl.uniform2fv(this.curUniformLocations[location] || null, value);
}

/**
Expand All @@ -840,11 +833,7 @@ export class WebGlContextWrapper {
* @param v1 - The second component of the vector.
*/
uniform2i(location: string, v0: number, v1: number) {
this.gl.uniform2i(
this.gl.getUniformLocation(this.curProgram!, location),
v0,
v1,
);
this.gl.uniform2i(this.curUniformLocations[location] || null, v0, v1);
}

/**
Expand All @@ -854,10 +843,7 @@ export class WebGlContextWrapper {
* @param value - The array of ivec2 values to set.
*/
uniform2iv(location: string, value: Int32Array) {
this.gl.uniform2iv(
this.gl.getUniformLocation(this.curProgram!, location),
value,
);
this.gl.uniform2iv(this.curUniformLocations[location] || null, value);
}

/**
Expand All @@ -869,12 +855,7 @@ export class WebGlContextWrapper {
* @param v2 - The third component of the vector.
*/
uniform3f(location: string, v0: number, v1: number, v2: number) {
this.gl.uniform3f(
this.gl.getUniformLocation(this.curProgram!, location),
v0,
v1,
v2,
);
this.gl.uniform3f(this.curUniformLocations[location] || null, v0, v1, v2);
}

/**
Expand All @@ -885,7 +866,7 @@ export class WebGlContextWrapper {
*/
uniform3fa(location: string, value: Vec3) {
this.gl.uniform3f(
this.gl.getUniformLocation(this.curProgram!, location),
this.curUniformLocations[location] || null,
value[0],
value[1],
value[2],
Expand All @@ -899,10 +880,7 @@ export class WebGlContextWrapper {
* @param value - The array of vec3 values to set.
*/
uniform3fv(location: string, value: Float32Array) {
this.gl.uniform3fv(
this.gl.getUniformLocation(this.curProgram!, location),
value,
);
this.gl.uniform3fv(this.curUniformLocations[location] || null, value);
}

/**
Expand All @@ -914,12 +892,7 @@ export class WebGlContextWrapper {
* @param v2 - The third component of the vector.
*/
uniform3i(location: string, v0: number, v1: number, v2: number) {
this.gl.uniform3i(
this.gl.getUniformLocation(this.curProgram!, location),
v0,
v1,
v2,
);
this.gl.uniform3i(this.curUniformLocations[location] || null, v0, v1, v2);
}

/**
Expand All @@ -929,10 +902,7 @@ export class WebGlContextWrapper {
* @param value - The array of ivec3 values to set.
*/
uniform3iv(location: string, value: Int32Array) {
this.gl.uniform3iv(
this.gl.getUniformLocation(this.curProgram!, location),
value,
);
this.gl.uniform3iv(this.curUniformLocations[location] || null, value);
}

/**
Expand All @@ -946,7 +916,7 @@ export class WebGlContextWrapper {
*/
uniform4f(location: string, v0: number, v1: number, v2: number, v3: number) {
this.gl.uniform4f(
this.gl.getUniformLocation(this.curProgram!, location),
this.curUniformLocations[location] || null,
v0,
v1,
v2,
Expand All @@ -962,7 +932,7 @@ export class WebGlContextWrapper {
*/
uniform4fa(location: string, value: Vec4) {
this.gl.uniform4f(
this.gl.getUniformLocation(this.curProgram!, location),
this.curUniformLocations[location] || null,
value[0],
value[1],
value[2],
Expand All @@ -977,10 +947,7 @@ export class WebGlContextWrapper {
* @param value - The array of vec4 values to set.
*/
uniform4fv(location: string, value: Float32Array) {
this.gl.uniform4fv(
this.gl.getUniformLocation(this.curProgram!, location),
value,
);
this.gl.uniform4fv(this.curUniformLocations[location] || null, value);
}

/**
Expand All @@ -994,7 +961,7 @@ export class WebGlContextWrapper {
*/
uniform4i(location: string, v0: number, v1: number, v2: number, v3: number) {
this.gl.uniform4i(
this.gl.getUniformLocation(this.curProgram!, location),
this.curUniformLocations[location] || null,
v0,
v1,
v2,
Expand All @@ -1009,10 +976,7 @@ export class WebGlContextWrapper {
* @param value - The array of ivec4 values to set.
*/
uniform4iv(location: string, value: Int32Array) {
this.gl.uniform4iv(
this.gl.getUniformLocation(this.curProgram!, location),
value,
);
this.gl.uniform4iv(this.curUniformLocations[location] || null, value);
}

/**
Expand All @@ -1024,7 +988,7 @@ export class WebGlContextWrapper {
*/
uniformMatrix2fv(location: string, value: Float32Array) {
this.gl.uniformMatrix2fv(
this.gl.getUniformLocation(this.curProgram!, location),
this.curUniformLocations[location] || null,
false,
value,
);
Expand All @@ -1037,7 +1001,7 @@ export class WebGlContextWrapper {
*/
uniformMatrix3fv(location: string, value: Float32Array) {
this.gl.uniformMatrix3fv(
this.gl.getUniformLocation(this.curProgram!, location),
this.curUniformLocations[location] || null,
false,
value,
);
Expand All @@ -1050,7 +1014,7 @@ export class WebGlContextWrapper {
*/
uniformMatrix4fv(location: string, value: Float32Array) {
this.gl.uniformMatrix4fv(
this.gl.getUniformLocation(this.curProgram!, location),
this.curUniformLocations[location] || null,
false,
value,
);
Expand Down Expand Up @@ -1319,6 +1283,36 @@ export class WebGlContextWrapper {
deleteShader(shader: WebGLShader) {
this.gl.deleteShader(shader);
}

/**
* ```
* gl.deleteBuffer(buffer);
* ```
*
* @param buffer - The buffer to delete
*/
deleteBuffer(buffer: WebGLBuffer) {
const { gl } = this;
gl.deleteBuffer(buffer);

// Reset bound buffers if they match the deleted buffer
if (this.boundArrayBuffer === buffer) {
this.boundArrayBuffer = null;
}
}

/**
* ```
* gl.deleteVertexArray(vertexArray);
* ```
*
* @param vertexArray - The vertex array object to delete
*/
deleteVertexArray(vertexArray: WebGLVertexArrayObject) {
if (this.isWebGl2()) {
(this.gl as WebGL2RenderingContext).deleteVertexArray(vertexArray);
}
}
}

// prettier-ignore
Expand Down
Loading