M src/platform/sdl/CMakeLists.txt → src/platform/sdl/CMakeLists.txt

@@ -70,7 +70,6 @@
 if(BUILD_PANDORA)
 	list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/pandora-sdl.c)
 else()
-	#list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sw-sdl.c)
 	if(BUILD_GL)
 		list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/gl-sdl.c)
 		list(APPEND PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/opengl/gl.c ${CMAKE_SOURCE_DIR}/src/platform/sdl/gl-common.c)
@@ -80,6 +79,9 @@ if(BUILD_GLES2)
 		list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/gles2-sdl.c)
 		list(APPEND PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/opengl/gles2.c ${CMAKE_SOURCE_DIR}/src/platform/sdl/gl-common.c)
 		include_directories(${OPENGLES2_INCLUDE_DIR})
+	endif()
+	if(NOT BUILD_GL AND NOT BUILD_GLES2)
+		list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sw-sdl.c)
 	endif()
 endif()
 

M src/platform/sdl/sw-sdl.c → src/platform/sdl/sw-sdl.c

@@ -5,17 +5,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "main.h"
 
-#include "gba/supervisor/thread.h"
+#include "core/thread.h"
+#include "core/version.h"
 #include "util/arm-algo.h"
 
 static bool mSDLSWInit(struct mSDLRenderer* renderer);
-static void mSDLSWRunloopGBA(struct mSDLRenderer* renderer, void* user);
+static void mSDLSWRunloop(struct mSDLRenderer* renderer, void* user);
 static void mSDLSWDeinit(struct mSDLRenderer* renderer);
 
 void mSDLSWCreate(struct mSDLRenderer* renderer) {
 	renderer->init = mSDLSWInit;
 	renderer->deinit = mSDLSWDeinit;
-	renderer->runloop = mSDLSWRunloopGBA;
+	renderer->runloop = mSDLSWRunloop;
 }
 
 bool mSDLSWInit(struct mSDLRenderer* renderer) {
@@ -27,6 +28,8 @@ SDL_SetVideoMode(renderer->viewportWidth, renderer->viewportHeight, 32, SDL_DOUBLEBUF | SDL_HWSURFACE);
 #endif
 #endif
 
+	unsigned width, height;
+	renderer->core->desiredVideoDimensions(renderer->core, &width, &height);
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	renderer->window = SDL_CreateWindow(projectName, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, renderer->viewportWidth, renderer->viewportHeight, SDL_WINDOW_OPENGL | (SDL_WINDOW_FULLSCREEN_DESKTOP * renderer->player.fullscreen));
 	SDL_GetWindowSize(renderer->window, &renderer->viewportWidth, &renderer->viewportHeight);
@@ -34,27 +37,27 @@ renderer->player.window = renderer->window;
 	renderer->sdlRenderer = SDL_CreateRenderer(renderer->window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 #ifdef COLOR_16_BIT
 #ifdef COLOR_5_6_5
-	renderer->sdlTex = SDL_CreateTexture(renderer->sdlRenderer, SDL_PIXELFORMAT_RGB565, SDL_TEXTUREACCESS_STREAMING, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
+	renderer->sdlTex = SDL_CreateTexture(renderer->sdlRenderer, SDL_PIXELFORMAT_RGB565, SDL_TEXTUREACCESS_STREAMING, width, height);
 #else
-	renderer->sdlTex = SDL_CreateTexture(renderer->sdlRenderer, SDL_PIXELFORMAT_ABGR1555, SDL_TEXTUREACCESS_STREAMING, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
+	renderer->sdlTex = SDL_CreateTexture(renderer->sdlRenderer, SDL_PIXELFORMAT_ABGR1555, SDL_TEXTUREACCESS_STREAMING, width, height);
 #endif
 #else
-	renderer->sdlTex = SDL_CreateTexture(renderer->sdlRenderer, SDL_PIXELFORMAT_ABGR8888, SDL_TEXTUREACCESS_STREAMING, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
+	renderer->sdlTex = SDL_CreateTexture(renderer->sdlRenderer, SDL_PIXELFORMAT_ABGR8888, SDL_TEXTUREACCESS_STREAMING, width, height);
 #endif
 
-	SDL_LockTexture(renderer->sdlTex, 0, (void**) &renderer->d.outputBuffer, &renderer->d.outputBufferStride);
-	renderer->d.outputBufferStride /= BYTES_PER_PIXEL;
+	int stride;
+	SDL_LockTexture(renderer->sdlTex, 0, (void**) &renderer->outputBuffer, &stride);
+	renderer->core->setVideoBuffer(renderer->core, renderer->outputBuffer, stride / BYTES_PER_PIXEL);
 #else
 	SDL_Surface* surface = SDL_GetVideoSurface();
 	SDL_LockSurface(surface);
 
 	if (renderer->ratio == 1) {
-		renderer->d.outputBuffer = surface->pixels;
-		renderer->d.outputBufferStride = surface->pitch / BYTES_PER_PIXEL;
+		renderer->core->setVideoBuffer(renderer->core, surface->pixels, surface->pitch / BYTES_PER_PIXEL);
 	} else {
 #ifdef USE_PIXMAN
-		renderer->d.outputBuffer = malloc(VIDEO_HORIZONTAL_PIXELS * VIDEO_VERTICAL_PIXELS * BYTES_PER_PIXEL);
-		renderer->d.outputBufferStride = VIDEO_HORIZONTAL_PIXELS;
+		renderer->outputBuffer = malloc(width * height * BYTES_PER_PIXEL);
+		renderer->core->setVideoBuffer(renderer->core, renderer->outputBuffer, width);
 #ifdef COLOR_16_BIT
 #ifdef COLOR_5_6_5
 		pixman_format_code_t format = PIXMAN_r5g6b5;
@@ -64,8 +67,8 @@ #endif
 #else
 		pixman_format_code_t format = PIXMAN_x8b8g8r8;
 #endif
-		renderer->pix = pixman_image_create_bits(format, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS,
-		    renderer->d.outputBuffer, renderer->d.outputBufferStride * BYTES_PER_PIXEL);
+		renderer->pix = pixman_image_create_bits(format, width, height,
+		    renderer->outputBuffer, width * BYTES_PER_PIXEL);
 		renderer->screenpix = pixman_image_create_bits(format, renderer->viewportWidth, renderer->viewportHeight, surface->pixels, surface->pitch);
 
 		pixman_transform_t transform;
@@ -82,8 +85,8 @@
 	return true;
 }
 
-void mSDLSWRunloopGBA(struct mSDLRenderer* renderer, void* user) {
-	struct GBAThread* context = user;
+void mSDLSWRunloop(struct mSDLRenderer* renderer, void* user) {
+	struct mCoreThread* context = user;
 	SDL_Event event;
 #if !SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_Surface* surface = SDL_GetVideoSurface();
@@ -91,7 +94,7 @@ #endif
 
 	while (context->state < THREAD_EXITING) {
 		while (SDL_PollEvent(&event)) {
-			mSDLHandleEventGBA(context, &renderer->player, &event);
+			mSDLHandleEvent(context, &renderer->player, &event);
 		}
 
 		if (mCoreSyncWaitFrameStart(&context->sync)) {
@@ -99,8 +102,9 @@ #if SDL_VERSION_ATLEAST(2, 0, 0)
 			SDL_UnlockTexture(renderer->sdlTex);
 			SDL_RenderCopy(renderer->sdlRenderer, renderer->sdlTex, 0, 0);
 			SDL_RenderPresent(renderer->sdlRenderer);
-			SDL_LockTexture(renderer->sdlTex, 0, (void**) &renderer->d.outputBuffer, &renderer->d.outputBufferStride);
-			renderer->d.outputBufferStride /= BYTES_PER_PIXEL;
+			int stride;
+			SDL_LockTexture(renderer->sdlTex, 0, (void**) &renderer->outputBuffer, &stride);
+			renderer->core->setVideoBuffer(renderer->core, renderer->outputBuffer, stride / BYTES_PER_PIXEL);
 #else
 #ifdef USE_PIXMAN
 			if (renderer->ratio > 1) {
@@ -112,10 +116,10 @@ #else
 			switch (renderer->ratio) {
 #if defined(__ARM_NEON) && COLOR_16_BIT
 			case 2:
-				_neon2x(surface->pixels, renderer->d.outputBuffer, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
+				_neon2x(surface->pixels, renderer->outputBuffer, width, height);
 				break;
 			case 4:
-				_neon4x(surface->pixels, renderer->d.outputBuffer, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
+				_neon4x(surface->pixels, renderer->outputBuffer, width, height);
 				break;
 #endif
 			case 1:
@@ -135,7 +139,7 @@ }
 
 void mSDLSWDeinit(struct mSDLRenderer* renderer) {
 	if (renderer->ratio > 1) {
-		free(renderer->d.outputBuffer);
+		free(renderer->outputBuffer);
 	}
 #if !SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_Surface* surface = SDL_GetVideoSurface();