[ff-cvs] callgl/src callgl.cxx

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/callgl
Module name:    callgl
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/10/10 10:23:20

Modified files:
        src            : callgl.cxx 

Log message:
        Arch sync

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/callgl/callgl/src/callgl.cxx.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: callgl/src/callgl.cxx
diff -u callgl/src/callgl.cxx:1.10 callgl/src/callgl.cxx:1.11
--- callgl/src/callgl.cxx:1.10  Sun Sep 21 09:34:57 2003
+++ callgl/src/callgl.cxx       Fri Oct 10 10:23:19 2003
@@ -170,6 +170,8 @@
          glReadBuffer(getToken(v[1]));
        } else if (checkfunc(v, "DrawBuffer", 1)) {
          glDrawBuffer(getToken(v[1]));
+       } else if (checkfunc(v, "CallList", 1)) {
+         glCallList(getToken(v[1]));
        } else if (checkfunc(v, "MatrixMode", 1)) {
          glMatrixMode(getToken(v[1]));
        } else if (checkfunc(v, "PushMatrix", 0)) {
@@ -255,6 +257,18 @@
          } else {
            glFogf(getToken(v[1]), getTokenf(v[2]));
          }
+       } else if (checkfunc(v, "TexSubImage2D", 8, true)) {
+         int w = getToken(v[5]);
+         int h = getToken(v[6]);
+         vector<GLfloat> pixels = getfv(v, 8, w * h);
+         if (pixels.size() % (unsigned)(w * h)) {
+           cerr << "TexSubImage2D dimensions " << w << "x" << h << " do not 
match the size " << pixels.size() << " of data\n";
+           return false; 
+         }
+         glTexSubImage2D(getToken(v[1]), getToken(v[2]), getToken(v[3]),
+                       getToken(v[4]),
+                      w, h, getToken(v[7]), 
+                      GL_FLOAT, &pixels[0]);
        } else if (checkfunc(v, "TexImage2D", 8, true)) {
          int w = getToken(v[4]);
          int h = getToken(v[5]);