Skip to content

Fixed uniform shader reset #7207

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

Open
Forchapeatl wants to merge 5 commits into
base: main
Choose a base branch
from
+10 −2
Open

Fixed uniform shader reset #7207

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40e9973
Fixed Uniform Shader reset
Forchapeatl Sep 3, 2024
eb4b230
Update p5.Shader.js
Forchapeatl Sep 3, 2024
d610856
fixed lint errors
Forchapeatl Sep 3, 2024
bd939ff
fixed def errors
Forchapeatl Sep 3, 2024
e81764e
Initialized gl and cleared set after using
Forchapeatl Sep 3, 2024
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
Next Next commit
Fixed Uniform Shader reset
  • Loading branch information
@Forchapeatl
Forchapeatl authored Sep 3, 2024
commit 40e9973ff72d2aae2af5708b8bceca832feb0bdd
10 changes: 8 additions & 2 deletions src/webgl/p5.Shader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ p5.Shader = class {
this.uniforms = {};
this._bound = false;
this.samplers = [];
this.previousBindings = new Set();// Set to store previous bindings
}

/**
Expand Down Expand Up @@ -554,7 +555,10 @@ p5.Shader = class {
// so we supply a default texture instead.
tex = this._renderer._getEmptyTexture();
}
gl.activeTexture(gl.TEXTURE0 + uniform.samplerIndex);
const textureUnit = gl.TEXTURE0 + uniform.samplerIndex;
gl.activeTexture(textureUnit);
const previousTexture = gl.getParameter(gl.TEXTURE_BINDING_2D);
this.previousBindings.add(textureUnit);
tex.bindTexture();
tex.update();
gl.uniform1i(uniform.location, uniform.samplerIndex);
Expand All @@ -572,7 +576,9 @@ p5.Shader = class {

unbindTextures() {
for (const uniform of this.samplers) {
this.setUniform(uniform.name, this._renderer._getEmptyTexture());
if (this.previousBindings.has(textureUnit) === false){
this.setUniform(uniform.name, this._renderer._getEmptyTexture());
}
}
}

Expand Down