test/testgles.c
changeset 6785 c094c438c0a6
parent 5535 96594ac5fd1a
child 7517 965d57022c01
     1.1 --- a/test/testgles.c	Mon Dec 31 10:14:38 2012 -0800
     1.2 +++ b/test/testgles.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  #if defined(__IPHONEOS__) || defined(__ANDROID__)
    1.11  #define HAVE_OPENGLES
    1.12 @@ -24,7 +24,7 @@
    1.13  
    1.14  #include "SDL_opengles.h"
    1.15  
    1.16 -static CommonState *state;
    1.17 +static SDLTest_CommonState *state;
    1.18  static SDL_GLContext *context = NULL;
    1.19  static int depth = 16;
    1.20  
    1.21 @@ -44,7 +44,7 @@
    1.22          SDL_free(context);
    1.23      }
    1.24  
    1.25 -    CommonQuit(state);
    1.26 +    SDLTest_CommonQuit(state);
    1.27      exit(rc);
    1.28  }
    1.29  
    1.30 @@ -115,14 +115,14 @@
    1.31      accel = 0;
    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 @@ -144,7 +144,7 @@
    1.48          }
    1.49          if (consumed < 0) {
    1.50              fprintf(stderr, "Usage: %s %s [--fsaa] [--accel] [--zdepth %%d]\n", argv[0],
    1.51 -                    CommonUsage(state));
    1.52 +                    SDLTest_CommonUsage(state));
    1.53              quit(1);
    1.54          }
    1.55          i += consumed;
    1.56 @@ -163,7 +163,7 @@
    1.57      if (accel) {
    1.58          state->gl_accelerated=1;
    1.59      }
    1.60 -    if (!CommonInit(state)) {
    1.61 +    if (!SDLTest_CommonInit(state)) {
    1.62          quit(2);
    1.63      }
    1.64  
    1.65 @@ -306,7 +306,7 @@
    1.66                          break;
    1.67                  }
    1.68              }
    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              status = SDL_GL_MakeCurrent(state->windows[i], context[i]);