Fixed problems in TextureIO classes where they did not work with

OpenGL 1.1. Added logic to back off from using OpenGL 1.2 image types
by using same code paths as for custom BufferedImage types.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1238 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 6 insertions, 3 deletions

diff --git a/src/classes/com/sun/opengl/util/texture/Texture.java b/src/classes/com/sun/opengl/util/texture/Texture.java
index 4339de6bf..a9511dc49 100755
--- a/src/classes/com/sun/opengl/util/texture/Texture.java
+++ b/src/classes/com/sun/opengl/util/texture/Texture.java
@@ -394,6 +394,10 @@ public class Texture {
         (gl.isExtensionAvailable("GL_VERSION_1_4") ||
          gl.isExtensionAvailable("GL_SGIS_generate_mipmap"));
 
+    // Indicate to the TextureData what functionality is available
+    data.setHaveEXTABGR(gl.isExtensionAvailable("GL_EXT_abgr"));
+    data.setHaveGL12(gl.isExtensionAvailable("GL_VERSION_1_2"));
+
     // Note that automatic mipmap generation doesn't work for
     // GL_ARB_texture_rectangle
     if ((!isPowerOfTwo(imgWidth) || !isPowerOfTwo(imgHeight)) &&
@@ -813,9 +817,8 @@ public class Texture {
                                   int dstx, int dsty,
                                   int srcx, int srcy, int width, int height) throws GLException {
     GL gl = GLU.getCurrentGL();
-    if (gl.isExtensionAvailable("GL_EXT_abgr")) {
-      data.setHaveEXTABGR(true);
-    }
+    data.setHaveEXTABGR(gl.isExtensionAvailable("GL_EXT_abgr"));
+    data.setHaveGL12(gl.isExtensionAvailable("GL_VERSION_1_2"));
 
     Buffer buffer = data.getBuffer();
     if (buffer == null && data.getMipmapData() == null) {