X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo.cpp;h=ffeee21d0e70139820954f489fc358fad5f46a58;hb=ef1ce1b123d3a99b0646b40506e228d23757d033;hp=cd214e069d9d26c0bda4b94a194caa2d7d6cadc6;hpb=59ca39a29be645918de45bd144865ba6487f4009;p=virtualjaguar diff --git a/src/video.cpp b/src/video.cpp index cd214e0..ffeee21 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -58,9 +58,9 @@ bool InitVideo(void) mainSurfaceFlags |= SDL_FULLSCREEN; if (!vjs.useOpenGL) - mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT, 16, mainSurfaceFlags); + mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_NTSC, 16, mainSurfaceFlags); else - mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH * 2, VIRTUAL_SCREEN_HEIGHT * 2, 16, mainSurfaceFlags); + mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH * 2, VIRTUAL_SCREEN_HEIGHT_NTSC * 2, 16, mainSurfaceFlags); if (mainSurface == NULL) { @@ -71,7 +71,7 @@ bool InitVideo(void) SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar"); // Create the primary SDL display (16 BPP, 5/5/5 RGB format) - surface = SDL_CreateRGBSurface(SDL_SWSURFACE, VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT, + surface = SDL_CreateRGBSurface(SDL_SWSURFACE, VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_NTSC, 16, 0x7C00, 0x03E0, 0x001F, 0); if (surface == NULL) @@ -82,6 +82,7 @@ bool InitVideo(void) if (vjs.useOpenGL) //Should make another setting here, for either linear or nearest (instead of just picking one) +//And we have! ;-) sdlemu_init_opengl(surface, 1/*method*/, 2/*size*/, vjs.glFilter/*texture type (linear, nearest)*/); // Initialize Joystick support under SDL @@ -108,7 +109,7 @@ bool InitVideo(void) //To be safe, this should be 1280 * 625 * 2... // backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16)); backbuffer = (int16 *)malloc(1280 * 625 * sizeof(int16)); - memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT * sizeof(int16)); + memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT_NTSC * sizeof(int16)); return true; }