eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

renamed buffer uniform to ppixels, fix #2325

Browse Source
This commit is contained in:
codeanticode
2014-03-31 09:40:53 -04:00
parent 3acd891ef1
commit 8a203e93f9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PShader.java
+5 -5
View File
@@ -116,7 +116,7 @@ public class PShader implements PConstants {
protected int transformMatLoc;
protected int modelviewMatLoc;
protected int projectionMatLoc;
protected int bufferLoc;
protected int ppixelsLoc;
protected int bufferUnit;
protected int viewportLoc;
@@ -1158,7 +1158,7 @@ public class PShader implements PConstants {
projectionMatLoc = getUniformLoc("projectionMatrix");
viewportLoc = getUniformLoc("viewport");
bufferLoc = getUniformLoc("buffer");
ppixelsLoc = getUniformLoc("ppixels");
normalMatLoc = getUniformLoc("normalMatrix");
@@ -1209,9 +1209,9 @@ public class PShader implements PConstants {
setUniformValue(viewportLoc, x, y, w, h);
}
if (-1 < bufferLoc) {
if (-1 < ppixelsLoc) {
bufferUnit = getLastTexUnit() + 1;
setUniformValue(bufferLoc, bufferUnit);
setUniformValue(ppixelsLoc, bufferUnit);
pgl.activeTexture(PGL.TEXTURE0 + bufferUnit);
currentPG.bindFrontTexture();
} else {
@@ -1304,7 +1304,7 @@ public class PShader implements PConstants {
if (-1 < texCoordLoc) pgl.disableVertexAttribArray(texCoordLoc);
if (-1 < normalLoc) pgl.disableVertexAttribArray(normalLoc);
if (-1 < bufferLoc) {
if (-1 < ppixelsLoc) {
pgl.requestFBOLayer();
pgl.activeTexture(PGL.TEXTURE0 + bufferUnit);
currentPG.unbindFrontTexture();