[Gzz-commits] gzz/gfx/libmosaic Mosaic.hxx

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/13 07:14:54

Modified files:
        gfx/libmosaic  : Mosaic.hxx 

Log message:
        Pixelstore mode for taking part of image, push, pop, texid unbind op

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libmosaic/Mosaic.hxx.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gzz/gfx/libmosaic/Mosaic.hxx
diff -u gzz/gfx/libmosaic/Mosaic.hxx:1.9 gzz/gfx/libmosaic/Mosaic.hxx:1.10
--- gzz/gfx/libmosaic/Mosaic.hxx:1.9    Fri Sep 13 07:48:31 2002
+++ gzz/gfx/libmosaic/Mosaic.hxx        Fri Dec 13 07:14:54 2002
@@ -82,6 +82,9 @@
            if(!id) throw InvalidTexture();
            glBindTexture(target, id);
        }
+       void unbind(GLenum target = GL_TEXTURE_2D) {
+           glBindTexture(target, 0);
+       }
        /** Compare two Ids -- usual semantics.
         */
        bool operator==(const Id &t) const { return id == t.id; }
@@ -257,6 +260,7 @@
        }
        void setGLPixelModes() {
            glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+           glPixelStorei(GL_UNPACK_ROW_LENGTH, width);
        }
 
        void *getPointer() {
@@ -353,6 +357,7 @@
        }
        void reload() {
            texid.bind();
+           glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
            content->setGLPixelModes();
            glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
            glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
@@ -364,6 +369,8 @@
            glEnable(GL_TEXTURE_2D);
 
            content->call_gluBuild2DMipmaps();
+           glPopClientAttrib();
+           texid.unbind();
 
        }
        int getWidth() { return content->getWidth(); }