Mercurial > octave
diff src/gl-render.cc @ 8724:a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
| author | Ben Abbott <bpabbott@mac.com> |
|---|---|
| date | Wed, 11 Feb 2009 19:46:23 -0500 |
| parents | 0d263850d582 |
| children | eb63fbe60fab |
line wrap: on
line diff
--- a/src/gl-render.cc Wed Feb 11 19:14:42 2009 -0500 +++ b/src/gl-render.cc Wed Feb 11 19:46:23 2009 -0500 @@ -221,7 +221,11 @@ opengl_tesselator { public: +#if defined (HAVE_FRAMEWORK_OPENGL) && defined (HAVE_GLUTESSCALLBACK_THREEDOTS) + typedef GLvoid (CALLBACK *fcn) (...); +#else typedef void (CALLBACK *fcn) (void); +#endif public: @@ -591,7 +595,12 @@ xZ1 = x_zlim(0)-(x_zlim(1)-x_zlim(0))/2; xZ2 = x_zlim(1)+(x_zlim(1)-x_zlim(0))/2; +#if defined (HAVE_FRAMEWORK_OPENGL) + GLint vw[4]; +#else int vw[4]; +#endif + glGetIntegerv (GL_VIEWPORT, vw); glMatrixMode (GL_MODELVIEW); @@ -2672,7 +2681,11 @@ void opengl_renderer::init_marker (const std::string& m, double size, float width) { +#if defined (HAVE_FRAMEWORK_OPENGL) + GLint vw[4]; +#else int vw[4]; +#endif glGetIntegerv (GL_VIEWPORT, vw);