This file now contains only code prefixed with piglit_framework_fbo. The killed code exists in piglit-framework.c.
CC: Pauli Nieminen <[email protected]> Signed-off-by: Chad Versace <[email protected]> --- tests/util/piglit-framework-fbo.c | 152 +------------------------------------ 1 file changed, 1 insertion(+), 151 deletions(-) diff --git a/tests/util/piglit-framework-fbo.c b/tests/util/piglit-framework-fbo.c index dac04b7..eec58db 100644 --- a/tests/util/piglit-framework-fbo.c +++ b/tests/util/piglit-framework-fbo.c @@ -21,28 +21,17 @@ * IN THE SOFTWARE. */ -/** - * Simple test case framework. - * - * \author Ian Romanick <[email protected]> - */ #include <assert.h> #include <string.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> #include "piglit-util.h" -#include "piglit-framework.h" + #ifdef USE_GLX #include "piglit-glx-util.h" #endif -int piglit_automatic = 0; -bool piglit_use_fbo = false; -unsigned piglit_winsys_fbo = 0; -static int piglit_window; -static enum piglit_result result; #ifdef USE_GLX Display *piglit_glx_dpy; Window piglit_glx_window; @@ -50,68 +39,6 @@ XVisualInfo *piglit_glx_visinfo; GLXContext piglit_glx_context; #endif -static void -display(void) -{ - result = piglit_display(); - - if (piglit_automatic) { - glutDestroyWindow(piglit_window); -#ifdef FREEGLUT - /* Tell GLUT to clean up and exit, so that we can - * reasonably valgrind our testcases for memory - * leaks by the GL. - */ - glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, - GLUT_ACTION_GLUTMAINLOOP_RETURNS); - glutLeaveMainLoop(); -#else - piglit_report_result(result); -#endif - } -} - -static void -reshape(int w, int h) -{ - piglit_width = w; - piglit_height = h; - - glViewport(0, 0, w, h); -} - -/* Swapbuffers the results to the window in non-auto mode. */ -void -piglit_present_results() -{ - if (!piglit_automatic && !piglit_use_fbo) - glutSwapBuffers(); -} - -static void -piglit_framework_glut_init(int argc, char *argv[]) -{ - piglit_glutInit(argc, argv); - - glutInitWindowPosition(0, 0); - glutInitWindowSize(piglit_width, piglit_height); - glutInitDisplayMode(piglit_window_mode); - piglit_window = glutCreateWindow(argv[0]); - -#ifdef USE_GLX - if (piglit_automatic) - piglit_glx_set_no_input(); -#endif - - glutDisplayFunc(display); - glutReshapeFunc(reshape); - glutKeyboardFunc(piglit_escape_exit_key); - -#ifdef USE_OPENGL - glewInit(); -#endif -} - #ifdef USE_GLX static void piglit_framework_fbo_glx_init() @@ -231,80 +158,3 @@ piglit_framework_fbo_init() return false; #endif /* USE_GLX */ } - -static void -delete_arg(char *argv[], int argc, int arg) -{ - int i; - - for (i = arg + 1; i < argc; i++) { - argv[i - 1] = argv[i]; - } -} - -int main(int argc, char *argv[]) -{ - int j; - - /* Find/remove "-auto" and "-fbo" from the argument vector. - */ - for (j = 1; j < argc; j++) { - if (!strcmp(argv[j], "-auto")) { - piglit_automatic = 1; - delete_arg(argv, argc--, j--); - } else if (!strcmp(argv[j], "-fbo")) { - piglit_use_fbo = true; - delete_arg(argv, argc--, j--); - } else if (!strcmp(argv[j], "-rlimit")) { - char *ptr; - unsigned long lim; - int i; - - j++; - if (j >= argc) { - fprintf(stderr, - "-rlimit requires an argument\n"); - piglit_report_result(PIGLIT_FAIL); - } - - lim = strtoul(argv[j], &ptr, 0); - if (ptr == argv[j]) { - fprintf(stderr, - "-rlimit requires an argument\n"); - piglit_report_result(PIGLIT_FAIL); - } - - piglit_set_rlimit(lim); - - /* Remove 2 arguments (hence the 'i - 2') from the - * command line. - */ - for (i = j + 1; i < argc; i++) { - argv[i - 2] = argv[i]; - } - argc -= 2; - j -= 2; - } - } - - if (piglit_use_fbo) { - if (!piglit_framework_fbo_init()) - piglit_use_fbo = false; - } - - if (!piglit_use_fbo) - piglit_framework_glut_init(argc, argv); - - piglit_init(argc, argv); - - if (piglit_use_fbo) { - result = piglit_display(); - piglit_framework_fbo_destroy(); - } else { - glutMainLoop(); - } - - piglit_report_result(result); - /* UNREACHED */ - return 0; -} -- 1.7.10.1 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
