From c9f16f89841c55048362e288fc43eb6bbc530d11 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Aug 2015 18:46:02 +0200 Subject: [PATCH] Define the OpenGL functions typedefs - PFNGLDRAWARRAYSINSTANCEDARBPROC - PFNGLVERTEXATTRIBDIVISORARBPROC Definitions found in glext.h from Mesa. --- Circular_kernel_3/demo/Circular_kernel_3/Viewer.h | 2 ++ .../demo/Periodic_3_triangulation_3/Scene.h | 2 ++ Polyhedron/demo/Polyhedron/CGAL_demo/Viewer_interface.h | 2 ++ Triangulation_3/demo/Triangulation_3/Viewer.h | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Circular_kernel_3/demo/Circular_kernel_3/Viewer.h b/Circular_kernel_3/demo/Circular_kernel_3/Viewer.h index f0ba2f3e78e..378fc42114d 100644 --- a/Circular_kernel_3/demo/Circular_kernel_3/Viewer.h +++ b/Circular_kernel_3/demo/Circular_kernel_3/Viewer.h @@ -44,6 +44,8 @@ private: QOpenGLVertexArrayObject vao[3]; QOpenGLShaderProgram rendering_program; QOpenGLShaderProgram rendering_program_no_ext; + typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); + typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); PFNGLDRAWARRAYSINSTANCEDARBPROC glDrawArraysInstanced; PFNGLVERTEXATTRIBDIVISORARBPROC glVertexAttribDivisor; diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.h b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.h index a689bfad4cb..4c012aa04dc 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.h +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.h @@ -293,6 +293,8 @@ private: QOpenGLShaderProgram rendering_program; QOpenGLShaderProgram rendering_program_spheres; QOpenGLShaderProgram rendering_program_cylinders; + typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); + typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); PFNGLDRAWARRAYSINSTANCEDARBPROC glDrawArraysInstanced; PFNGLVERTEXATTRIBDIVISORARBPROC glVertexAttribDivisor; void initialize_buffers(); diff --git a/Polyhedron/demo/Polyhedron/CGAL_demo/Viewer_interface.h b/Polyhedron/demo/Polyhedron/CGAL_demo/Viewer_interface.h index 05955d44373..fe99eda60b2 100644 --- a/Polyhedron/demo/Polyhedron/CGAL_demo/Viewer_interface.h +++ b/Polyhedron/demo/Polyhedron/CGAL_demo/Viewer_interface.h @@ -30,6 +30,8 @@ public: static QString dumpFrame(const qglviewer::Frame&); virtual bool inFastDrawing() const = 0; + typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); + typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); PFNGLDRAWARRAYSINSTANCEDARBPROC glDrawArraysInstanced; PFNGLVERTEXATTRIBDIVISORARBPROC glVertexAttribDivisor; bool extension_is_found; diff --git a/Triangulation_3/demo/Triangulation_3/Viewer.h b/Triangulation_3/demo/Triangulation_3/Viewer.h index d32de675c84..c865f018a41 100644 --- a/Triangulation_3/demo/Triangulation_3/Viewer.h +++ b/Triangulation_3/demo/Triangulation_3/Viewer.h @@ -387,6 +387,8 @@ private: QOpenGLShaderProgram rendering_program; QOpenGLShaderProgram rendering_program_spheres; QOpenGLShaderProgram rendering_program_cylinders; + typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); + typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); PFNGLDRAWARRAYSINSTANCEDARBPROC glDrawArraysInstanced; PFNGLVERTEXATTRIBDIVISORARBPROC glVertexAttribDivisor; void initialize_buffers();