Merge pull request #12 from noahw2021/osx-fix-3

Fix SDL bug on Windows
noahwooten05 · Nov 27, 2023 · 3124cf8 · 3124cf8
2 parents 7946d79 + 0fec3ff
commit 3124cf8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...proj/project.xcworkspace/xcuserdata/noahwooten.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/noahwooten.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/plasm2_emu/devices/video/video_native.c b/plasm2_emu/devices/video/video_native.c
@@ -79,8 +79,12 @@ void VideoiCopyRect(WORD16 x, WORD16 y, WORD16 w, WORD16 h, WORD64 ptr) {
 	if (!VAdr) {
 		cpui_csm_msg(CSM_PAGETOOSMALL, ptr);
 	}
-	SDL_Surface* Surface = SDL_CreateRGBSurfaceFrom((cpuctx->PhysicalMemory + VAdr), w, h, 32, 32, RMASK, GMASK, BMASK, AMASK);
-	SDL_Texture* TargetTexture = SDL_CreateTextureFromSurface(Renderer, Surface);
+#ifdef _WIN32
+    SDL_Surface* Surface = SDL_CreateRGBSurfaceFrom((cpuctx->PhysicalMemory + VAdr), w, h, 32 * w, 32, RMASK, GMASK, BMASK, AMASK);
+#else
+    SDL_Surface* Surface = SDL_CreateRGBSurfaceFrom((cpuctx->PhysicalMemory + VAdr), w, h, 32, 32, RMASK, GMASK, BMASK, AMASK);
+#endif
+    SDL_Texture* TargetTexture = SDL_CreateTextureFromSurface(Renderer, Surface);
 	SDL_FreeSurface(Surface);
 	SDL_Rect DestRect = { x, y, w, h };
 	SDL_RenderCopy(Renderer, TargetTexture, NULL, &DestRect);