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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/25 09:45:14

Modified files:
        .              : TODO 
        gfx/libpaper   : papermill.py 
        gfx/libutil    : texture.py 

Log message:
        Explain the optimized paper bug, nakitettu jvk:lle

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.533&tr2=1.534&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/texture.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.533 gzz/TODO:1.534
--- gzz/TODO:1.533      Sat Jan 25 06:01:28 2003
+++ gzz/TODO    Sat Jan 25 09:45:13 2003
@@ -62,6 +62,14 @@
        - move lots of stuff to lava and basalt
 
 0.8alpha5: saving, loading etc. with mediaserver useful; tests
+    jvk:
+       - fix libpaper on R300:
+           the problem is that GENERATE_MIPMAP_SGIS does not work.
+           See the texture dump.
+           When I set max_level to 0, it started working but read the
+           texture from the wrong point on screen. 
+           Use the "workaroundStupidBuggyAtiDrivers" if for the fix,
+           and send a bug report.
     benja:
        - Papers
          - P2P article and diff thesis
Index: gzz/gfx/libpaper/papermill.py
diff -u gzz/gfx/libpaper/papermill.py:1.68 gzz/gfx/libpaper/papermill.py:1.69
--- gzz/gfx/libpaper/papermill.py:1.68  Sat Jan 25 08:45:03 2003
+++ gzz/gfx/libpaper/papermill.py       Sat Jan 25 09:45:14 2003
@@ -6,6 +6,7 @@
 from gfx.libpaper.texcoords import TexGenXYRepeatUnit
 from gfx.libpaper.params import *
 from gzz.vob.vobs import SolidBgVob
+import gfx.libutil.texture
 
 import gfx.libpaper.texcomb_NV1X
 import gfx.libpaper.texcomb_NV2X
@@ -142,7 +143,7 @@
             print "Warning: not returning optimized paper because"
             print "GL_SGIS_generate_mipmap extension is required but not 
available"
             return pap
-        if GL.workaroundStupidBuggyAtiDrivers:
+        if  GL.workaroundStupidBuggyAtiDrivers:
             print "Warning: not returning optimized paper because"
             print "copyTexImage2D has problems on ATI drivers"
             return pap
@@ -169,14 +170,16 @@
            BindTexture TEXTURE_2D %(texid)s
            TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 2
            TexParameter TEXTURE_2D  GENERATE_MIPMAP_SGIS TRUE
-           TexParameter TEXTURE_2D  TEXTURE_MIN_FILTER NEAREST
-           TexParameter TEXTURE_2D  TEXTURE_MAG_FILTER NEAREST
+           TexParameter TEXTURE_2D  TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
+           TexParameter TEXTURE_2D  TEXTURE_MAG_FILTER LINEAR
            BindTexture TEXTURE_2D 0
        """ % locals())
        print "READ: ", 0, vs.getSize().height-1-s, s, s
        tex.copyTexImage2D(w.getRenderingSurface(), "FRONT", "TEXTURE_2D", 0,
                        "RGB", 0, vs.getSize().height-1-s, 
                            s, s, 0)
+
+       gfx.libutil.texture.printTex(tex.getTexId())
        
        npap = PaperHanger()
        npap.setNPasses(1)
Index: gzz/gfx/libutil/texture.py
diff -u gzz/gfx/libutil/texture.py:1.1 gzz/gfx/libutil/texture.py:1.2
--- gzz/gfx/libutil/texture.py:1.1      Wed Oct 23 10:55:40 2002
+++ gzz/gfx/libutil/texture.py  Sat Jan 25 09:45:14 2003
@@ -1,7 +1,14 @@
 from gzz.gfx.gl import GL
 
 def printTex(id):
-    for i in range(0,2):
+    print "TexDump for",id
+    for p in (
+           "TEXTURE_BASE_LEVEL",
+           "TEXTURE_MAX_LEVEL",
+           ):
+       print "p:\t",p,"\t", GL.getGLTexParameterFloat("TEXTURE_2D", id, p)
+    for i in range(0,4):
+       print "Level",i
        for p in (
            "TEXTURE_WIDTH", 
            "TEXTURE_HEIGHT",