[Gzz-commits] gzz/gfx/libpaper papermill.py

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/11/11 15:27:50

Modified files:
        gfx/libpaper   : papermill.py 

Log message:
        Added option for texcomb to use OpenGL 1.1 version.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.59&tr2=1.60&r1=text&r2=text

Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -u gzz/gfx/libpaper/papermill.py:1.59 gzz/gfx/libpaper/papermill.py:1.60
--- gzz/gfx/libpaper/papermill.py:1.59  Sat Nov  2 05:25:04 2002
+++ gzz/gfx/libpaper/papermill.py       Mon Nov 11 15:27:50 2002
@@ -8,6 +8,10 @@
 import java
 from java.lang import Math
 
+from gzz.gfx.gl import PaperOptions
+tmp = PaperOptions();
+use_opengl_1_1 = tmp.use_opengl_1_1
+
 dbg=1
 # Discriminate between different renderers.
 # These are for debug output only.
@@ -23,7 +27,7 @@
 #
 
 # Check which texture operations to use.
-if GL.hasExtension("GL_NV_texture_shader"):
+if not use_opengl_1_1 and GL.hasExtension("GL_NV_texture_shader"):
     # We can use the general texture shaders.
     # XXX Should check separately for texture_shader2,
     # otherwise it'll be SLOW.
@@ -36,7 +40,7 @@
     numpasses = 3
 
 # Check which combiners to use.
-if GL.hasExtension("GL_NV_register_combiners"):
+if not use_opengl_1_1 and GL.hasExtension("GL_NV_register_combiners"):
     # We have at least a NV10, possibly better.
     # Check the number of general combiners to be sure.
     maxcomb = GL.getGLFloat("MAX_GENERAL_COMBINERS_NV")[0]