Bug 1135 - Cleanup: Class ownership change of static GL enumerates

GLBufferStateTracker now also supports GL4.GL_QUERY_BUFFER

2 files changed, 4 insertions, 5 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java
index 700de593f..99954ae86 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java
@@ -44,7 +44,6 @@ import java.nio.*;
 import java.nio.channels.FileChannel;
 
 import com.jogamp.opengl.*;
-
 import com.jogamp.common.util.IOUtil;
 import com.jogamp.opengl.util.texture.*;
 
@@ -112,7 +111,7 @@ public class NetPbmTextureWriter implements TextureWriter {
         final int pixelType   = data.getPixelType();
         if ((pixelFormat == GL.GL_RGB ||
              pixelFormat == GL.GL_RGBA ||
-             pixelFormat == GL2GL3.GL_BGR ||
+             pixelFormat == GL.GL_BGR ||
              pixelFormat == GL.GL_BGRA ) &&
             (pixelType == GL.GL_BYTE ||
              pixelType == GL.GL_UNSIGNED_BYTE)) {
@@ -125,7 +124,7 @@ public class NetPbmTextureWriter implements TextureWriter {
 
             final int comps = ( pixelFormat == GL.GL_RGBA || pixelFormat == GL.GL_BGRA ) ? 4 : 3 ;
 
-            if( pixelFormat == GL2GL3.GL_BGR || pixelFormat == GL.GL_BGRA ) {
+            if( pixelFormat == GL.GL_BGR || pixelFormat == GL.GL_BGRA ) {
                 // Must reverse order of red and blue channels to get correct results
                 for (int i = 0; i < buf.remaining(); i += comps) {
                     final byte red  = buf.get(i + 0);
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java
index bb872714c..831927a90 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java
@@ -42,8 +42,8 @@ package com.jogamp.opengl.util.texture.spi;
 import java.io.*;
 import java.nio.*;
 import java.nio.channels.*;
-import com.jogamp.opengl.*;
 
+import com.jogamp.opengl.*;
 import com.jogamp.common.util.IOUtil;
 
 /**
@@ -352,7 +352,7 @@ public class TGAImage {
         bpp = header.pixelDepth / 8;
         switch (header.pixelDepth) {
         case 24:
-            format = glp.isGL2GL3() ? GL2GL3.GL_BGR : GL.GL_RGB;
+            format = glp.isGL2GL3() ? GL.GL_BGR : GL.GL_RGB;
             break;
         case 32:
             boolean useBGRA = glp.isGL2GL3();