[Gzz-commits] gzz doc/gl/Mipzip.rst gzz/gfx/gl/GL.java gzz/gf...

[Tuomas J. Lukka]

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

Modified files:
        doc/gl         : Mipzip.rst 
        gzz/gfx/gl     : GL.java MipzipLoader.java 

Log message:
        More about mipzip

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/gl/Mipzip.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GL.java.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/MipzipLoader.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/doc/gl/Mipzip.rst
diff -u gzz/doc/gl/Mipzip.rst:1.1 gzz/doc/gl/Mipzip.rst:1.2
--- gzz/doc/gl/Mipzip.rst:1.1   Thu Jan 16 08:09:37 2003
+++ gzz/doc/gl/Mipzip.rst       Thu Jan 16 08:25:56 2003
@@ -2,4 +2,13 @@
 Mipzip files
 ============
 
+For xupdf, before we move to using real PDF rendering in realtime,
+and also for real photos later, we need a way to quickly load
+and discard mipmap levels.
 
+The Mipzip file format is simple: a zip file with a single entry
+for each mipmap level, and some metadata entries.
+
+Due to the requirements of memory handling and GL threads,
+we need to separate loading the mipmap level and teximaging
+it.
Index: gzz/gzz/gfx/gl/GL.java
diff -u gzz/gzz/gfx/gl/GL.java:1.38 gzz/gzz/gfx/gl/GL.java:1.39
--- gzz/gzz/gfx/gl/GL.java:1.38 Thu Jan 16 06:24:36 2003
+++ gzz/gzz/gfx/gl/GL.java      Thu Jan 16 08:25:56 2003
@@ -420,9 +420,11 @@
        /** Call glCompressedTexImage.
         * The length of data is used so it needs to be right.
         */
-       public void compressedTexImage(int level, String internalFormat, int 
width, int height, 
+       public void compressedTexImage(int level, 
+                   String internalFormat, int width, int height, 
                        int border, byte[] data) {
-           impl_Texture_compressedTexImage(getId(), level, internalFormat, 
width, height,
+           impl_Texture_compressedTexImage(getId(), 
+                   level, internalFormat, width, height,
                        border, data);
        }
 
Index: gzz/gzz/gfx/gl/MipzipLoader.java
diff -u gzz/gzz/gfx/gl/MipzipLoader.java:1.1 
gzz/gzz/gfx/gl/MipzipLoader.java:1.2
--- gzz/gzz/gfx/gl/MipzipLoader.java:1.1        Thu Jan 16 06:24:36 2003
+++ gzz/gzz/gfx/gl/MipzipLoader.java    Thu Jan 16 08:25:56 2003
@@ -1,13 +1,29 @@
 // (c): Tuomas J. Lukka
 
 package gzz.gfx.gl;
-import gzz.*;
+import java.awt.Dimension;
 import java.io.*;
 import java.util.zip.*;
+import gzz.*;
 
-/** A loader for Mipzip files: files of zipped, compressed mipmap levels.
+/** A loader for Mipzip files: files of zipped, 
+ * compressed mipmap levels.
  */
 public class MipzipLoader {
     File mipzipFile;
+
+    /** The compressed format.
+     */
+    String texFormat;
+
+    /** A single mipmap level.
+     */
+    class Level {
+
+       /** Sizes of the mipmap levels.
+        */
+       Dimension size;
+
+    }
 
 }