test/testgl2.c
changeset 6785 c094c438c0a6
parent 6382 64d54101773a
child 7194 987fb567bba9
     1.1 --- a/test/testgl2.c	Mon Dec 31 10:14:38 2012 -0800
     1.2 +++ b/test/testgl2.c	Mon Dec 31 10:26:38 2012 -0800
     1.3 @@ -14,7 +14,7 @@
     1.4  #include <string.h>
     1.5  #include <math.h>
     1.6  
     1.7 -#include "common.h"
     1.8 +#include "SDL_test_common.h"
     1.9  
    1.10  #ifdef __MACOS__
    1.11  #define HAVE_OPENGL
    1.12 @@ -27,7 +27,7 @@
    1.13  /* Undefine this if you want a flat cube instead of a rainbow cube */
    1.14  #define SHADED_CUBE
    1.15  
    1.16 -static CommonState *state;
    1.17 +static SDLTest_CommonState *state;
    1.18  static SDL_GLContext context;
    1.19  
    1.20  /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
    1.21 @@ -38,7 +38,7 @@
    1.22          /* SDL_GL_MakeCurrent(0, NULL); *//* doesn't do anything */
    1.23          SDL_GL_DeleteContext(context);
    1.24      }
    1.25 -    CommonQuit(state);
    1.26 +    SDLTest_CommonQuit(state);
    1.27      exit(rc);
    1.28  }
    1.29  
    1.30 @@ -186,14 +186,14 @@
    1.31      accel = -1;
    1.32  
    1.33      /* Initialize test framework */
    1.34 -    state = CommonCreateState(argv, SDL_INIT_VIDEO);
    1.35 +    state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
    1.36      if (!state) {
    1.37          return 1;
    1.38      }
    1.39      for (i = 1; i < argc;) {
    1.40          int consumed;
    1.41  
    1.42 -        consumed = CommonArg(state, i);
    1.43 +        consumed = SDLTest_CommonArg(state, i);
    1.44          if (consumed == 0) {
    1.45              if (SDL_strcasecmp(argv[i], "--fsaa") == 0) {
    1.46                  ++fsaa;
    1.47 @@ -207,7 +207,7 @@
    1.48          }
    1.49          if (consumed < 0) {
    1.50              fprintf(stderr, "Usage: %s %s [--fsaa] [--accel n]\n", argv[0],
    1.51 -                    CommonUsage(state));
    1.52 +                    SDLTest_CommonUsage(state));
    1.53              quit(1);
    1.54          }
    1.55          i += consumed;
    1.56 @@ -228,7 +228,7 @@
    1.57          state->gl_accelerated = accel;
    1.58      }
    1.59  
    1.60 -    if (!CommonInit(state)) {
    1.61 +    if (!SDLTest_CommonInit(state)) {
    1.62          quit(2);
    1.63      }
    1.64  
    1.65 @@ -327,7 +327,7 @@
    1.66          /* Check for events */
    1.67          ++frames;
    1.68          while (SDL_PollEvent(&event)) {
    1.69 -            CommonEvent(state, &event, &done);
    1.70 +            SDLTest_CommonEvent(state, &event, &done);
    1.71          }
    1.72          for (i = 0; i < state->num_windows; ++i) {
    1.73              int w, h;