From 637f06dcdc2e5b29cbc39445b7141e6a496e1585 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 17 Dec 2008 13:58:05 -0700 Subject: util: check for frag/vertShader=0 before attaching --- progs/util/shaderutil.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'progs') diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c index 745851395a7..2f1c4e38b30 100644 --- a/progs/util/shaderutil.c +++ b/progs/util/shaderutil.c @@ -6,6 +6,7 @@ */ +#include #include #include #include @@ -106,8 +107,12 @@ LinkShaders(GLuint vertShader, GLuint fragShader) { GLuint program = glCreateProgram_func(); - glAttachShader_func(program, fragShader); - glAttachShader_func(program, vertShader); + assert(vertShader || fragShader); + + if (fragShader) + glAttachShader_func(program, fragShader); + if (vertShader) + glAttachShader_func(program, vertShader); glLinkProgram_func(program); /* check link */ -- cgit v1.2.3 From 1cb680d06bf4c7a6789ecf8e949271e0b6d8bbf2 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 17 Dec 2008 13:58:31 -0700 Subject: demos: add test of vertex-only and fragment-only shader programs --- progs/glsl/Makefile | 9 ++ progs/glsl/vert-or-frag-only.c | 191 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 200 insertions(+) create mode 100644 progs/glsl/vert-or-frag-only.c (limited to 'progs') diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index 856de91c905..a944abe9085 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -27,6 +27,7 @@ PROGS = \ toyball \ twoside \ trirast \ + vert-or-frag-only \ vert-tex @@ -186,6 +187,14 @@ trirast: trirast.o shaderutil.o $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@ +vert-or-frag-only.o: vert-or-frag-only.c extfuncs.h shaderutil.h + $(CC) -c -I$(INCDIR) $(CFLAGS) vert-or-frag-only.c + +vert-or-frag-only: vert-or-frag-only.o shaderutil.o + $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-or-frag-only.o shaderutil.o $(LIBS) -o $@ + + + vert-tex.o: vert-tex.c extfuncs.h shaderutil.h $(CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c diff --git a/progs/glsl/vert-or-frag-only.c b/progs/glsl/vert-or-frag-only.c new file mode 100644 index 00000000000..f6eedd8327c --- /dev/null +++ b/progs/glsl/vert-or-frag-only.c @@ -0,0 +1,191 @@ +/** + * Draw two quads, one using only a vertex shader, the other only with a + * fragment shader. They should appear the same. + * 17 Dec 2008 + * Brian Paul + */ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include "extfuncs.h" +#include "shaderutil.h" + + +static char *FragProgFile = NULL; +static char *VertProgFile = NULL; +static GLuint FragShader; +static GLuint VertShader; +static GLuint VertProgram; /* w/out vertex shader */ +static GLuint FragProgram; /* w/out fragment shader */ +static GLint Win = 0; + + +static void +DrawQuadColor(void) +{ + glBegin(GL_QUADS); + glColor3f(1, 0, 0); glVertex2f(-1, -1); + glColor3f(0, 1, 0); glVertex2f( 1, -1); + glColor3f(0, 0, 1); glVertex2f( 1, 1); + glColor3f(1, 0, 1); glVertex2f(-1, 1); + glEnd(); +} + + +/** as above, but specify color via texcoords */ +static void +DrawQuadTex(void) +{ + glBegin(GL_QUADS); + glTexCoord3f(1, 0, 0); glVertex2f(-1, -1); + glTexCoord3f(0, 1, 0); glVertex2f( 1, -1); + glTexCoord3f(0, 0, 1); glVertex2f( 1, 1); + glTexCoord3f(1, 0, 1); glVertex2f(-1, 1); + glEnd(); +} + + +static void +Redisplay(void) +{ + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + /* render with vertex shader only */ + glUseProgram_func(VertProgram); + glPushMatrix(); + glTranslatef(-1.5, 0, 0); + DrawQuadTex(); + glPopMatrix(); + + /* render with fragment shader only */ + glUseProgram_func(FragProgram); + glPushMatrix(); + glTranslatef(+1.5, 0, 0); + DrawQuadColor(); + glPopMatrix(); + + glutSwapBuffers(); +} + + +static void +Reshape(int width, int height) +{ + glViewport(0, 0, width, height); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(-4, 4, -2, 2, -1, 1); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); +} + + +static void +CleanUp(void) +{ + glDeleteShader_func(FragShader); + glDeleteShader_func(VertShader); + glDeleteProgram_func(VertProgram); + glDeleteProgram_func(FragProgram); + glutDestroyWindow(Win); +} + + +static void +Key(unsigned char key, int x, int y) +{ + (void) x; + (void) y; + switch(key) { + case 27: + CleanUp(); + exit(0); + break; + } + glutPostRedisplay(); +} + + +static void +Init(void) +{ + static const char *fragShaderText = + "void main() {\n" + " gl_FragColor = gl_Color;\n" + "}\n"; + static const char *vertShaderText = + "void main() {\n" + " gl_Position = ftransform();\n" + " gl_FrontColor = gl_MultiTexCoord0;\n" /* see DrawQuadTex() */ + "}\n"; + + if (!ShadersSupported()) + exit(1); + + GetExtensionFuncs(); + + if (FragProgFile) + FragShader = CompileShaderFile(GL_FRAGMENT_SHADER, FragProgFile); + else + FragShader = CompileShaderText(GL_FRAGMENT_SHADER, fragShaderText); + + if (VertProgFile) + VertShader = CompileShaderFile(GL_VERTEX_SHADER, VertProgFile); + else + VertShader = CompileShaderText(GL_VERTEX_SHADER, vertShaderText); + + VertProgram = LinkShaders(VertShader, 0); + FragProgram = LinkShaders(0, FragShader); + + glClearColor(0.3f, 0.3f, 0.3f, 0.0f); + glEnable(GL_DEPTH_TEST); + + printf("GL_RENDERER = %s\n",(const char *) glGetString(GL_RENDERER)); + + assert(glIsProgram_func(VertProgram)); + assert(glIsProgram_func(FragProgram)); + assert(glIsShader_func(FragShader)); + assert(glIsShader_func(VertShader)); + + glColor3f(1, 0, 0); +} + + +static void +ParseOptions(int argc, char *argv[]) +{ + int i; + for (i = 1; i < argc; i++) { + if (strcmp(argv[i], "-fs") == 0) { + FragProgFile = argv[i+1]; + } + else if (strcmp(argv[i], "-vs") == 0) { + VertProgFile = argv[i+1]; + } + } +} + + +int +main(int argc, char *argv[]) +{ + glutInit(&argc, argv); + glutInitWindowPosition( 0, 0); + glutInitWindowSize(400, 200); + glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); + Win = glutCreateWindow(argv[0]); + glutReshapeFunc(Reshape); + glutKeyboardFunc(Key); + glutDisplayFunc(Redisplay); + ParseOptions(argc, argv); + Init(); + glutMainLoop(); + return 0; +} -- cgit v1.2.3 From f43019b226b6fa896715f222f7b6bbe5dbccdb37 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 18 Dec 2008 09:48:20 -0700 Subject: demos: all glutDestroyWindow() upon exit to test query object clean-up --- progs/demos/arbocclude.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'progs') diff --git a/progs/demos/arbocclude.c b/progs/demos/arbocclude.c index ddbb1f1b759..6bf4fd218b9 100644 --- a/progs/demos/arbocclude.c +++ b/progs/demos/arbocclude.c @@ -37,7 +37,7 @@ static GLboolean Anim = GL_TRUE; static GLfloat Xpos = 0; static GLuint OccQuery; - +static GLint Win = 0; static void @@ -204,6 +204,7 @@ static void Key( unsigned char key, int x, int y ) (void) y; switch (key) { case 27: + glutDestroyWindow(Win); exit(0); break; case ' ': @@ -271,7 +272,7 @@ int main( int argc, char *argv[] ) glutInitWindowPosition( 0, 0 ); glutInitWindowSize( 400, 400 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); - glutCreateWindow(argv[0]); + Win = glutCreateWindow(argv[0]); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutSpecialFunc( SpecialKey ); -- cgit v1.2.3