From 9405ec62512ca7195905644d9c7f271ae01662c5 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 28 Sep 2007 21:04:56 -0600 Subject: temporary hack to test nested conditionals --- progs/demos/arbfslight.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'progs/demos/arbfslight.c') diff --git a/progs/demos/arbfslight.c b/progs/demos/arbfslight.c index 69575f0623..39c9226b3d 100644 --- a/progs/demos/arbfslight.c +++ b/progs/demos/arbfslight.c @@ -208,7 +208,21 @@ static void Init (void) " // Compute dot product of light direction and normal vector\n" " float dotProd = max (dot (lightPos, normalize (normal)), 0.0);\n" " // Compute diffuse and specular contributions\n" +#if 0 " gl_FragColor = diffuse * dotProd + specular * pow (dotProd, 20.0);\n" +#else + " if (normal.y > 0.0) { \n" + " gl_FragColor = diffuse * dotProd + specular * pow (dotProd, 20.0);\n" + " } \n" + " else { \n" + " if (normal.x < 0.0) { \n" + " gl_FragColor = vec4(1, 0, 0, 0); \n" + " } \n" + " else { \n" + " gl_FragColor = vec4(1, 1, 0, 0); \n" + " } \n" + " } \n" +#endif "}\n" ; static const char *vertShaderText = -- cgit v1.2.3 From 2727cfddbf64add52181bed999938a90811f01a3 Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 29 Sep 2007 10:44:05 -0600 Subject: hack in some code to test loops, break --- progs/demos/arbfslight.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'progs/demos/arbfslight.c') diff --git a/progs/demos/arbfslight.c b/progs/demos/arbfslight.c index 39c9226b3d..d6363eafeb 100644 --- a/progs/demos/arbfslight.c +++ b/progs/demos/arbfslight.c @@ -210,7 +210,7 @@ static void Init (void) " // Compute diffuse and specular contributions\n" #if 0 " gl_FragColor = diffuse * dotProd + specular * pow (dotProd, 20.0);\n" -#else +#elif 1 /* test IF/ELSE/ENDIF */ " if (normal.y > 0.0) { \n" " gl_FragColor = diffuse * dotProd + specular * pow (dotProd, 20.0);\n" " } \n" @@ -222,6 +222,16 @@ static void Init (void) " gl_FragColor = vec4(1, 1, 0, 0); \n" " } \n" " } \n" +#elif 1 /* test LOOP */ + " while (1) { \n" + " if (normal.y >= 0.0) { \n" + " gl_FragColor = vec4(1, 0, 0, 0); \n" + " break; \n" + " } else { \n" + " gl_FragColor = diffuse * dotProd + specular * pow (dotProd, 20.0);\n" + " break; \n" + " } \n" + " } \n" #endif "}\n" ; -- cgit v1.2.3 From a1b4285c5cb03e52850751c2f74d131e2b7a00c8 Mon Sep 17 00:00:00 2001 From: michal Date: Sat, 27 Oct 2007 18:42:20 +0100 Subject: Fix fragment shader. --- progs/demos/arbfslight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'progs/demos/arbfslight.c') diff --git a/progs/demos/arbfslight.c b/progs/demos/arbfslight.c index d6363eafeb..a84491d34f 100644 --- a/progs/demos/arbfslight.c +++ b/progs/demos/arbfslight.c @@ -208,7 +208,7 @@ static void Init (void) " // Compute dot product of light direction and normal vector\n" " float dotProd = max (dot (lightPos, normalize (normal)), 0.0);\n" " // Compute diffuse and specular contributions\n" -#if 0 +#if 1 " gl_FragColor = diffuse * dotProd + specular * pow (dotProd, 20.0);\n" #elif 1 /* test IF/ELSE/ENDIF */ " if (normal.y > 0.0) { \n" -- cgit v1.2.3 From e6479c62504ec828e25cd6b46f8999f3a26a482c Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Tue, 24 Feb 2009 12:02:24 +0000 Subject: demos: add some fflushes for windows --- progs/demos/arbfplight.c | 1 + progs/demos/arbfslight.c | 1 + progs/demos/fslight.c | 1 + progs/demos/gearbox.c | 1 + progs/demos/gears.c | 1 + progs/demos/geartrain.c | 1 + progs/demos/gloss.c | 1 + progs/demos/glslnoise.c | 1 + progs/demos/reflect.c | 1 + progs/demos/streaming_rect.c | 1 + progs/demos/texcyl.c | 1 + 11 files changed, 11 insertions(+) (limited to 'progs/demos/arbfslight.c') diff --git a/progs/demos/arbfplight.c b/progs/demos/arbfplight.c index 401bfb4968..7b7a12bf88 100644 --- a/progs/demos/arbfplight.c +++ b/progs/demos/arbfplight.c @@ -92,6 +92,7 @@ static void Redisplay( void ) GLfloat seconds = (t - T0) / 1000.0; GLfloat fps = Frames / seconds; printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps); + fflush(stdout); T0 = t; Frames = 0; } diff --git a/progs/demos/arbfslight.c b/progs/demos/arbfslight.c index a84491d34f..275c85105e 100644 --- a/progs/demos/arbfslight.c +++ b/progs/demos/arbfslight.c @@ -105,6 +105,7 @@ static void Redisplay (void) GLfloat seconds = (GLfloat) (t - t0) / 1000.0f; GLfloat fps = frames / seconds; printf ("%d frames in %6.3f seconds = %6.3f FPS\n", frames, seconds, fps); + fflush(stdout); t0 = t; frames = 0; } diff --git a/progs/demos/fslight.c b/progs/demos/fslight.c index e79b5cc197..41a13cc9f4 100644 --- a/progs/demos/fslight.c +++ b/progs/demos/fslight.c @@ -105,6 +105,7 @@ Redisplay(void) GLfloat fps = frames / seconds; printf("%d frames in %6.3f seconds = %6.3f FPS\n", frames, seconds, fps); + fflush(stdout); t0 = t; frames = 0; } diff --git a/progs/demos/gearbox.c b/progs/demos/gearbox.c index 35bde04417..2dcf32f92f 100644 --- a/progs/demos/gearbox.c +++ b/progs/demos/gearbox.c @@ -314,6 +314,7 @@ draw(void) GLfloat seconds = (t - T0) / 1000.0; GLfloat fps = Frames / seconds; printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps); + fflush(stdout); T0 = t; Frames = 0; } diff --git a/progs/demos/gears.c b/progs/demos/gears.c index 2a9fefefb5..6016162d6f 100644 --- a/progs/demos/gears.c +++ b/progs/demos/gears.c @@ -219,6 +219,7 @@ draw(void) GLfloat seconds = (t - T0) / 1000.0; GLfloat fps = Frames / seconds; printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps); + fflush(stdout); T0 = t; Frames = 0; if ((t >= 999.0 * autoexit) && (autoexit)) { diff --git a/progs/demos/geartrain.c b/progs/demos/geartrain.c index 8363f2abc6..8fe405e807 100644 --- a/progs/demos/geartrain.c +++ b/progs/demos/geartrain.c @@ -905,6 +905,7 @@ draw (void) GLfloat seconds = (t - T0) / 1000.0; GLfloat fps = Frames / seconds; printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps); + fflush(stdout); T0 = t; Frames = 0; } diff --git a/progs/demos/gloss.c b/progs/demos/gloss.c index b2126e3267..69694b23a0 100644 --- a/progs/demos/gloss.c +++ b/progs/demos/gloss.c @@ -132,6 +132,7 @@ static void Display( void ) GLfloat seconds = (t - T0) / 1000.0; GLfloat fps = Frames / seconds; printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps); + fflush(stdout); T0 = t; Frames = 0; } diff --git a/progs/demos/glslnoise.c b/progs/demos/glslnoise.c index 4ee1292816..e972b62673 100644 --- a/progs/demos/glslnoise.c +++ b/progs/demos/glslnoise.c @@ -65,6 +65,7 @@ static void Redisplay (void) GLfloat seconds = (GLfloat) (t - t0) / 1000.0f; GLfloat fps = frames / seconds; printf ("%d frames in %6.3f seconds = %6.3f FPS\n", frames, seconds, fps); + fflush(stdout); t0 = t; frames = 0; } diff --git a/progs/demos/reflect.c b/progs/demos/reflect.c index 0bec0663bc..b72af12885 100644 --- a/progs/demos/reflect.c +++ b/progs/demos/reflect.c @@ -401,6 +401,7 @@ DrawWindow(void) GLfloat seconds = (t - t0) / 1000.0; GLfloat fps = frames / seconds; printf("%d frames in %g seconds = %g FPS\n", frames, seconds, fps); + fflush(stdout); t0 = t; frames = 0; } diff --git a/progs/demos/streaming_rect.c b/progs/demos/streaming_rect.c index 294f9c3060..f65ac4ce36 100644 --- a/progs/demos/streaming_rect.c +++ b/progs/demos/streaming_rect.c @@ -153,6 +153,7 @@ static void Display( void ) GLfloat fps = Frames / seconds; printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps); + fflush(stdout); drift_increment = 2.2 * seconds / Frames; T0 = t; diff --git a/progs/demos/texcyl.c b/progs/demos/texcyl.c index e3b0303975..0e6089bced 100644 --- a/progs/demos/texcyl.c +++ b/progs/demos/texcyl.c @@ -79,6 +79,7 @@ static void Display( void ) GLfloat seconds = (t - T0) / 1000.0; GLfloat fps = Frames / seconds; printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps); + fflush(stdout); T0 = t; Frames = 0; } -- cgit v1.2.3