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

fixed texture unbind error

Browse Source
This commit is contained in:
codeanticode
2012-07-20 18:00:32 +00:00
parent 92cdd9221f
commit 083ab11af9
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/Texture.java
+3 -7
View File
@@ -294,7 +294,7 @@ public class Texture implements PConstants {
// Automatic mipmap generation.
int[] rgbaPixels = new int[w * h];
convertToRGBA(pixels, rgbaPixels, format, w, h);
setNative(rgbaPixels, x, y, w, h);
pgl.glTexSubImage2D(glTarget, 0, x, y, w, h, PGL.GL_RGBA, PGL.GL_UNSIGNED_BYTE, IntBuffer.wrap(rgbaPixels));
pgl.glGenerateMipmap(glTarget);
rgbaPixels = null;
} else {
@@ -354,13 +354,13 @@ public class Texture implements PConstants {
int[] rgbaPixels = new int[w * h];
convertToRGBA(pixels, rgbaPixels, format, w, h);
setNative(rgbaPixels, x, y, w, h);
pgl.glTexSubImage2D(glTarget, 0, x, y, w, h, PGL.GL_RGBA, PGL.GL_UNSIGNED_BYTE, IntBuffer.wrap(rgbaPixels));
rgbaPixels = null;
}
} else {
int[] rgbaPixels = new int[w * h];
convertToRGBA(pixels, rgbaPixels, format, w, h);
setNative(rgbaPixels, x, y, w, h);
pgl.glTexSubImage2D(glTarget, 0, x, y, w, h, PGL.GL_RGBA, PGL.GL_UNSIGNED_BYTE, IntBuffer.wrap(rgbaPixels));
rgbaPixels = null;
}
@@ -704,9 +704,7 @@ public class Texture implements PConstants {
if ((data.w != width) || (data.h != height)) {
init(data.w, data.h);
}
bind();
setNative(data.rgbBuf, 0, 0, width, height);
unbind();
data.dispose();
@@ -729,9 +727,7 @@ public class Texture implements PConstants {
if ((data.w != width) || (data.h != height)) {
init(data.w, data.h);
}
bind();
setNative(data.rgbBuf, 0, 0, width, height);
unbind();
data.rgbBuf.get(pixels);
convertToARGB(pixels);