X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo.cpp;h=4600375f3f41a39366e73f504ab5bf22657821ee;hb=2f2984007c9a7097057cadd683ee399db2c7433e;hp=601fc307c9cb6b34e9165cff708e7c68548db11c;hpb=a1ad40785ac6d954051e4e5882436da9a58cc3a6;p=virtualjaguar

diff --git a/src/video.cpp b/src/video.cpp
index 601fc30..4600375 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -4,7 +4,6 @@
 // by James L. Hammons
 //
 
-#include "types.h"
 #include "tom.h"
 #include "sdlemu_opengl.h"
 #include "settings.h"
@@ -20,17 +19,10 @@ int16 * backbuffer;
 SDL_Joystick * joystick;
 
 //
-// Prime SDL and create surfaces
+// Create SDL/OpenGL surfaces
 //
 bool InitVideo(void)
 {
-	// Set up SDL library
-	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0)
-	{
-		WriteLog("VJ: Could not initialize the SDL library: %s", SDL_GetError());
-		return false;
-	}
-
 	// Get proper info about the platform we're running on...
 	const SDL_VideoInfo * info = SDL_GetVideoInfo();
 
@@ -58,9 +50,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 +63,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)
@@ -81,7 +73,9 @@ bool InitVideo(void)
 	}
 
 	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)
@@ -107,7 +101,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;
 }
@@ -122,9 +116,6 @@ void VideoDone(void)
 
 	SDL_JoystickClose(joystick);
 	SDL_FreeSurface(surface);
-	SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
-	SDL_Quit();
-
 	free(backbuffer);
 }
 
@@ -169,9 +160,10 @@ void ResizeScreen(uint32 width, uint32 height)
 		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);
 
@@ -182,11 +174,12 @@ void ResizeScreen(uint32 width, uint32 height)
 		}
 	}
 
+	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);
 }
 
 //