test/testrendertarget.c
changeset 6785 c094c438c0a6
parent 6247 b6212690f78d
child 7013 fe82d15464d1
     1.1 --- a/test/testrendertarget.c	Mon Dec 31 10:14:38 2012 -0800
     1.2 +++ b/test/testrendertarget.c	Mon Dec 31 10:26:38 2012 -0800
     1.3 @@ -15,13 +15,12 @@
     1.4  #include <stdio.h>
     1.5  #include <time.h>
     1.6  
     1.7 -#include "SDL.h"
     1.8 -#include "common.h"
     1.9 +#include "SDL_test_common.h"
    1.10  
    1.11  #define WINDOW_WIDTH    640
    1.12  #define WINDOW_HEIGHT   480
    1.13  
    1.14 -static CommonState *state;
    1.15 +static SDLTest_CommonState *state;
    1.16  
    1.17  typedef struct {
    1.18      SDL_Window *window;
    1.19 @@ -36,7 +35,7 @@
    1.20  static void
    1.21  quit(int rc)
    1.22  {
    1.23 -    CommonQuit(state);
    1.24 +    SDLTest_CommonQuit(state);
    1.25      exit(rc);
    1.26  }
    1.27  
    1.28 @@ -139,21 +138,21 @@
    1.29      Uint32 then, now;
    1.30  
    1.31      /* Initialize test framework */
    1.32 -    state = CommonCreateState(argv, SDL_INIT_VIDEO);
    1.33 +    state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
    1.34      if (!state) {
    1.35          return 1;
    1.36      }
    1.37      for (i = 1; i < argc;) {
    1.38          int consumed;
    1.39  
    1.40 -        consumed = CommonArg(state, i);
    1.41 +        consumed = SDLTest_CommonArg(state, i);
    1.42          if (consumed == 0) {
    1.43 -            fprintf(stderr, "Usage: %s %s\n", argv[0], CommonUsage(state));
    1.44 +            fprintf(stderr, "Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
    1.45              return 1;
    1.46          }
    1.47          i += consumed;
    1.48      }
    1.49 -    if (!CommonInit(state)) {
    1.50 +    if (!SDLTest_CommonInit(state)) {
    1.51          quit(2);
    1.52      }
    1.53  
    1.54 @@ -181,7 +180,7 @@
    1.55          /* Check for events */
    1.56          ++frames;
    1.57          while (SDL_PollEvent(&event)) {
    1.58 -            CommonEvent(state, &event, &done);
    1.59 +            SDLTest_CommonEvent(state, &event, &done);
    1.60          }
    1.61          for (i = 0; i < state->num_windows; ++i) {
    1.62              Draw(&drawstates[i]);