size of cuboctahedron in shapes demo now in line with other shapes. and

[freeglut] / progs / demos / smooth_opengl3 / smooth_opengl3.c

diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
index a36f090..622b95c 100755 (executable)
--- a/progs/demos/smooth_opengl3/smooth_opengl3.c
+++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
@@ -93,15 +93,22 @@ void checkError(const char *functionName)
 
 typedef ptrdiff_t ourGLsizeiptr;
 typedef char ourGLchar;
-\r
-#if defined(WIN32)
+
 #ifndef APIENTRY
 #define APIENTRY
 #endif
 
+
+#ifndef GL_ARB_vertex_array_object
+typedef void (APIENTRY *PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef void (APIENTRY *PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+#endif
+#ifndef GL_VERSION_1_5
 typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
 typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
 typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
+#endif
+#ifndef GL_VERSION_2_0
 typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
 typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
 typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
@@ -118,30 +125,34 @@ typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size,
 typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
 typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
 typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif  /* defined(WIN32) */\r
-\r
-PFNGLGENBUFFERSPROC gl_GenBuffers;\r
-PFNGLBINDBUFFERPROC gl_BindBuffer;\r
-PFNGLBUFFERDATAPROC gl_BufferData;\r
-PFNGLCREATESHADERPROC gl_CreateShader;\r
-PFNGLSHADERSOURCEPROC gl_ShaderSource;\r
-PFNGLCOMPILESHADERPROC gl_CompileShader;\r
-PFNGLCREATEPROGRAMPROC gl_CreateProgram;\r
-PFNGLATTACHSHADERPROC gl_AttachShader;\r
-PFNGLLINKPROGRAMPROC gl_LinkProgram;\r
-PFNGLUSEPROGRAMPROC gl_UseProgram;\r
-PFNGLGETSHADERIVPROC gl_GetShaderiv;\r
-PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog;\r
-PFNGLGETPROGRAMIVPROC gl_GetProgramiv;\r
-PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog;\r
-PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation;\r
-PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer;\r
-PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray;\r
-PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation;\r
-PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv;\r
-
-void initExtensionEntries(void) 
+#endif
+
+PFNGLGENVERTEXARRAYSPROC gl_GenVertexArrays;
+PFNGLBINDVERTEXARRAYPROC gl_BindVertexArray;
+PFNGLGENBUFFERSPROC gl_GenBuffers;
+PFNGLBINDBUFFERPROC gl_BindBuffer;
+PFNGLBUFFERDATAPROC gl_BufferData;
+PFNGLCREATESHADERPROC gl_CreateShader;
+PFNGLSHADERSOURCEPROC gl_ShaderSource;
+PFNGLCOMPILESHADERPROC gl_CompileShader;
+PFNGLCREATEPROGRAMPROC gl_CreateProgram;
+PFNGLATTACHSHADERPROC gl_AttachShader;
+PFNGLLINKPROGRAMPROC gl_LinkProgram;
+PFNGLUSEPROGRAMPROC gl_UseProgram;
+PFNGLGETSHADERIVPROC gl_GetShaderiv;
+PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog;
+PFNGLGETPROGRAMIVPROC gl_GetProgramiv;
+PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog;
+PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation;
+PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer;
+PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray;
+PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation;
+PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv;
+
+void initExtensionEntries(void)
 {
+   gl_GenVertexArrays = (PFNGLGENVERTEXARRAYSPROC) glutGetProcAddress ("glGenVertexArrays");
+   gl_BindVertexArray = (PFNGLBINDVERTEXARRAYPROC) glutGetProcAddress ("glBindVertexArray");
    gl_GenBuffers = (PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers");
    gl_BindBuffer = (PFNGLBINDBUFFERPROC) glutGetProcAddress ("glBindBuffer");
    gl_BufferData = (PFNGLBUFFERDATAPROC) glutGetProcAddress ("glBufferData");
@@ -186,9 +197,17 @@ enum {
 
 /* the name of the vertex buffer object */
 GLuint vertexBufferName;
+GLuint vertexArrayName;
 
 void initBuffer(void)
 {
+   /* Need to setup a vertex array as otherwise invalid operation errors can
+    * occur when accessing vertex buffer (OpenGL 3.3 has no default zero named
+    * vertex array) 
+    */
+   gl_GenVertexArrays(1, &vertexArrayName);
+   gl_BindVertexArray(vertexArrayName);
+
    gl_GenBuffers (1, &vertexBufferName);
    gl_BindBuffer (GL_ARRAY_BUFFER, vertexBufferName);
    gl_BufferData (GL_ARRAY_BUFFER, sizeof(varray), varray, GL_STATIC_DRAW);