From 69fd8a1af20261d7c3e11b8b05ae93a493c5aa4a Mon Sep 17 00:00:00 2001 From: Darren Alton Date: Sat, 16 Aug 2008 11:16:08 +0000 Subject: [PATCH] Minor cleanups in renderer. --- src/video/nds/SDL_ndsrender.c | 13 ------------- test/nds-test-progs/general/source/main.c | 4 ++-- test/nds-test-progs/sprite2/source/testsprite2.c | 3 ++- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/video/nds/SDL_ndsrender.c b/src/video/nds/SDL_ndsrender.c index a79e2dbd4..e8fc98627 100644 --- a/src/video/nds/SDL_ndsrender.c +++ b/src/video/nds/SDL_ndsrender.c @@ -275,7 +275,6 @@ NDS_CreateRenderer(SDL_Window * window, Uint32 flags) NDS_OAM_Init(&(data->oam_copy)); /* init sprites. */ TRACE("-NDS_CreateRenderer\n"); - printf("renderer is %x\n", (u32)(renderer->UpdateTexture)); return renderer; } @@ -368,18 +367,6 @@ NDS_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) txdat->vram_pixels = (u16*)(data->sub ? BG_BMP_RAM_SUB(base) : BG_BMP_RAM(base)); - /* TESTING PURPOSES ONLY!!! - shows that the texture is set up properly on the screen. */ - for(i = 0; i < 256*192; ++i) { - txdat->vram_pixels[i] = RGB15(31,31,0)|0x8000; - } - printf("--one... two...\n"); - for(i = 0; i < 120; ++i) { - swiWaitForVBlank(); - } - for(i = 0; i < 256*192; ++i) { - txdat->vram_pixels[i] = 0; - } /*txdat->size = txdat->dim.pitch * texture->h;*/ } else { SDL_SetError("Out of NDS backgrounds."); diff --git a/test/nds-test-progs/general/source/main.c b/test/nds-test-progs/general/source/main.c index ca0937d3b..5531adf5c 100755 --- a/test/nds-test-progs/general/source/main.c +++ b/test/nds-test-progs/general/source/main.c @@ -28,7 +28,7 @@ int main(void) { puts(SDL_GetError()); return 1; } - puts("* initialized SDL\n"); + puts("* initialized SDL"); screen = SDL_SetVideoMode(256, 192, 15, SDL_SWSURFACE); if(!screen) { puts("# error setting video mode"); @@ -36,7 +36,7 @@ int main(void) { return 2; } screen->flags &= ~SDL_PREALLOC; - puts("* set video mode\n"); + puts("* set video mode"); stick = SDL_JoystickOpen(0); if(stick == NULL) { puts("# error opening joystick"); diff --git a/test/nds-test-progs/sprite2/source/testsprite2.c b/test/nds-test-progs/sprite2/source/testsprite2.c index 724fa8402..ae74966be 100755 --- a/test/nds-test-progs/sprite2/source/testsprite2.c +++ b/test/nds-test-progs/sprite2/source/testsprite2.c @@ -4,6 +4,7 @@ #include #include #include +#include #include "common.h" #define NUM_SPRITES 100 @@ -148,7 +149,7 @@ main(int argc, char *argv[]) int i, done; SDL_Event event; Uint32 then, now, frames; - + fatInitDefault(); /* Initialize parameters */ num_sprites = NUM_SPRITES;