Skip to content

adding support for int type in shaders #17

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

adding support for int type in shaders #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f33016
adding support for int type in shaders
yelper Jan 27, 2014
9892c9b
fixing bug that prevents multiple shaders to be used with vertex buff…
yelper Feb 6, 2014
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
17 changes: 16 additions & 1 deletion src/shader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ function Shader(vertexSource, fragmentSource) {
regexMap(/uniform\s+sampler(1D|2D|3D|Cube)\s+(\w+)\s*;/g, vertexSource + fragmentSource, function(groups) {
isSampler[groups[2]] = 1;
});

// also do this for items that are explicitly marked as `int` types
regexMap(/uniform\s+int\s+(\w+)\s*;/g, vertexSource + fragmentSource, function(groups) {
isSampler[groups[1]] = 1;
});

this.isSampler = isSampler;
}

Expand Down Expand Up @@ -258,7 +264,16 @@ Shader.prototype = {
} else {
gl.drawArrays(mode, 0, length);
}
}
}

// release any buffers;
// if the shader is switched, some attributes could still be linked to buffers, causing
// GL_INVALID_OPERATION : glDrawArrays: attempt to access out of range vertices in attribute [location]:
// see http://stackoverflow.com/questions/12427880/is-it-important-to-call-gldisablevertexattribarray
gl.bindBuffer(gl.ARRAY_BUFFER, null);
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
for (var attribute in vertexBuffers)
gl.disableVertexAttribArray(this.attributes[attribute]);

return this;
}
Expand Down