// External global variables
//shouldn't these exist here??? Prolly.
-extern SDL_Surface * surface, * mainSurface;
-extern Uint32 mainSurfaceFlags;
-extern int16 * backbuffer;
-extern SDL_Joystick * joystick;
+//And now, they do! :-)
+SDL_Surface * surface, * mainSurface;
+Uint32 mainSurfaceFlags;
+int16 * backbuffer;
+SDL_Joystick * joystick;
//
// Prime SDL and create surfaces
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)
{
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)
}
if (vjs.useOpenGL)
- sdlemu_init_opengl(surface, 1/*method*/, 2/*size*/, 0/*texture type (linear, nearest)*/);
+//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
if (vjs.useJoystick)
}
}
+ // Set up the backbuffer
+//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_NTSC * sizeof(int16));
+
return true;
}
SDL_FreeSurface(surface);
SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
SDL_Quit();
+
+ free(backbuffer);
}
//
exit(1);
}
- sprintf(window_title, "Virtual Jaguar (%i x %i)", (int)width, (int)height);
-
- if (!vjs.useOpenGL)
+ if (vjs.useOpenGL)
+ // This seems to work well for resizing (i.e., changes in the pixel width)...
+ sdlemu_resize_texture(surface, mainSurface, vjs.glFilter);
+ else
{
mainSurface = SDL_SetVideoMode(width, height, 16, mainSurfaceFlags);
}
}
+ sprintf(window_title, "Virtual Jaguar (%i x %i)", (int)width, (int)height);
SDL_WM_SetCaption(window_title, window_title);
// This seems to work well for resizing (i.e., changes in the pixel width)...
- if (vjs.useOpenGL)
- sdlemu_resize_texture(surface, mainSurface);
+// if (vjs.useOpenGL)
+// sdlemu_resize_texture(surface, mainSurface);
}
//