summaryrefslogtreecommitdiffstats
path: root/src/classes/com/sun/opengl
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2006-06-02 22:22:14 +0000
committerKenneth Russel <[email protected]>2006-06-02 22:22:14 +0000
commit87f6d0d38c043388979ce4bad247dc256ae7efaf (patch)
tree98c8f10601c16da4f00a009ee93a18875eda0b15 /src/classes/com/sun/opengl
parentcd53637127bb87f7de4a0cd8961489410684c7aa (diff)
Fixed bug pointed out by Tom Gaskins from NASA in handling of creation
of compressed textures; can not allocate texture with glTexImage2D and fill it with glCompressedTexSubImage2D git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@797 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes/com/sun/opengl')
-rwxr-xr-xsrc/classes/com/sun/opengl/util/texture/Texture.java75
1 files changed, 51 insertions, 24 deletions
diff --git a/src/classes/com/sun/opengl/util/texture/Texture.java b/src/classes/com/sun/opengl/util/texture/Texture.java
index c04f47c32..454d73c61 100755
--- a/src/classes/com/sun/opengl/util/texture/Texture.java
+++ b/src/classes/com/sun/opengl/util/texture/Texture.java
@@ -351,6 +351,10 @@ public class Texture {
gl.glGetIntegerv(GL.GL_UNPACK_ALIGNMENT, align, 0); // save alignment
gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, data.getAlignment());
+ if (data.isDataCompressed()) {
+ throw new GLException("May not request mipmap generation for compressed textures");
+ }
+
try {
GLU glu = new GLU();
glu.gluBuild2DMipmaps(newTarget, data.getInternalFormat(),
@@ -360,24 +364,40 @@ public class Texture {
gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, align[0]); // restore align
}
} else {
+ checkCompressedTextureExtensions(data);
Buffer[] mipmapData = data.getMipmapData();
if (mipmapData != null) {
int width = texWidth;
int height = texHeight;
for (int i = 0; i < mipmapData.length; i++) {
- // Allocate texture image at this level
- gl.glTexImage2D(newTarget, i, data.getInternalFormat(),
- width, height, data.getBorder(),
- data.getPixelFormat(), data.getPixelType(), null);
- updateSubImageImpl(data, newTarget, i, 0, 0);
+ if (data.isDataCompressed()) {
+ // Need to use glCompressedTexImage2D directly to allocate and fill this image
+ gl.glCompressedTexImage2D(newTarget, i, data.getInternalFormat(),
+ width, height, data.getBorder(),
+ mipmapData[i].remaining(), mipmapData[i]);
+ } else {
+ // Allocate texture image at this level
+ gl.glTexImage2D(newTarget, i, data.getInternalFormat(),
+ width, height, data.getBorder(),
+ data.getPixelFormat(), data.getPixelType(), null);
+ updateSubImageImpl(data, newTarget, i, 0, 0);
+ }
+
width /= 2;
height /= 2;
}
} else {
- gl.glTexImage2D(newTarget, 0, data.getInternalFormat(),
- texWidth, texHeight, data.getBorder(),
- data.getPixelFormat(), data.getPixelType(), null);
- updateSubImageImpl(data, newTarget, 0, 0, 0);
+ if (data.isDataCompressed()) {
+ // Need to use glCompressedTexImage2D directly to allocate and fill this image
+ gl.glCompressedTexImage2D(newTarget, 0, data.getInternalFormat(),
+ texWidth, texHeight, data.getBorder(),
+ data.getBuffer().capacity(), data.getBuffer());
+ } else {
+ gl.glTexImage2D(newTarget, 0, data.getInternalFormat(),
+ texWidth, texHeight, data.getBorder(),
+ data.getPixelFormat(), data.getPixelType(), null);
+ updateSubImageImpl(data, newTarget, 0, 0, 0);
+ }
}
}
@@ -600,6 +620,28 @@ public class Texture {
buffer = data.getMipmapData()[mipmapLevel];
}
+ checkCompressedTextureExtensions(data);
+
+ if (data.isDataCompressed()) {
+ gl.glCompressedTexSubImage2D(newTarget, mipmapLevel,
+ x, y, width, height,
+ data.getInternalFormat(),
+ buffer.remaining(), buffer);
+ } else {
+ int[] align = new int[1];
+ gl.glGetIntegerv(GL.GL_UNPACK_ALIGNMENT, align, 0); // save alignment
+ gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, data.getAlignment());
+
+ gl.glTexSubImage2D(newTarget, mipmapLevel,
+ x, y, width, height,
+ data.getPixelFormat(), data.getPixelType(),
+ buffer);
+ gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, align[0]); // restore align
+ }
+ }
+
+ private void checkCompressedTextureExtensions(TextureData data) {
+ GL gl = GLU.getCurrentGL();
if (data.isDataCompressed()) {
switch (data.getInternalFormat()) {
case GL.GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
@@ -616,21 +658,6 @@ public class Texture {
// compression extensions here
break;
}
-
- gl.glCompressedTexSubImage2D(newTarget, mipmapLevel,
- x, y, width, height,
- data.getInternalFormat(),
- buffer.remaining(), buffer);
- } else {
- int[] align = new int[1];
- gl.glGetIntegerv(GL.GL_UNPACK_ALIGNMENT, align, 0); // save alignment
- gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, data.getAlignment());
-
- gl.glTexSubImage2D(newTarget, mipmapLevel,
- x, y, width, height,
- data.getPixelFormat(), data.getPixelType(),
- buffer);
- gl.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, align[0]); // restore align
}
}