set buffer limits when copying vector and matrix uniforms

codeanticode · codeanticode · commit d5f48d9106b2 · 2013-01-22T00:34:58.000Z
diff --git a/java/libraries/lwjgl/src/processing/lwjgl/PGL.java b/java/libraries/lwjgl/src/processing/lwjgl/PGL.java
@@ -1409,60 +1409,82 @@ public void uniform4f(int loc, float value0, float value1, float value2,
 
 
   public void uniform1iv(int loc, int count, IntBuffer v) {
+    v.limit(count);
     GL20.glUniform1(loc, v);
+    v.clear();
   }
 
 
   public void uniform2iv(int loc, int count, IntBuffer v) {
+    v.limit(2 * count);
     GL20.glUniform2(loc, v);
+    v.clear();
   }
 
 
   public void uniform3iv(int loc, int count, IntBuffer v) {
+    v.limit(3 * count);
     GL20.glUniform3(loc, v);
+    v.clear();
   }
 
 
   public void uniform4iv(int loc, int count, IntBuffer v) {
+    v.limit(4 * count);
     GL20.glUniform4(loc, v);
+    v.clear();
   }
 
 
   public void uniform1fv(int loc, int count, FloatBuffer v) {
+    v.limit(count);
     GL20.glUniform1(loc, v);
+    v.clear();
   }
 
 
   public void uniform2fv(int loc, int count, FloatBuffer v) {
+    v.limit(2 * count);
     GL20.glUniform2(loc, v);
+    v.clear();
   }
 
 
   public void uniform3fv(int loc, int count, FloatBuffer v) {
+    v.limit(3 * count);
     GL20.glUniform3(loc, v);
+    v.clear();
   }
 
 
   public void uniform4fv(int loc, int count, FloatBuffer v) {
+    v.limit(4 * count);
     GL20.glUniform4(loc, v);
+    v.clear();
   }
 
 
   public void uniformMatrix2fv(int loc, int count, boolean transpose,
                                FloatBuffer mat) {
+    mat.limit(4);
     GL20.glUniformMatrix2(loc, transpose, mat);
+    mat.clear();
   }
 
 
   public void uniformMatrix3fv(int loc, int count, boolean transpose,
                                FloatBuffer mat) {
+    mat.limit(9);
     GL20.glUniformMatrix3(loc, transpose, mat);
+    mat.clear();
   }
 
 
   public void uniformMatrix4fv(int loc, int count, boolean transpose,
                                FloatBuffer mat) {
+    mat.limit(16);
     GL20.glUniformMatrix4(loc, transpose, mat);
+    mat.clear();
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1409,60 +1409,82 @@ public void uniform4f(int loc, float value0, float value1, float value2,`
`1409`	`1409`
`1410`	`1410`
`1411`	`1411`	`public void uniform1iv(int loc, int count, IntBuffer v) {`
	`1412`	`+ v.limit(count);`
`1412`	`1413`	`GL20.glUniform1(loc, v);`
	`1414`	`+ v.clear();`
`1413`	`1415`	`}`
`1414`	`1416`
`1415`	`1417`
`1416`	`1418`	`public void uniform2iv(int loc, int count, IntBuffer v) {`
	`1419`	`+ v.limit(2 * count);`
`1417`	`1420`	`GL20.glUniform2(loc, v);`
	`1421`	`+ v.clear();`
`1418`	`1422`	`}`
`1419`	`1423`
`1420`	`1424`
`1421`	`1425`	`public void uniform3iv(int loc, int count, IntBuffer v) {`
	`1426`	`+ v.limit(3 * count);`
`1422`	`1427`	`GL20.glUniform3(loc, v);`
	`1428`	`+ v.clear();`
`1423`	`1429`	`}`
`1424`	`1430`
`1425`	`1431`
`1426`	`1432`	`public void uniform4iv(int loc, int count, IntBuffer v) {`
	`1433`	`+ v.limit(4 * count);`
`1427`	`1434`	`GL20.glUniform4(loc, v);`
	`1435`	`+ v.clear();`
`1428`	`1436`	`}`
`1429`	`1437`
`1430`	`1438`
`1431`	`1439`	`public void uniform1fv(int loc, int count, FloatBuffer v) {`
	`1440`	`+ v.limit(count);`
`1432`	`1441`	`GL20.glUniform1(loc, v);`
	`1442`	`+ v.clear();`
`1433`	`1443`	`}`
`1434`	`1444`
`1435`	`1445`
`1436`	`1446`	`public void uniform2fv(int loc, int count, FloatBuffer v) {`
	`1447`	`+ v.limit(2 * count);`
`1437`	`1448`	`GL20.glUniform2(loc, v);`
	`1449`	`+ v.clear();`
`1438`	`1450`	`}`
`1439`	`1451`
`1440`	`1452`
`1441`	`1453`	`public void uniform3fv(int loc, int count, FloatBuffer v) {`
	`1454`	`+ v.limit(3 * count);`
`1442`	`1455`	`GL20.glUniform3(loc, v);`
	`1456`	`+ v.clear();`
`1443`	`1457`	`}`
`1444`	`1458`
`1445`	`1459`
`1446`	`1460`	`public void uniform4fv(int loc, int count, FloatBuffer v) {`
	`1461`	`+ v.limit(4 * count);`
`1447`	`1462`	`GL20.glUniform4(loc, v);`
	`1463`	`+ v.clear();`
`1448`	`1464`	`}`
`1449`	`1465`
`1450`	`1466`
`1451`	`1467`	`public void uniformMatrix2fv(int loc, int count, boolean transpose,`
`1452`	`1468`	`FloatBuffer mat) {`
	`1469`	`+ mat.limit(4);`
`1453`	`1470`	`GL20.glUniformMatrix2(loc, transpose, mat);`
	`1471`	`+ mat.clear();`
`1454`	`1472`	`}`
`1455`	`1473`
`1456`	`1474`
`1457`	`1475`	`public void uniformMatrix3fv(int loc, int count, boolean transpose,`
`1458`	`1476`	`FloatBuffer mat) {`
	`1477`	`+ mat.limit(9);`
`1459`	`1478`	`GL20.glUniformMatrix3(loc, transpose, mat);`
	`1479`	`+ mat.clear();`
`1460`	`1480`	`}`
`1461`	`1481`
`1462`	`1482`
`1463`	`1483`	`public void uniformMatrix4fv(int loc, int count, boolean transpose,`
`1464`	`1484`	`FloatBuffer mat) {`
	`1485`	`+ mat.limit(16);`
`1465`	`1486`	`GL20.glUniformMatrix4(loc, transpose, mat);`
	`1487`	`+ mat.clear();`
`1466`	`1488`	`}`
`1467`	`1489`
`1468`	`1490`