test/testdraw2.c
changeset 6785 c094c438c0a6
parent 5535 96594ac5fd1a
child 7191 75360622e65f
     1.1 --- a/test/testdraw2.c	Mon Dec 31 10:14:38 2012 -0800
     1.2 +++ b/test/testdraw2.c	Mon Dec 31 10:26:38 2012 -0800
     1.3 @@ -16,11 +16,11 @@
     1.4  #include <stdio.h>
     1.5  #include <time.h>
     1.6  
     1.7 -#include "common.h"
     1.8 +#include "SDL_test_common.h"
     1.9  
    1.10  #define NUM_OBJECTS	100
    1.11  
    1.12 -static CommonState *state;
    1.13 +static SDLTest_CommonState *state;
    1.14  static int num_objects;
    1.15  static SDL_bool cycle_color;
    1.16  static SDL_bool cycle_alpha;
    1.17 @@ -180,14 +180,14 @@
    1.18      num_objects = NUM_OBJECTS;
    1.19  
    1.20      /* Initialize test framework */
    1.21 -    state = CommonCreateState(argv, SDL_INIT_VIDEO);
    1.22 +    state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
    1.23      if (!state) {
    1.24          return 1;
    1.25      }
    1.26      for (i = 1; i < argc;) {
    1.27          int consumed;
    1.28  
    1.29 -        consumed = CommonArg(state, i);
    1.30 +        consumed = SDLTest_CommonArg(state, i);
    1.31          if (consumed == 0) {
    1.32              consumed = -1;
    1.33              if (SDL_strcasecmp(argv[i], "--blend") == 0) {
    1.34 @@ -220,12 +220,12 @@
    1.35          if (consumed < 0) {
    1.36              fprintf(stderr,
    1.37                      "Usage: %s %s [--blend none|blend|add|mod] [--cyclecolor] [--cyclealpha]\n",
    1.38 -                    argv[0], CommonUsage(state));
    1.39 +                    argv[0], SDLTest_CommonUsage(state));
    1.40              return 1;
    1.41          }
    1.42          i += consumed;
    1.43      }
    1.44 -    if (!CommonInit(state)) {
    1.45 +    if (!SDLTest_CommonInit(state)) {
    1.46          return 2;
    1.47      }
    1.48  
    1.49 @@ -247,7 +247,7 @@
    1.50          /* Check for events */
    1.51          ++frames;
    1.52          while (SDL_PollEvent(&event)) {
    1.53 -            CommonEvent(state, &event, &done);
    1.54 +            SDLTest_CommonEvent(state, &event, &done);
    1.55          }
    1.56          for (i = 0; i < state->num_windows; ++i) {
    1.57              SDL_Renderer *renderer = state->renderers[i];
    1.58 @@ -262,7 +262,7 @@
    1.59          }
    1.60      }
    1.61  
    1.62 -    CommonQuit(state);
    1.63 +    SDLTest_CommonQuit(state);
    1.64  
    1.65      /* Print out some timing information */
    1.66      now = SDL_GetTicks();