From: <sp...@us...> - 2009-02-15 00:23:01
|
Revision: 775 http://freeglut.svn.sourceforge.net/freeglut/?rev=775&view=rev Author: spanne Date: 2009-02-15 00:22:55 +0000 (Sun, 15 Feb 2009) Log Message: ----------- Use VBOs in new example. Added a few comments. Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-14 20:38:53 UTC (rev 774) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-15 00:22:55 UTC (rev 775) @@ -46,6 +46,7 @@ #include <stdlib.h> #include <stdio.h> +/* report GL errors, if any, to stderr */ void reportErrors(const char *message) { GLenum error; @@ -54,25 +55,75 @@ } } -void init(void) +/* extension entries */ +void (*gl_GenBuffers) (GLsizei n, GLuint *buffers); +void (*gl_BindBuffer) (GLenum target, GLuint buffer); +void (*gl_BufferData) (GLenum target, GLsizeiptr size, const GLvoid *data, + GLenum usage); + +void initExtensionEntries(void) { - reportErrors ("at start of init"); + gl_GenBuffers = glutGetProcAddress ("glGenBuffers"); + gl_BindBuffer = glutGetProcAddress ("glBindBuffer"); + gl_BufferData = glutGetProcAddress ("glBufferData"); +} + +/* vertex array data for a colored 2D triangle, consisting of RGB color values + and XY coordinates */ +const GLsizei numColorComponents = 3; +const GLsizei numVertexComponents = 2; + +const GLfloat varray[] = { + 1.0f, 0.0f, 0.0f, + 5.0f, 5.0f, + + 0.0f, 1.0f, 0.0f, + 25.0f, 5.0f, + + 0.0f, 0.0f, 1.0f, + 5.0f, 25.0f +}; + +/* the name of the vertex buffer object */ +GLuint bufferName; + +void initBuffer(void) +{ + reportErrors ("at start of initBuffer"); + gl_GenBuffers (1, &bufferName); + gl_BindBuffer (GL_ARRAY_BUFFER, bufferName); + gl_BufferData (GL_ARRAY_BUFFER, sizeof(varray), varray, GL_STATIC_DRAW); + reportErrors ("at end of initBuffer"); +} + +void initRendering(void) +{ + reportErrors ("at start of initRendering"); glClearColor (0.0, 0.0, 0.0, 0.0); glShadeModel (GL_SMOOTH); - reportErrors ("at end of init"); + reportErrors ("at end of initRendering"); } +void init(void) +{ + initExtensionEntries(); + initBuffer(); + initRendering(); +} + void triangle(void) { + const char *base = NULL; + const GLsizei stride = sizeof(GLfloat) * (numColorComponents + numVertexComponents); + const GLsizei numElements = sizeof(varray) / stride; reportErrors ("at start of triangle"); - glBegin (GL_TRIANGLES); - glColor3f (1.0, 0.0, 0.0); - glVertex2f (5.0, 5.0); - glColor3f (0.0, 1.0, 0.0); - glVertex2f (25.0, 5.0); - glColor3f (0.0, 0.0, 1.0); - glVertex2f (5.0, 25.0); - glEnd(); + gl_BindBuffer (GL_ARRAY_BUFFER, bufferName); + glColorPointer (numColorComponents, GL_FLOAT, stride, base); + glVertexPointer(numVertexComponents, GL_FLOAT, stride, + base + sizeof(GLfloat) * numColorComponents); + glEnableClientState (GL_COLOR_ARRAY); + glEnableClientState (GL_VERTEX_ARRAY); + glDrawArrays(GL_TRIANGLES, 0, numElements); reportErrors ("at end of triangle"); } @@ -144,7 +195,7 @@ glutInit(&argc, argv); glutInitDisplayMode (GLUT_SINGLE | GLUT_RGB); glutInitContextVersion(3, 0); - // glutInitContextFlags(GLUT_FORWARD_COMPATIBLE | GLUT_DEBUG); + /* glutInitContextFlags(GLUT_FORWARD_COMPATIBLE | GLUT_DEBUG); */ glutInitWindowSize (500, 500); glutInitWindowPosition (100, 100); glutCreateWindow (argv[0]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2009-02-15 14:00:50
|
Revision: 776 http://freeglut.svn.sourceforge.net/freeglut/?rev=776&view=rev Author: spanne Date: 2009-02-15 14:00:45 +0000 (Sun, 15 Feb 2009) Log Message: ----------- Added a commandline option for 'classic' contexts. Aesthetic changes. Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-15 00:22:55 UTC (rev 775) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-15 14:00:45 UTC (rev 776) @@ -47,61 +47,72 @@ #include <stdio.h> /* report GL errors, if any, to stderr */ -void reportErrors(const char *message) +void checkError(const char *functionName) { GLenum error; while (( error = glGetError() ) != GL_NO_ERROR) { - fprintf (stderr, "GL error 0x%X %s\n", error, message); + fprintf (stderr, "GL error 0x%X detected in %s\n", error, functionName); } } -/* extension entries */ -void (*gl_GenBuffers) (GLsizei n, GLuint *buffers); -void (*gl_BindBuffer) (GLenum target, GLuint buffer); -void (*gl_BufferData) (GLenum target, GLsizeiptr size, const GLvoid *data, - GLenum usage); +/* extension types and entries, avoiding a dependency on additional libraries + like GLEW or the GL/glext.h header */ +typedef void (*PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); +PFNGLGENBUFFERSPROC gl_GenBuffers; +typedef void (*PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); +PFNGLBINDBUFFERPROC gl_BindBuffer; + +typedef void (*PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, + const GLvoid *data, GLenum usage); +PFNGLBUFFERDATAPROC gl_BufferData; + void initExtensionEntries(void) { - gl_GenBuffers = glutGetProcAddress ("glGenBuffers"); - gl_BindBuffer = glutGetProcAddress ("glBindBuffer"); - gl_BufferData = glutGetProcAddress ("glBufferData"); + gl_GenBuffers = (PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers"); + gl_BindBuffer = (PFNGLBINDBUFFERPROC) glutGetProcAddress ("glBindBuffer"); + gl_BufferData = (PFNGLBUFFERDATAPROC) glutGetProcAddress ("glBufferData"); } /* vertex array data for a colored 2D triangle, consisting of RGB color values and XY coordinates */ -const GLsizei numColorComponents = 3; -const GLsizei numVertexComponents = 2; - const GLfloat varray[] = { - 1.0f, 0.0f, 0.0f, - 5.0f, 5.0f, + 1.0f, 0.0f, 0.0f, /* red */ + 5.0f, 5.0f, /* lower left */ - 0.0f, 1.0f, 0.0f, - 25.0f, 5.0f, + 0.0f, 1.0f, 0.0f, /* green */ + 25.0f, 5.0f, /* lower right */ - 0.0f, 0.0f, 1.0f, - 5.0f, 25.0f + 0.0f, 0.0f, 1.0f, /* blue */ + 5.0f, 25.0f /* upper left */ }; +/* ISO C somehow enforces this silly use of 'enum' for compile-time constants */ +enum { + numColorComponents = 3, + numVertexComponents = 2, + stride = sizeof(GLfloat) * (numColorComponents + numVertexComponents), + numElements = sizeof(varray) / stride +}; + /* the name of the vertex buffer object */ -GLuint bufferName; +GLuint vertexBufferName; void initBuffer(void) { - reportErrors ("at start of initBuffer"); - gl_GenBuffers (1, &bufferName); - gl_BindBuffer (GL_ARRAY_BUFFER, bufferName); + gl_GenBuffers (1, &vertexBufferName); + gl_BindBuffer (GL_ARRAY_BUFFER, vertexBufferName); gl_BufferData (GL_ARRAY_BUFFER, sizeof(varray), varray, GL_STATIC_DRAW); - reportErrors ("at end of initBuffer"); + glEnableClientState (GL_COLOR_ARRAY); + glEnableClientState (GL_VERTEX_ARRAY); + checkError ("initBuffer"); } void initRendering(void) { - reportErrors ("at start of initRendering"); glClearColor (0.0, 0.0, 0.0, 0.0); glShadeModel (GL_SMOOTH); - reportErrors ("at end of initRendering"); + checkError ("initRendering"); } void init(void) @@ -111,29 +122,27 @@ initRendering(); } +const GLvoid *bufferObjectPtr (GLsizei index) +{ + return (const GLvoid *) (((char *) NULL) + index); +} + void triangle(void) { - const char *base = NULL; - const GLsizei stride = sizeof(GLfloat) * (numColorComponents + numVertexComponents); - const GLsizei numElements = sizeof(varray) / stride; - reportErrors ("at start of triangle"); - gl_BindBuffer (GL_ARRAY_BUFFER, bufferName); - glColorPointer (numColorComponents, GL_FLOAT, stride, base); + gl_BindBuffer (GL_ARRAY_BUFFER, vertexBufferName); + glColorPointer (numColorComponents, GL_FLOAT, stride, bufferObjectPtr (0)); glVertexPointer(numVertexComponents, GL_FLOAT, stride, - base + sizeof(GLfloat) * numColorComponents); - glEnableClientState (GL_COLOR_ARRAY); - glEnableClientState (GL_VERTEX_ARRAY); + bufferObjectPtr (sizeof(GLfloat) * numColorComponents)); glDrawArrays(GL_TRIANGLES, 0, numElements); - reportErrors ("at end of triangle"); + checkError ("triangle"); } void display(void) { - reportErrors ("at start of display"); glClear (GL_COLOR_BUFFER_BIT); triangle (); glFlush (); - reportErrors ("at end of display"); + checkError ("display"); } void loadOrthof(GLfloat *m, GLfloat l, GLfloat r, GLfloat b, GLfloat t, @@ -168,7 +177,6 @@ void reshape (int w, int h) { GLfloat m[16]; - reportErrors ("at start of reshape"); glViewport (0, 0, (GLsizei) w, (GLsizei) h); glMatrixMode (GL_PROJECTION); if (w <= h) { @@ -178,7 +186,7 @@ } glLoadMatrixf (m); glMatrixMode (GL_MODELVIEW); - reportErrors ("at end of reshape"); + checkError ("reshape"); } void keyboard(unsigned char key, int x, int y) @@ -194,8 +202,11 @@ { glutInit(&argc, argv); glutInitDisplayMode (GLUT_SINGLE | GLUT_RGB); - glutInitContextVersion(3, 0); - /* glutInitContextFlags(GLUT_FORWARD_COMPATIBLE | GLUT_DEBUG); */ + /* add command line argument "classic" for a pre-3.0 context */ + if ((argc != 2) || (strcmp (argv[1], "classic") != 0)) { + glutInitContextVersion (3, 0); + glutInitContextFlags (GLUT_FORWARD_COMPATIBLE | GLUT_DEBUG); + } glutInitWindowSize (500, 500); glutInitWindowPosition (100, 100); glutCreateWindow (argv[0]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2009-02-15 17:54:02
|
Revision: 777 http://freeglut.svn.sourceforge.net/freeglut/?rev=777&view=rev Author: spanne Date: 2009-02-15 17:53:48 +0000 (Sun, 15 Feb 2009) Log Message: ----------- Use GLSL shaders (still 1.20, though). Dump GL info. Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-15 14:00:45 UTC (rev 776) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-15 17:53:48 UTC (rev 777) @@ -45,6 +45,7 @@ #include <GL/freeglut.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> /* report GL errors, if any, to stderr */ void checkError(const char *functionName) @@ -55,8 +56,28 @@ } } -/* extension types and entries, avoiding a dependency on additional libraries - like GLEW or the GL/glext.h header */ +/* extension #defines, types and entries, avoiding a dependency on additional + libraries like GLEW or the GL/glext.h header */ +#ifndef GL_VERTEX_SHADER +#define GL_VERTEX_SHADER 0x8B31 +#endif + +#ifndef GL_SHADING_LANGUAGE_VERSION +#define GL_SHADING_LANGUAGE_VERSION 0x8B8C +#endif + +#ifndef GL_COMPILE_STATUS +#define GL_COMPILE_STATUS 0x8B81 +#endif + +#ifndef GL_LINK_STATUS +#define GL_LINK_STATUS 0x8B82 +#endif + +#ifndef GL_INFO_LOG_LENGTH +#define GL_INFO_LOG_LENGTH 0x8B84 +#endif + typedef void (*PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); PFNGLGENBUFFERSPROC gl_GenBuffers; @@ -67,11 +88,58 @@ const GLvoid *data, GLenum usage); PFNGLBUFFERDATAPROC gl_BufferData; +typedef GLuint (*PFNGLCREATESHADERPROC) (GLenum type); +PFNGLCREATESHADERPROC gl_CreateShader; + +typedef void (*PFNGLSHADERSOURCEPROC) + (GLuint shader, GLsizei count, const GLchar **string, const GLint *length); +PFNGLSHADERSOURCEPROC gl_ShaderSource; + +typedef void (*PFNGLCOMPILESHADERPROC) (GLuint shader); +PFNGLCOMPILESHADERPROC gl_CompileShader; + +typedef GLuint (*PFNGLCREATEPROGRAMPROC) (void); +PFNGLCREATEPROGRAMPROC gl_CreateProgram; + +typedef void (*PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); +PFNGLATTACHSHADERPROC gl_AttachShader; + +typedef void (*PFNGLLINKPROGRAMPROC) (GLuint program); +PFNGLLINKPROGRAMPROC gl_LinkProgram; + +typedef void (*PFNGLUSEPROGRAMPROC) (GLuint program); +PFNGLUSEPROGRAMPROC gl_UseProgram; + +typedef void (*PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); +PFNGLGETSHADERIVPROC gl_GetShaderiv; + +typedef void (*PFNGLGETSHADERINFOLOGPROC) + (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; + +typedef void (*PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); +PFNGLGETPROGRAMIVPROC gl_GetProgramiv; + +typedef void (*PFNGLGETPROGRAMINFOLOGPROC) + (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; + void initExtensionEntries(void) { gl_GenBuffers = (PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers"); gl_BindBuffer = (PFNGLBINDBUFFERPROC) glutGetProcAddress ("glBindBuffer"); gl_BufferData = (PFNGLBUFFERDATAPROC) glutGetProcAddress ("glBufferData"); + gl_CreateShader = (PFNGLCREATESHADERPROC) glutGetProcAddress ("glCreateShader"); + gl_ShaderSource = (PFNGLSHADERSOURCEPROC) glutGetProcAddress ("glShaderSource"); + gl_CompileShader = (PFNGLCOMPILESHADERPROC) glutGetProcAddress ("glCompileShader"); + gl_CreateProgram = (PFNGLCREATEPROGRAMPROC) glutGetProcAddress ("glCreateProgram"); + gl_AttachShader = (PFNGLATTACHSHADERPROC) glutGetProcAddress ("glAttachShader"); + gl_LinkProgram = (PFNGLLINKPROGRAMPROC) glutGetProcAddress ("glLinkProgram"); + gl_UseProgram = (PFNGLUSEPROGRAMPROC) glutGetProcAddress ("glUseProgram"); + gl_GetShaderiv = (PFNGLGETSHADERIVPROC) glutGetProcAddress ("glGetShaderiv"); + gl_GetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC) glutGetProcAddress ("glGetShaderInfoLog"); + gl_GetProgramiv = (PFNGLGETPROGRAMIVPROC) glutGetProcAddress ("glGetProgramiv"); + gl_GetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC) glutGetProcAddress ("glGetProgramInfoLog"); } /* vertex array data for a colored 2D triangle, consisting of RGB color values @@ -108,6 +176,91 @@ checkError ("initBuffer"); } +const GLchar *vertexShaderSource[] = { + "#version 120\n", + "void main(void)\n", + "{\n", + " gl_FrontColor = gl_Color;\n", + " gl_Position = ftransform();\n", + "}\n" +}; + +const GLchar *fragmentShaderSource[] = { + "#version 120\n", + "void main(void)\n", + "{\n", + " gl_FragColor = gl_Color;\n", + "}\n" +}; + +void compileAndCheck(GLuint shader) +{ + GLint status; + gl_CompileShader (shader); + gl_GetShaderiv (shader, GL_COMPILE_STATUS, &status); + if (status == GL_FALSE) { + GLint infoLogLength; + GLchar *infoLog; + gl_GetShaderiv (shader, GL_INFO_LOG_LENGTH, &infoLogLength); + infoLog = (GLchar*) malloc (infoLogLength); + gl_GetShaderInfoLog (shader, infoLogLength, NULL, infoLog); + fprintf (stderr, "compile log: %s\n", infoLog); + free (infoLog); + } +} + +GLuint compileShaderSource(GLenum type, GLsizei count, const GLchar **string) +{ + GLuint shader = gl_CreateShader (type); + gl_ShaderSource (shader, count, string, NULL); + compileAndCheck (shader); + return shader; +} + +void linkAndCheck(GLuint program) +{ + GLint status; + gl_LinkProgram (program); + gl_GetProgramiv (program, GL_LINK_STATUS, &status); + if (status == GL_FALSE) { + GLint infoLogLength; + GLchar *infoLog; + gl_GetProgramiv (program, GL_INFO_LOG_LENGTH, &infoLogLength); + infoLog = (GLchar*) malloc (infoLogLength); + gl_GetProgramInfoLog (program, infoLogLength, NULL, infoLog); + fprintf (stderr, "link log: %s\n", infoLog); + free (infoLog); + } +} + +GLuint createProgram(GLuint vertexShader, GLuint fragmentShader) +{ + GLuint program = gl_CreateProgram (); + if (vertexShader != 0) { + gl_AttachShader (program, vertexShader); + } + if (fragmentShader != 0) { + gl_AttachShader (program, fragmentShader); + } + linkAndCheck (program); + return program; +} + +void initShader(void) +{ + const GLsizei vertexShaderLines = sizeof(vertexShaderSource) / sizeof(GLchar*); + GLuint vertexShader = + compileShaderSource (GL_VERTEX_SHADER, vertexShaderLines, vertexShaderSource); + + const GLsizei fragmentShaderLines = sizeof(fragmentShaderSource) / sizeof(GLchar*); + GLuint fragmentShader = + compileShaderSource (GL_FRAGMENT_SHADER, fragmentShaderLines, fragmentShaderSource); + + GLuint program = createProgram (vertexShader, fragmentShader); + gl_UseProgram (program); + checkError ("initShader"); +} + void initRendering(void) { glClearColor (0.0, 0.0, 0.0, 0.0); @@ -117,11 +270,21 @@ void init(void) { - initExtensionEntries(); - initBuffer(); - initRendering(); + initExtensionEntries (); + initBuffer (); + initShader (); + initRendering (); } +void dumpInfo(void) +{ + printf ("Vendor: %s\n", glGetString (GL_VENDOR)); + printf ("Renderer: %s\n", glGetString (GL_RENDERER)); + printf ("Version: %s\n", glGetString (GL_VERSION)); + printf ("GLSL: %s\n", glGetString (GL_SHADING_LANGUAGE_VERSION)); + checkError ("dumpInfo"); +} + const GLvoid *bufferObjectPtr (GLsizei index) { return (const GLvoid *) (((char *) NULL) + index); @@ -210,6 +373,7 @@ glutInitWindowSize (500, 500); glutInitWindowPosition (100, 100); glutCreateWindow (argv[0]); + dumpInfo (); init (); glutDisplayFunc(display); glutReshapeFunc(reshape); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2009-02-15 21:12:29
|
Revision: 778 http://freeglut.svn.sourceforge.net/freeglut/?rev=778&view=rev Author: spanne Date: 2009-02-15 21:12:25 +0000 (Sun, 15 Feb 2009) Log Message: ----------- Final changes to make the example fully OpenGL-3.0-compliant: * Use vertex attribute arrays. * Use our own projection matrix. * Do not use deprecated vertex/fragment shader variables. Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-15 17:53:48 UTC (rev 777) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-15 21:12:25 UTC (rev 778) @@ -58,6 +58,14 @@ /* extension #defines, types and entries, avoiding a dependency on additional libraries like GLEW or the GL/glext.h header */ +#ifndef GL_ARRAY_BUFFER +#define GL_ARRAY_BUFFER 0x8892 +#endif + +#ifndef GL_STATIC_DRAW +#define GL_STATIC_DRAW 0x88E4 +#endif + #ifndef GL_VERTEX_SHADER #define GL_VERTEX_SHADER 0x8B31 #endif @@ -92,7 +100,7 @@ PFNGLCREATESHADERPROC gl_CreateShader; typedef void (*PFNGLSHADERSOURCEPROC) - (GLuint shader, GLsizei count, const GLchar **string, const GLint *length); + (GLuint shader, GLsizei count, const GLchar **string, const GLint *length); PFNGLSHADERSOURCEPROC gl_ShaderSource; typedef void (*PFNGLCOMPILESHADERPROC) (GLuint shader); @@ -114,16 +122,34 @@ PFNGLGETSHADERIVPROC gl_GetShaderiv; typedef void (*PFNGLGETSHADERINFOLOGPROC) - (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); + (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; typedef void (*PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); PFNGLGETPROGRAMIVPROC gl_GetProgramiv; typedef void (*PFNGLGETPROGRAMINFOLOGPROC) - (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); + (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; +typedef GLint (*PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name); +PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation; + +typedef void (*PFNGLVERTEXATTRIBPOINTERPROC) + (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, + const GLvoid *pointer); +PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer; + +typedef void (*PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); +PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray; + +typedef GLint (*PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name); +PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; + +typedef void (*PFNGLUNIFORMMATRIX4FVPROC) + (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv; + void initExtensionEntries(void) { gl_GenBuffers = (PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers"); @@ -140,6 +166,11 @@ gl_GetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC) glutGetProcAddress ("glGetShaderInfoLog"); gl_GetProgramiv = (PFNGLGETPROGRAMIVPROC) glutGetProcAddress ("glGetProgramiv"); gl_GetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC) glutGetProcAddress ("glGetProgramInfoLog"); + gl_GetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC) glutGetProcAddress ("glGetAttribLocation"); + gl_VertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC) glutGetProcAddress ("glVertexAttribPointer"); + gl_EnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glEnableVertexAttribArray"); + gl_GetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC) glutGetProcAddress ("glGetUniformLocation"); + gl_UniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC) glutGetProcAddress ("glUniformMatrix4fv"); } /* vertex array data for a colored 2D triangle, consisting of RGB color values @@ -171,25 +202,27 @@ gl_GenBuffers (1, &vertexBufferName); gl_BindBuffer (GL_ARRAY_BUFFER, vertexBufferName); gl_BufferData (GL_ARRAY_BUFFER, sizeof(varray), varray, GL_STATIC_DRAW); - glEnableClientState (GL_COLOR_ARRAY); - glEnableClientState (GL_VERTEX_ARRAY); checkError ("initBuffer"); } const GLchar *vertexShaderSource[] = { - "#version 120\n", + "#version 130\n", + "uniform mat4 fg_ProjectionMatrix;\n", + "in vec4 fg_Color;\n", + "in vec4 fg_Vertex;\n", "void main(void)\n", "{\n", - " gl_FrontColor = gl_Color;\n", - " gl_Position = ftransform();\n", + " gl_FrontColor = fg_Color;\n", + " gl_Position = fg_ProjectionMatrix * fg_Vertex;\n", "}\n" }; const GLchar *fragmentShaderSource[] = { - "#version 120\n", + "#version 130\n", + "out vec4 fg_FragColor;\n", "void main(void)\n", "{\n", - " gl_FragColor = gl_Color;\n", + " fg_FragColor = gl_Color;\n", "}\n" }; @@ -237,15 +270,19 @@ { GLuint program = gl_CreateProgram (); if (vertexShader != 0) { - gl_AttachShader (program, vertexShader); + gl_AttachShader (program, vertexShader); } if (fragmentShader != 0) { - gl_AttachShader (program, fragmentShader); + gl_AttachShader (program, fragmentShader); } linkAndCheck (program); return program; } +GLuint fgProjectionMatrixIndex; +GLuint fgColorIndex; +GLuint fgVertexIndex; + void initShader(void) { const GLsizei vertexShaderLines = sizeof(vertexShaderSource) / sizeof(GLchar*); @@ -257,7 +294,17 @@ compileShaderSource (GL_FRAGMENT_SHADER, fragmentShaderLines, fragmentShaderSource); GLuint program = createProgram (vertexShader, fragmentShader); + gl_UseProgram (program); + + fgProjectionMatrixIndex = gl_GetUniformLocation(program, "fg_ProjectionMatrix"); + + fgColorIndex = gl_GetAttribLocation(program, "fg_Color"); + gl_EnableVertexAttribArray (fgColorIndex); + + fgVertexIndex = gl_GetAttribLocation(program, "fg_Vertex"); + gl_EnableVertexAttribArray (fgVertexIndex); + checkError ("initShader"); } @@ -290,12 +337,17 @@ return (const GLvoid *) (((char *) NULL) + index); } +GLfloat projectionMatrix[16]; + void triangle(void) { + gl_UniformMatrix4fv (fgProjectionMatrixIndex, 1, GL_FALSE, projectionMatrix); + gl_BindBuffer (GL_ARRAY_BUFFER, vertexBufferName); - glColorPointer (numColorComponents, GL_FLOAT, stride, bufferObjectPtr (0)); - glVertexPointer(numVertexComponents, GL_FLOAT, stride, - bufferObjectPtr (sizeof(GLfloat) * numColorComponents)); + gl_VertexAttribPointer (fgColorIndex, numColorComponents, GL_FLOAT, GL_FALSE, + stride, bufferObjectPtr (0)); + gl_VertexAttribPointer (fgVertexIndex, numVertexComponents, GL_FLOAT, GL_FALSE, + stride, bufferObjectPtr (sizeof(GLfloat) * numColorComponents)); glDrawArrays(GL_TRIANGLES, 0, numElements); checkError ("triangle"); } @@ -339,16 +391,12 @@ void reshape (int w, int h) { - GLfloat m[16]; glViewport (0, 0, (GLsizei) w, (GLsizei) h); - glMatrixMode (GL_PROJECTION); if (w <= h) { - loadOrtho2Df (m, 0.0, 30.0, 0.0, 30.0 * (GLfloat) h/(GLfloat) w); + loadOrtho2Df (projectionMatrix, 0.0, 30.0, 0.0, 30.0 * (GLfloat) h/(GLfloat) w); } else { - loadOrtho2Df (m, 0.0, 30.0 * (GLfloat) w/(GLfloat) h, 0.0, 30.0); + loadOrtho2Df (projectionMatrix, 0.0, 30.0 * (GLfloat) w/(GLfloat) h, 0.0, 30.0); } - glLoadMatrixf (m); - glMatrixMode (GL_MODELVIEW); checkError ("reshape"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2009-02-28 18:31:50
|
Revision: 787 http://freeglut.svn.sourceforge.net/freeglut/?rev=787&view=rev Author: spanne Date: 2009-02-28 18:31:35 +0000 (Sat, 28 Feb 2009) Log Message: ----------- When -mno-cygwin is used, we get ancient GL headers, so be a bit more conservative. Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-28 18:02:31 UTC (rev 786) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-28 18:31:35 UTC (rev 787) @@ -66,6 +66,10 @@ #define GL_STATIC_DRAW 0x88E4 #endif +#ifndef GL_FRAGMENT_SHADER +#define GL_FRAGMENT_SHADER 0x8B30 +#endif + #ifndef GL_VERTEX_SHADER #define GL_VERTEX_SHADER 0x8B31 #endif @@ -86,13 +90,16 @@ #define GL_INFO_LOG_LENGTH 0x8B84 #endif +typedef ptrdiff_t ourGLsizeiptr; +typedef char ourGLchar; + typedef void (*PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); PFNGLGENBUFFERSPROC gl_GenBuffers; typedef void (*PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); PFNGLBINDBUFFERPROC gl_BindBuffer; -typedef void (*PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, +typedef void (*PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); PFNGLBUFFERDATAPROC gl_BufferData; @@ -100,7 +107,7 @@ PFNGLCREATESHADERPROC gl_CreateShader; typedef void (*PFNGLSHADERSOURCEPROC) - (GLuint shader, GLsizei count, const GLchar **string, const GLint *length); + (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length); PFNGLSHADERSOURCEPROC gl_ShaderSource; typedef void (*PFNGLCOMPILESHADERPROC) (GLuint shader); @@ -122,17 +129,17 @@ PFNGLGETSHADERIVPROC gl_GetShaderiv; typedef void (*PFNGLGETSHADERINFOLOGPROC) - (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); + (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; typedef void (*PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); PFNGLGETPROGRAMIVPROC gl_GetProgramiv; typedef void (*PFNGLGETPROGRAMINFOLOGPROC) - (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); + (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; -typedef GLint (*PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name); +typedef GLint (*PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name); PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation; typedef void (*PFNGLVERTEXATTRIBPOINTERPROC) @@ -143,7 +150,7 @@ typedef void (*PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray; -typedef GLint (*PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name); +typedef GLint (*PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; typedef void (*PFNGLUNIFORMMATRIX4FVPROC) @@ -205,7 +212,7 @@ checkError ("initBuffer"); } -const GLchar *vertexShaderSource[] = { +const ourGLchar *vertexShaderSource[] = { "#version 130\n", "uniform mat4 fg_ProjectionMatrix;\n", "in vec4 fg_Color;\n", @@ -217,7 +224,7 @@ "}\n" }; -const GLchar *fragmentShaderSource[] = { +const ourGLchar *fragmentShaderSource[] = { "#version 130\n", "out vec4 fg_FragColor;\n", "void main(void)\n", @@ -233,16 +240,16 @@ gl_GetShaderiv (shader, GL_COMPILE_STATUS, &status); if (status == GL_FALSE) { GLint infoLogLength; - GLchar *infoLog; + ourGLchar *infoLog; gl_GetShaderiv (shader, GL_INFO_LOG_LENGTH, &infoLogLength); - infoLog = (GLchar*) malloc (infoLogLength); + infoLog = (ourGLchar*) malloc (infoLogLength); gl_GetShaderInfoLog (shader, infoLogLength, NULL, infoLog); fprintf (stderr, "compile log: %s\n", infoLog); free (infoLog); } } -GLuint compileShaderSource(GLenum type, GLsizei count, const GLchar **string) +GLuint compileShaderSource(GLenum type, GLsizei count, const ourGLchar **string) { GLuint shader = gl_CreateShader (type); gl_ShaderSource (shader, count, string, NULL); @@ -257,9 +264,9 @@ gl_GetProgramiv (program, GL_LINK_STATUS, &status); if (status == GL_FALSE) { GLint infoLogLength; - GLchar *infoLog; + ourGLchar *infoLog; gl_GetProgramiv (program, GL_INFO_LOG_LENGTH, &infoLogLength); - infoLog = (GLchar*) malloc (infoLogLength); + infoLog = (ourGLchar*) malloc (infoLogLength); gl_GetProgramInfoLog (program, infoLogLength, NULL, infoLog); fprintf (stderr, "link log: %s\n", infoLog); free (infoLog); @@ -285,11 +292,11 @@ void initShader(void) { - const GLsizei vertexShaderLines = sizeof(vertexShaderSource) / sizeof(GLchar*); + const GLsizei vertexShaderLines = sizeof(vertexShaderSource) / sizeof(ourGLchar*); GLuint vertexShader = compileShaderSource (GL_VERTEX_SHADER, vertexShaderLines, vertexShaderSource); - const GLsizei fragmentShaderLines = sizeof(fragmentShaderSource) / sizeof(GLchar*); + const GLsizei fragmentShaderLines = sizeof(fragmentShaderSource) / sizeof(ourGLchar*); GLuint fragmentShader = compileShaderSource (GL_FRAGMENT_SHADER, fragmentShaderLines, fragmentShaderSource); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sp...@us...> - 2009-03-01 11:33:21
|
Revision: 788 http://freeglut.svn.sourceforge.net/freeglut/?rev=788&view=rev Author: spanne Date: 2009-03-01 11:33:15 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Windows fun again: Use the correct calling convention for OpenGL extension entries. Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-02-28 18:31:35 UTC (rev 787) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-03-01 11:33:15 UTC (rev 788) @@ -93,68 +93,65 @@ typedef ptrdiff_t ourGLsizeiptr; typedef char ourGLchar; -typedef void (*PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); +#ifndef APIENTRY +#define APIENTRY +#endif + +typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); PFNGLGENBUFFERSPROC gl_GenBuffers; -typedef void (*PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); +typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); PFNGLBINDBUFFERPROC gl_BindBuffer; -typedef void (*PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, - const GLvoid *data, GLenum usage); +typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); PFNGLBUFFERDATAPROC gl_BufferData; -typedef GLuint (*PFNGLCREATESHADERPROC) (GLenum type); +typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type); PFNGLCREATESHADERPROC gl_CreateShader; -typedef void (*PFNGLSHADERSOURCEPROC) - (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length); +typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length); PFNGLSHADERSOURCEPROC gl_ShaderSource; -typedef void (*PFNGLCOMPILESHADERPROC) (GLuint shader); +typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader); PFNGLCOMPILESHADERPROC gl_CompileShader; -typedef GLuint (*PFNGLCREATEPROGRAMPROC) (void); +typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void); PFNGLCREATEPROGRAMPROC gl_CreateProgram; -typedef void (*PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); +typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); PFNGLATTACHSHADERPROC gl_AttachShader; -typedef void (*PFNGLLINKPROGRAMPROC) (GLuint program); +typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program); PFNGLLINKPROGRAMPROC gl_LinkProgram; -typedef void (*PFNGLUSEPROGRAMPROC) (GLuint program); +typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program); PFNGLUSEPROGRAMPROC gl_UseProgram; -typedef void (*PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); +typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); PFNGLGETSHADERIVPROC gl_GetShaderiv; -typedef void (*PFNGLGETSHADERINFOLOGPROC) - (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); +typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; -typedef void (*PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); PFNGLGETPROGRAMIVPROC gl_GetProgramiv; -typedef void (*PFNGLGETPROGRAMINFOLOGPROC) - (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); +typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; -typedef GLint (*PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name); +typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name); PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation; -typedef void (*PFNGLVERTEXATTRIBPOINTERPROC) - (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, - const GLvoid *pointer); +typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer; -typedef void (*PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); +typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray; -typedef GLint (*PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); +typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; -typedef void (*PFNGLUNIFORMMATRIX4FVPROC) - (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv; void initExtensionEntries(void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2009-11-19 12:52:05
|
Revision: 851 http://freeglut.svn.sourceforge.net/freeglut/?rev=851&view=rev Author: fayjf Date: 2009-11-19 12:51:58 +0000 (Thu, 19 Nov 2009) Log Message: ----------- Making the "smooth_opengl3" typedefs to be Windows only per a discussion on the developers' list over the last several days. Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-11-18 12:29:05 UTC (rev 850) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2009-11-19 12:51:58 UTC (rev 851) @@ -93,67 +93,52 @@ typedef ptrdiff_t ourGLsizeiptr; typedef char ourGLchar; - + +#if defined(WIN32) #ifndef APIENTRY #define APIENTRY #endif typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); -PFNGLGENBUFFERSPROC gl_GenBuffers; - typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -PFNGLBINDBUFFERPROC gl_BindBuffer; - typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); -PFNGLBUFFERDATAPROC gl_BufferData; - typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type); -PFNGLCREATESHADERPROC gl_CreateShader; - typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length); -PFNGLSHADERSOURCEPROC gl_ShaderSource; - typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader); -PFNGLCOMPILESHADERPROC gl_CompileShader; - typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void); -PFNGLCREATEPROGRAMPROC gl_CreateProgram; - typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -PFNGLATTACHSHADERPROC gl_AttachShader; - typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program); -PFNGLLINKPROGRAMPROC gl_LinkProgram; - typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program); -PFNGLUSEPROGRAMPROC gl_UseProgram; - typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); -PFNGLGETSHADERIVPROC gl_GetShaderiv; - typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); -PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; - typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); -PFNGLGETPROGRAMIVPROC gl_GetProgramiv; - typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); -PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; - typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name); -PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation; - typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer; - typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray; - typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); -PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; - typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv; +#endif /* defined(WIN32) */ + +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) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2011-01-23 14:18:31
|
Revision: 882 http://freeglut.svn.sourceforge.net/freeglut/?rev=882&view=rev Author: fayjf Date: 2011-01-23 14:18:25 +0000 (Sun, 23 Jan 2011) Log Message: ----------- Removing a bunch of Windows line endings -- see bug report 3077828 Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2011-01-23 04:25:33 UTC (rev 881) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2011-01-23 14:18:25 UTC (rev 882) @@ -93,8 +93,7 @@ typedef ptrdiff_t ourGLsizeiptr; typedef char ourGLchar; - -#if defined(WIN32) + #ifndef APIENTRY #define APIENTRY #endif @@ -118,28 +117,27 @@ 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) */ - -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; +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_GenBuffers = (PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2011-12-13 03:48:32
|
Revision: 949 http://freeglut.svn.sourceforge.net/freeglut/?rev=949&view=rev Author: fayjf Date: 2011-12-13 03:48:26 +0000 (Tue, 13 Dec 2011) Log Message: ----------- Adding an error message code to the "smooth_opengl3" demo per e-mail from Diederick Niehorster dated 12/9/2011 as 12:22 AM Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2011-11-07 04:22:54 UTC (rev 948) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2011-12-13 03:48:26 UTC (rev 949) @@ -52,8 +52,9 @@ void checkError(const char *functionName) { GLenum error; - while (( error = glGetError() ) != GL_NO_ERROR) { - fprintf (stderr, "GL error 0x%X detected in %s\n", error, functionName); + while (( error = glGetError() ) != GL_NO_ERROR) { + const GLubyte* sError = gluErrorString(error); + fprintf (stderr, "GL error 0x%X, %s, detected in %s\n", error, sError, functionName); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2011-12-14 03:35:13
|
Revision: 953 http://freeglut.svn.sourceforge.net/freeglut/?rev=953&view=rev Author: fayjf Date: 2011-12-14 03:35:07 +0000 (Wed, 14 Dec 2011) Log Message: ----------- Undoing changeset 949 as it breaks the Linux build, per e-mail from John Tsiombikas dated 12/13/11 6:41 PM Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2011-12-13 05:40:10 UTC (rev 952) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2011-12-14 03:35:07 UTC (rev 953) @@ -53,8 +53,7 @@ { GLenum error; while (( error = glGetError() ) != GL_NO_ERROR) { - const GLubyte* sError = gluErrorString(error); - fprintf (stderr, "GL error 0x%X, %s, detected in %s\n", error, sError, functionName); + fprintf (stderr, "GL error 0x%X detected in %s\n", error, functionName); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-07-24 15:37:39
|
Revision: 1371 http://freeglut.svn.sourceforge.net/freeglut/?rev=1371&view=rev Author: dcnieho Date: 2012-07-24 15:37:28 +0000 (Tue, 24 Jul 2012) Log Message: ----------- fix to smooth demo to work with GL 3.3 and higher, thanks Neil Mannall (bug tracker ID 3496257)! Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2012-07-24 15:30:35 UTC (rev 1370) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2012-07-24 15:37:28 UTC (rev 1371) @@ -98,6 +98,8 @@ #define APIENTRY #endif +typedef void (APIENTRY *PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays); +typedef void (APIENTRY *PFNGLBINDVERTEXARRAYPROC) (GLuint array); 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); @@ -118,6 +120,8 @@ typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +PFNGLGENVERTEXARRAYSPROC gl_GenVertexArrays; +PFNGLBINDVERTEXARRAYPROC gl_BindVertexArray; PFNGLGENBUFFERSPROC gl_GenBuffers; PFNGLBINDBUFFERPROC gl_BindBuffer; PFNGLBUFFERDATAPROC gl_BufferData; @@ -140,6 +144,8 @@ 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"); @@ -184,9 +190,17 @@ /* 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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jt...@us...> - 2012-08-07 11:15:07
|
Revision: 1385 http://freeglut.svn.sourceforge.net/freeglut/?rev=1385&view=rev Author: jtsiomb Date: 2012-08-07 11:15:01 +0000 (Tue, 07 Aug 2012) Log Message: ----------- - trying to fix bug 2781865 Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2012-08-06 15:05:10 UTC (rev 1384) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2012-08-07 11:15:01 UTC (rev 1385) @@ -52,7 +52,7 @@ void checkError(const char *functionName) { GLenum error; - while (( error = glGetError() ) != GL_NO_ERROR) { + while (( error = glGetError() ) != GL_NO_ERROR) { fprintf (stderr, "GL error 0x%X detected in %s\n", error, functionName); } } @@ -98,11 +98,17 @@ #define APIENTRY #endif -typedef void (APIENTRY *PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays); + +#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); @@ -119,8 +125,9 @@ 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 -PFNGLGENVERTEXARRAYSPROC gl_GenVertexArrays; +PFNGLGENVERTEXARRAYSPROC gl_GenVertexArrays; PFNGLBINDVERTEXARRAYPROC gl_BindVertexArray; PFNGLGENBUFFERSPROC gl_GenBuffers; PFNGLBINDBUFFERPROC gl_BindBuffer; @@ -142,9 +149,9 @@ PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv; -void initExtensionEntries(void) +void initExtensionEntries(void) { - gl_GenVertexArrays = (PFNGLGENVERTEXARRAYSPROC) glutGetProcAddress ("glGenVertexArrays"); + gl_GenVertexArrays = (PFNGLGENVERTEXARRAYSPROC) glutGetProcAddress ("glGenVertexArrays"); gl_BindVertexArray = (PFNGLBINDVERTEXARRAYPROC) glutGetProcAddress ("glBindVertexArray"); gl_GenBuffers = (PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers"); gl_BindBuffer = (PFNGLBINDBUFFERPROC) glutGetProcAddress ("glBindBuffer"); @@ -194,11 +201,11 @@ 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); + /* 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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2014-06-01 03:50:55
|
Revision: 1686 http://sourceforge.net/p/freeglut/code/1686 Author: dcnieho Date: 2014-06-01 03:50:51 +0000 (Sun, 01 Jun 2014) Log Message: ----------- add menu to opengl 3 demo. Should work as menu windows have their own classic context Modified Paths: -------------- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c Modified: trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c =================================================================== --- trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2014-05-31 22:47:17 UTC (rev 1685) +++ trunk/freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c 2014-06-01 03:50:51 UTC (rev 1686) @@ -434,8 +434,12 @@ } } +void samplemenu(int menuID) +{} + int main(int argc, char** argv) { + int menuA; glutInit(&argc, argv); glutInitDisplayMode (GLUT_SINGLE | GLUT_RGB); /* add command line argument "classic" for a pre-3.x context */ @@ -451,6 +455,15 @@ glutDisplayFunc(display); glutReshapeFunc(reshape); glutKeyboardFunc (keyboard); + + /* Add a menu. They have their own context and should thus work with forward compatible main windows too. */ + menuA = glutCreateMenu(samplemenu); + glutAddMenuEntry("Sub menu A1 (01)",1); + glutAddMenuEntry("Sub menu A2 (02)",2); + glutAddMenuEntry("Sub menu A3 (03)",3); + glutSetMenu(menuA); + glutAttachMenu(GLUT_RIGHT_BUTTON); + glutMainLoop(); return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |