From b3232e9280ff7104d68b7e4f229604f574a4e37a Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 31 Aug 2009 14:56:34 -0600 Subject: progs/tests: disable depth test for second glDrawPixels We don't want to z-test that glDrawPixels. Also, set the raster color to red when drawing GL_DEPTH_COMPONENT image to aid in debugging. --- progs/tests/zreaddraw.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'progs/tests') diff --git a/progs/tests/zreaddraw.c b/progs/tests/zreaddraw.c index 2cbfeb6ff1..8839e10836 100644 --- a/progs/tests/zreaddraw.c +++ b/progs/tests/zreaddraw.c @@ -24,6 +24,8 @@ static void Display(void) glClearColor(0.5, 0.5, 0.5, 1.0); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glEnable(GL_DEPTH_TEST); + /* draw a sphere */ glViewport(0, 0, 100, 100); glMatrixMode(GL_PROJECTION); @@ -46,9 +48,12 @@ static void Display(void) /* draw depth image with scaling (into z buffer) */ glPixelZoom(4.0, 4.0); + glColor4f(1, 0, 0, 0); glWindowPos2i(100, 0); glDrawPixels(100, 100, GL_DEPTH_COMPONENT, GL_FLOAT, depth); + glDisable(GL_DEPTH_TEST); + /* read back scaled depth image */ glReadPixels(100, 0, 400, 400, GL_DEPTH_COMPONENT, GL_FLOAT, depth2); /* draw as luminance */ @@ -96,7 +101,6 @@ static void Init(void) glLightfv(GL_LIGHT0, GL_POSITION, pos); glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); - glEnable(GL_DEPTH_TEST); } -- cgit v1.2.3 From ea26f28c8fd68593a1f47053e04e9d6e110a23b9 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 3 Sep 2009 11:33:53 +1000 Subject: tests/texcmp: glewInit in wrong place --- progs/tests/texcmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'progs/tests') diff --git a/progs/tests/texcmp.c b/progs/tests/texcmp.c index 52c504a318..d1e829d1b7 100644 --- a/progs/tests/texcmp.c +++ b/progs/tests/texcmp.c @@ -371,11 +371,11 @@ int main( int argc, char *argv[] ) glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE ); if (glutCreateWindow(argv[0]) <= 0) { - glewInit(); printf("Couldn't create window\n"); exit(0); } + glewInit(); gl_version = atof( (const char *) glGetString( GL_VERSION ) ); if ( (gl_version < 1.3) && !glutExtensionSupported("GL_ARB_texture_compression") ) { -- cgit v1.2.3 From 375a6b4c4a68fff0567b304fc24de78ea8250124 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 1 Sep 2009 08:53:31 -0600 Subject: progs/tests: re-enable exit() call See bug 21267. --- progs/tests/fbotest1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'progs/tests') diff --git a/progs/tests/fbotest1.c b/progs/tests/fbotest1.c index 8dac21494e..0cd7f95c35 100644 --- a/progs/tests/fbotest1.c +++ b/progs/tests/fbotest1.c @@ -127,7 +127,7 @@ Init( void ) if (!glutExtensionSupported("GL_EXT_framebuffer_object")) { printf("GL_EXT_framebuffer_object not found!\n"); - /*exit(0);*/ + exit(0); } printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER)); -- cgit v1.2.3 From 8947cf67288ab9a8bf87e9029d3fc1d4073cc88b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 8 Sep 2009 16:47:30 -0600 Subject: progs/tests: added Z invert option --- progs/tests/zreaddraw.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'progs/tests') diff --git a/progs/tests/zreaddraw.c b/progs/tests/zreaddraw.c index 8839e10836..0821d5fb35 100644 --- a/progs/tests/zreaddraw.c +++ b/progs/tests/zreaddraw.c @@ -12,6 +12,7 @@ #include static GLint WinWidth = 500, WinHeight = 500; +static GLboolean Invert = GL_FALSE; static void Display(void) @@ -50,7 +51,15 @@ static void Display(void) glPixelZoom(4.0, 4.0); glColor4f(1, 0, 0, 0); glWindowPos2i(100, 0); + if (Invert) { + glPixelTransferf(GL_DEPTH_SCALE, -1.0); + glPixelTransferf(GL_DEPTH_BIAS, 1.0); + } glDrawPixels(100, 100, GL_DEPTH_COMPONENT, GL_FLOAT, depth); + if (Invert) { + glPixelTransferf(GL_DEPTH_SCALE, 1.0); + glPixelTransferf(GL_DEPTH_BIAS, 0.0); + } glDisable(GL_DEPTH_TEST); @@ -77,6 +86,9 @@ static void Key(unsigned char key, int x, int y) (void) x; (void) y; switch (key) { + case 'i': + Invert = !Invert; + break; case 27: exit(0); break; -- cgit v1.2.3