[Gzz-commits] gzz/gfx libcallgl/callgl.hxx libpaper/Paper.cxx

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/10 15:19:29

Modified files:
        gfx/libcallgl  : callgl.hxx 
        gfx/libpaper   : Paper.cxx 

Log message:
        #ifdef's around nv vertex program calls

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/callgl.hxx.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/Paper.cxx.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gfx/libcallgl/callgl.hxx
diff -c gzz/gfx/libcallgl/callgl.hxx:1.7 gzz/gfx/libcallgl/callgl.hxx:1.8
*** gzz/gfx/libcallgl/callgl.hxx:1.7    Mon Sep  9 07:19:14 2002
--- gzz/gfx/libcallgl/callgl.hxx        Tue Sep 10 15:19:29 2002
***************
*** 140,148 ****
--- 140,150 ----
      class VPid {
      public:
        GLuint name;
+ #ifdef GL_VERTEX_PROGRAM_NV
        VPid(GLuint name) : name(name) {}
        VPid() { glGenProgramsNV(1, &name); }
        ~VPid() { if (name) glDeleteProgramsNV(1, &name); }
+ #endif
      };
  
      /** An instance of Vertex Program code loaded into the driver.
Index: gzz/gfx/libpaper/Paper.cxx
diff -c gzz/gfx/libpaper/Paper.cxx:1.7 gzz/gfx/libpaper/Paper.cxx:1.8
*** gzz/gfx/libpaper/Paper.cxx:1.7      Tue Sep 10 10:56:00 2002
--- gzz/gfx/libpaper/Paper.cxx  Tue Sep 10 15:19:29 2002
***************
*** 98,103 ****
--- 98,104 ----
        // The following code computes T A^-1 E^-1 A and stores it
        // in place of T in the constant registers
  
+ #ifdef GL_VERTEX_PROGRAM_NV
          GLuint base = unit * 4 + tex_addr_base;
  
          glMatrixMode(GL_MATRIX0_NV);
***************
*** 136,142 ****
        glTrackMatrixNV(GL_VERTEX_PROGRAM_NV, base, GL_NONE, GL_IDENTITY_NV);
        
        glMatrixMode(GL_MODELVIEW);
! 
        }
    
  
--- 137,143 ----
        glTrackMatrixNV(GL_VERTEX_PROGRAM_NV, base, GL_NONE, GL_IDENTITY_NV);
        
        glMatrixMode(GL_MODELVIEW);
! #endif
        }
    
  
***************
*** 272,279 ****
--- 273,282 ----
          if (texgenvp.getSource().length() == 0)
          loadVP();
  
+ #ifdef GL_VERTEX_PROGRAM_NV
        /* Track the product of modelview and projection matrices */
        glTrackMatrixNV(GL_VERTEX_PROGRAM_NV, m_p_addr, 
GL_MODELVIEW_PROJECTION_NV, GL_IDENTITY_NV);
+ #endif
  
        /* Set up VP TexGen parameters for each texture unit */
          int unit = 0;