[Gzz-commits] gzz gfx/demo/mipzip.py gzz/gfx/gl/MipzipLoader....

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/18 16:08:27

Modified files:
        gfx/demo       : mipzip.py 
        gzz/gfx/gl     : MipzipLoader.java 

Log message:
        useless twiddling

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/mipzip.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/MipzipLoader.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/mipzip.py
diff -u gzz/gfx/demo/mipzip.py:1.7 gzz/gfx/demo/mipzip.py:1.8
--- gzz/gfx/demo/mipzip.py:1.7  Sat Jan 18 15:49:09 2003
+++ gzz/gfx/demo/mipzip.py      Sat Jan 18 16:08:27 2003
@@ -18,7 +18,7 @@
        self.mem = MemoryPartitioner(80 * 1024 * 1024)
        self.files = []
        self.tex = []
-       for f in glob.glob("../mstmpimg/*.mipzip")[0:50]:
+       for f in glob.glob("../mstmpimg/*.mipzip"):
            ml = MipzipLoader(File(f))
            # ml.loadToBaseLevelSynch(0)
            mc = MipzipMemoryConsumer(self.mem, ml)
Index: gzz/gzz/gfx/gl/MipzipLoader.java
diff -u gzz/gzz/gfx/gl/MipzipLoader.java:1.12 
gzz/gzz/gfx/gl/MipzipLoader.java:1.13
--- gzz/gzz/gfx/gl/MipzipLoader.java:1.12       Sat Jan 18 15:49:09 2003
+++ gzz/gzz/gfx/gl/MipzipLoader.java    Sat Jan 18 16:08:27 2003
@@ -144,7 +144,7 @@
            switch(state) {
            case STATE_INTEXTURE:
                tex.loadNull2D(level, texFormat, 
-                       1, 2, 0, "RGB", "FLOAT");
+                       4, 2, 0, "RGB", "FLOAT");
            case STATE_DATALOADED:
                loadedData = null;
            }
@@ -261,9 +261,9 @@
                if(dbg) pa("MipzipLoader "+this+" discard: "+
                        i+" "+levels[i].state+" "+
                        currentBaseLevel);
+               levels[i].discard();
                if(currentBaseLevel <= i)
                    setBaseLevel(i+1);
-               levels[i].discard();
                AbstractUpdateManager.doWhenIdle(r_runGL, 
                            priority);
                return;