X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2Fsmooth_opengl3%2Fsmooth_opengl3.c;h=abbdfb56c8e8409bd60ea83d0973597f00babd60;hb=08c51993b204bfe8d66dbf224151bbd0379b8a73;hp=c47792dc49cc7eb742f40392772082c5cc644565;hpb=d7f64e49353f6f30370780175c0adfcc1650f69a;p=freeglut diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c index c47792d..abbdfb5 100755 --- a/progs/demos/smooth_opengl3/smooth_opengl3.c +++ b/progs/demos/smooth_opengl3/smooth_opengl3.c @@ -1,7 +1,7 @@ /* * smooth_opengl3.c, based on smooth.c, which is (c) by SGI, see below. * This program demonstrates smooth shading in a way which is fully - * OpenGL-3.0-compliant. + * OpenGL-3.1-compliant. * A smooth shaded polygon is drawn in a 2-D projection. */ @@ -45,13 +45,14 @@ #include #include #include +#include #include /* report GL errors, if any, to stderr */ 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); } } @@ -66,6 +67,10 @@ void checkError(const char *functionName) #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,68 +91,51 @@ void checkError(const char *functionName) #define GL_INFO_LOG_LENGTH 0x8B84 #endif -typedef void (*PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); -PFNGLGENBUFFERSPROC gl_GenBuffers; +typedef ptrdiff_t ourGLsizeiptr; +typedef char ourGLchar; -typedef void (*PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -PFNGLBINDBUFFERPROC gl_BindBuffer; +#ifndef APIENTRY +#define APIENTRY +#endif -typedef void (*PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, - const GLvoid *data, GLenum usage); -PFNGLBUFFERDATAPROC gl_BufferData; +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); +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); +typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void); +typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); +typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program); +typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program); +typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); +typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); +typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog); +typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name); +typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); +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); -typedef GLuint (*PFNGLCREATESHADERPROC) (GLenum type); +PFNGLGENBUFFERSPROC gl_GenBuffers; +PFNGLBINDBUFFERPROC gl_BindBuffer; +PFNGLBUFFERDATAPROC gl_BufferData; 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; - -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) @@ -205,24 +193,26 @@ void initBuffer(void) checkError ("initBuffer"); } -const GLchar *vertexShaderSource[] = { - "#version 130\n", +const ourGLchar *vertexShaderSource[] = { + "#version 140\n", "uniform mat4 fg_ProjectionMatrix;\n", "in vec4 fg_Color;\n", "in vec4 fg_Vertex;\n", - "void main(void)\n", + "smooth out vec4 fg_SmoothColor;\n", + "void main()\n", "{\n", - " gl_FrontColor = fg_Color;\n", + " fg_SmoothColor = fg_Color;\n", " gl_Position = fg_ProjectionMatrix * fg_Vertex;\n", "}\n" }; -const GLchar *fragmentShaderSource[] = { - "#version 130\n", +const ourGLchar *fragmentShaderSource[] = { + "#version 140\n", + "smooth in vec4 fg_SmoothColor;\n", "out vec4 fg_FragColor;\n", "void main(void)\n", "{\n", - " fg_FragColor = gl_Color;\n", + " fg_FragColor = fg_SmoothColor;\n", "}\n" }; @@ -233,16 +223,16 @@ void compileAndCheck(GLuint shader) 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 +247,9 @@ void linkAndCheck(GLuint program) 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 +275,11 @@ GLuint fgVertexIndex; 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); @@ -311,7 +301,6 @@ void initShader(void) void initRendering(void) { glClearColor (0.0, 0.0, 0.0, 0.0); - glShadeModel (GL_SMOOTH); checkError ("initRendering"); } @@ -393,9 +382,9 @@ void reshape (int w, int h) { glViewport (0, 0, (GLsizei) w, (GLsizei) h); if (w <= h) { - loadOrtho2Df (projectionMatrix, 0.0, 30.0, 0.0, 30.0 * (GLfloat) h/(GLfloat) w); + loadOrtho2Df (projectionMatrix, 0.0f, 30.0f, 0.0f, 30.0f * (GLfloat) h/(GLfloat) w); } else { - loadOrtho2Df (projectionMatrix, 0.0, 30.0 * (GLfloat) w/(GLfloat) h, 0.0, 30.0); + loadOrtho2Df (projectionMatrix, 0.0f, 30.0f * (GLfloat) w/(GLfloat) h, 0.0f, 30.0f); } checkError ("reshape"); } @@ -413,9 +402,9 @@ int main(int argc, char** argv) { glutInit(&argc, argv); glutInitDisplayMode (GLUT_SINGLE | GLUT_RGB); - /* add command line argument "classic" for a pre-3.0 context */ + /* add command line argument "classic" for a pre-3.x context */ if ((argc != 2) || (strcmp (argv[1], "classic") != 0)) { - glutInitContextVersion (3, 0); + glutInitContextVersion (3, 1); glutInitContextFlags (GLUT_FORWARD_COMPATIBLE | GLUT_DEBUG); } glutInitWindowSize (500, 500);