Update of /cvsroot/jake2/jake2/src/jake2/render/fast
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32504/src/jake2/render/fast
Modified Files:
Main.java
Log Message:
add a better multitexturing check
Index: Main.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Main.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Main.java 22 Nov 2006 15:05:39 -0000 1.4
--- Main.java 12 Dec 2006 14:46:04 -0000 1.5
***************
*** 1250,1259 ****
if (gl_config.extensions_string.indexOf("GL_ARB_multitexture") >= 0) {
! VID.Printf(Defines.PRINT_ALL, "...using GL_ARB_multitexture\n");
! qglActiveTextureARB = true;
! TEXTURE0 = GL_TEXTURE0_ARB;
! TEXTURE1 = GL_TEXTURE1_ARB;
}
else {
VID.Printf(Defines.PRINT_ALL, "...GL_ARB_multitexture not found\n");
}
--- 1250,1267 ----
if (gl_config.extensions_string.indexOf("GL_ARB_multitexture") >= 0) {
! // check if the extension realy exists
! try {
! gl.glClientActiveTextureARB(GL_TEXTURE0_ARB);
! // seems to work correctly
! VID.Printf(Defines.PRINT_ALL, "...using GL_ARB_multitexture\n");
! qglActiveTextureARB = true;
! TEXTURE0 = GL_TEXTURE0_ARB;
! TEXTURE1 = GL_TEXTURE1_ARB;
! } catch (Exception e) {
! qglActiveTextureARB = false;
! }
}
else {
+ qglActiveTextureARB = false;
VID.Printf(Defines.PRINT_ALL, "...GL_ARB_multitexture not found\n");
}
|
