use the GL_BGR (OpenGL1.2) format if possible;

then RGB to BGR flip loop isn't used. (faster)

3 files changed, 62 insertions, 44 deletions

diff --git a/src/jake2/render/fastjogl/Misc.java b/src/jake2/render/fastjogl/Misc.java
index 5b0e146..5fd7418 100644
--- a/src/jake2/render/fastjogl/Misc.java
+++ b/src/jake2/render/fastjogl/Misc.java
@@ -2,7 +2,7 @@
  * Misc.java
  * Copyright (C) 2003
  *
- * $Id: Misc.java,v 1.4 2005-04-25 09:23:14 cawe Exp $
+ * $Id: Misc.java,v 1.5 2005-05-06 17:47:10 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -25,18 +25,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package jake2.render.fastjogl;
 
+import jake2.Defines;
+import jake2.client.VID;
+import jake2.qcommon.FS;
+import jake2.qcommon.xcommand_t;
+
 import java.io.File;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.lwjgl.opengl.GL11;
-
-import jake2.Defines;
-import jake2.client.VID;
-import jake2.qcommon.FS;
-import jake2.qcommon.xcommand_t;
 import net.java.games.jogl.GL;
 import net.java.games.jogl.WGL;
 
@@ -162,16 +161,23 @@ public abstract class Misc extends Mesh {
 	        image.position(TGA_HEADER_SIZE);
 	        // jogl needs a sliced buffer
 	        ByteBuffer rgb = image.slice();
-	        // read the RGB values into the image buffer
-	        gl.glReadPixels(0, 0, vid.width, vid.height, GL11.GL_RGB,
-	                GL11.GL_UNSIGNED_BYTE, rgb);
 	        
-	        // flip RGB to BGR
-	        byte tmp;
-	        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
-	            tmp = image.get(i);
-	            image.put(i, image.get(i + 2));
-	            image.put(i + 2, tmp);
+	        // OpenGL 1.2+ supports the GL_BGR color format
+	        // check the GL_VERSION to use the TARGA BGR order if possible
+	        // e.g.: 1.5.2 NVIDIA 66.29
+	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL.GL_BGR : GL.GL_RGB;
+	        // read the BGR/RGB values into the image buffer
+	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
+	                GL.GL_UNSIGNED_BYTE, rgb);
+	        
+	        if (colorFormat == GL.GL_RGB) {
+		        // flip RGB to BGR
+		        byte tmp;
+		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
+		            tmp = image.get(i);
+		            image.put(i, image.get(i + 2));
+		            image.put(i + 2, tmp);
+		        }
 	        }
 	        // close the file channel
 	        ch.close();
diff --git a/src/jake2/render/jogl/Misc.java b/src/jake2/render/jogl/Misc.java
index e161d9d..da3bb0d 100644
--- a/src/jake2/render/jogl/Misc.java
+++ b/src/jake2/render/jogl/Misc.java
@@ -2,7 +2,7 @@
  * Misc.java
  * Copyright (C) 2003
  *
- * $Id: Misc.java,v 1.4 2005-04-25 09:23:13 cawe Exp $
+ * $Id: Misc.java,v 1.5 2005-05-06 17:47:09 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -25,18 +25,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package jake2.render.jogl;
 
+import jake2.Defines;
+import jake2.client.VID;
+import jake2.qcommon.FS;
+import jake2.qcommon.xcommand_t;
+
 import java.io.File;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.lwjgl.opengl.GL11;
-
-import jake2.Defines;
-import jake2.client.VID;
-import jake2.qcommon.FS;
-import jake2.qcommon.xcommand_t;
 import net.java.games.jogl.GL;
 import net.java.games.jogl.WGL;
 
@@ -174,16 +173,23 @@ public abstract class Misc extends Mesh {
 	        image.position(TGA_HEADER_SIZE);
 	        // jogl needs a sliced buffer
 	        ByteBuffer rgb = image.slice();
-	        // read the RGB values into the image buffer
-	        gl.glReadPixels(0, 0, vid.width, vid.height, GL11.GL_RGB,
-	                GL11.GL_UNSIGNED_BYTE, rgb);
+
+	        // OpenGL 1.2+ supports the GL_BGR color format
+	        // check the GL_VERSION to use the TARGA BGR order if possible
+	        // e.g.: 1.5.2 NVIDIA 66.29
+	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL.GL_BGR : GL.GL_RGB;
+	        // read the BGR/RGB values into the image buffer
+	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
+	                GL.GL_UNSIGNED_BYTE, rgb);
 	        
-	        // flip RGB to BGR
-	        byte tmp;
-	        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
-	            tmp = image.get(i);
-	            image.put(i, image.get(i + 2));
-	            image.put(i + 2, tmp);
+	        if (colorFormat == GL.GL_RGB) {
+		        // flip RGB to BGR
+		        byte tmp;
+		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
+		            tmp = image.get(i);
+		            image.put(i, image.get(i + 2));
+		            image.put(i + 2, tmp);
+		        }
 	        }
 	        // close the file channel
 	        ch.close();
diff --git a/src/jake2/render/lwjgl/Misc.java b/src/jake2/render/lwjgl/Misc.java
index 704fd56..018f0f4 100644
--- a/src/jake2/render/lwjgl/Misc.java
+++ b/src/jake2/render/lwjgl/Misc.java
@@ -2,7 +2,7 @@
  * Misc.java
  * Copyright (C) 2003
  *
- * $Id: Misc.java,v 1.4 2005-04-25 09:24:09 cawe Exp $
+ * $Id: Misc.java,v 1.5 2005-05-06 17:47:10 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -35,10 +35,10 @@ import java.nio.FloatBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
+import net.java.games.jogl.GL;
+
 import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.EXTPointParameters;
-import org.lwjgl.opengl.EXTSharedTexturePalette;
-import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.*;
 
 /**
  * Misc
@@ -158,16 +158,22 @@ public abstract class Misc extends Mesh {
 	        // go to image data position
 	        image.position(TGA_HEADER_SIZE);
 	        
-	        // read the RGB values into the image buffer
-	        gl.glReadPixels(0, 0, vid.width, vid.height, GL11.GL_RGB,
+	        // OpenGL 1.2+ supports the GL_BGR color format
+	        // check the GL_VERSION to use the TARGA BGR order if possible
+	        // e.g.: 1.5.2 NVIDIA 66.29
+	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL12.GL_BGR : GL11.GL_RGB;
+	        // read the BGR/RGB values into the image buffer
+	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
 	                GL11.GL_UNSIGNED_BYTE, image);
 	        
-	        // flip RGB to BGR
-	        byte tmp;
-	        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
-	            tmp = image.get(i);
-	            image.put(i, image.get(i + 2));
-	            image.put(i + 2, tmp);
+	        if (colorFormat == GL11.GL_RGB) {
+		        // flip RGB to BGR
+		        byte tmp;
+		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
+		            tmp = image.get(i);
+		            image.put(i, image.get(i + 2));
+		            image.put(i + 2, tmp);
+		        }
 	        }
 	        // close the file channel
 	        ch.close();