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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/11 01:24:12

Modified files:
        gfx/libpaper   : papermill.py 
        gzz/gfx/gl     : GL.java 

Log message:
        Make libpaper work properly with renderingsurfaces

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GL.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -u gzz/gfx/libpaper/papermill.py:1.64 gzz/gfx/libpaper/papermill.py:1.65
--- gzz/gfx/libpaper/papermill.py:1.64  Thu Nov 14 11:29:00 2002
+++ gzz/gfx/libpaper/papermill.py       Wed Dec 11 01:24:12 2002
@@ -166,7 +166,7 @@
            BindTexture TEXTURE_2D 0
        """ % locals())
        print "READ: ", 0, vs.getSize().height-1-s, s, s
-       tex.copyTexImage2D(w.window, "FRONT", "TEXTURE_2D", 0,
+       tex.copyTexImage2D(w.getRenderingSurface(), "FRONT", "TEXTURE_2D", 0,
                        "RGB", 0, vs.getSize().height-1-s, 
                            s, s, 0)
        
Index: gzz/gzz/gfx/gl/GL.java
diff -u gzz/gzz/gfx/gl/GL.java:1.29 gzz/gzz/gfx/gl/GL.java:1.30
--- gzz/gzz/gfx/gl/GL.java:1.29 Thu Dec  5 20:28:49 2002
+++ gzz/gzz/gfx/gl/GL.java      Wed Dec 11 01:24:12 2002
@@ -516,7 +516,7 @@
 
        /** Read into this texture from screen.
         */
-       public void copyTexImage2D(Window win, String buffer,
+       public void copyTexImage2D(RenderingSurface win, String buffer,
                    String target, int level,
                    String internalFormat, int x, int y,
                    int w, int h, int border) {