diff options
author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-06 13:15:04 +0200 |
---|---|---|
committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-06 13:15:04 +0200 |
commit | f02f63997ce65530788a6dfcb28f11790a14d938 (patch) | |
tree | fc6aedb5256bfb84eb170cb82addd2b6605510f8 /progs | |
parent | e95e76e1255a3ad0ce604271301d090337b2e82b (diff) | |
parent | 9778731732b4753e79a1b786c65325a52392411d (diff) |
Merge branch 'master' into r300-compiler
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
Diffstat (limited to 'progs')
-rw-r--r-- | progs/samples/select.c | 6 | ||||
-rw-r--r-- | progs/tests/fbotest1.c | 2 | ||||
-rw-r--r-- | progs/tests/texcmp.c | 2 | ||||
-rw-r--r-- | progs/tests/zreaddraw.c | 6 |
4 files changed, 13 insertions, 3 deletions
diff --git a/progs/samples/select.c b/progs/samples/select.c index 2c8f333bfa..31ed93b9e0 100644 --- a/progs/samples/select.c +++ b/progs/samples/select.c @@ -92,6 +92,12 @@ static void Init(void) numObjects = 10; InitObjects(numObjects); glGetIntegerv(GL_VIEWPORT, vp); + +#if 0 /* debug - test culling */ + glCullFace(GL_BACK); + glFrontFace(GL_CW); + glEnable(GL_CULL_FACE); +#endif } static void Reshape(int width, int height) 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)); 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") ) { 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); } |