dri: Rework planar image interface

[mesa.git] / src / glu / sgi / libnurbs / interface / glsurfeval.cc

diff --git a/src/glu/sgi/libnurbs/interface/glsurfeval.cc b/src/glu/sgi/libnurbs/interface/glsurfeval.cc
index 0a4f18dcffdbf9122c7cc11e1bda55461c4a8a2c..b5bfab1e2811a449d12ea664dba66dda0c83b737 100644 (file)
--- a/src/glu/sgi/libnurbs/interface/glsurfeval.cc
+++ b/src/glu/sgi/libnurbs/interface/glsurfeval.cc
@@ -779,8 +779,8 @@ OpenGLSurfaceEvaluator::bgnmap2f(long)
       else
        auto_normal_flag = 0;
        */
+         glPushAttrib((GLbitfield) GL_EVAL_BIT);
 
-      //NEWCALLBACK: no need to worry about gl states when gling clalback
     }
   else
     {
@@ -842,12 +842,12 @@ OpenGLSurfaceEvaluator::endmap2f(void)
     bezierPatchMeshListDelete(global_bpm);
     global_bpm = NULL;
 #endif
-
+       glPopAttrib();
   }
 else
   {
 #ifndef USE_LOD
-glPopAttrib();
+    glPopAttrib();
 #endif
 
 #ifdef STATISTICS
@@ -970,7 +970,6 @@ if(output_triangles)
 
   REAL du, dv;
   long i,j;
-  long row;
   if(global_grid_nu == 0 || global_grid_nv == 0)
     return; /*no points need to be output*/
   du = (global_grid_u1 - global_grid_u0) / (REAL)global_grid_nu;
@@ -1185,8 +1184,11 @@ return;
 
 }
 
-void
-OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
+#ifdef _WIN32
+void OpenGLSurfaceEvaluator::putCallBack(GLenum which, void (GLAPIENTRY *fn)() )
+#else
+void OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
+#endif
 {
   switch(which)
     {