Misc code clean up and support for bob deinterlacing

* Imagine: Clean up naming of some configuration macros * Imagine: Update bundled libxcb, libX11 and clean up various makefiles * Imagine: Fix various issues in Linux build for Pandora * Imagine: Skip writing imagine config header if no variables are defined * Imagine: Wrap pwritev() syscall if needed by platform * Imagine: Tweak warning flags and add the system linker flags after library flags * EmuFramework: Add flag in EmuVideo for offsetting output with bob deinterlacing * EmuFramework: Add key binding to close content * Saturn.emu & Snes9x: Add option to set deinterlace mode and default to bob deinterlacing
Rakashazi · Feb 13, 2024 · 3b1cb19 · 3b1cb19
1 parent 342c0c1
commit 3b1cb19
Show file tree

Hide file tree

Showing 98 changed files with 443 additions and 247 deletions.
diff --git a/EmuFramework/build.mk b/EmuFramework/build.mk
@@ -72,7 +72,7 @@ pkgDescription := Emulator App Framework
 pkgVersion := $(metadata_version)
 LDLIBS := -l$(libName) $(LDLIBS)
 
-CFLAGS_WARN += -Werror=implicit-fallthrough
+CFLAGS_WARN += -Werror
 
 include $(IMAGINE_PATH)/make/package/imagine.mk
 include $(IMAGINE_PATH)/make/package/stdc++.mk

diff --git a/EmuFramework/include/emuframework/AppKeyCode.hh b/EmuFramework/include/emuframework/AppKeyCode.hh
@@ -45,13 +45,15 @@ enum class AppKeyCode : KeyCode
 	softReset,
 	hardReset,
 	resetMenu,
+	closeContent,
 };
 
 constexpr struct AppKeys
 {
 	KeyInfo
 	openMenu = KeyInfo::appKey(AppKeyCode::openMenu),
 	openContent = KeyInfo::appKey(AppKeyCode::openContent),
+	closeContent = KeyInfo::appKey(AppKeyCode::closeContent),
 	openSystemActions = KeyInfo::appKey(AppKeyCode::openSystemActions),
 	saveState = KeyInfo::appKey(AppKeyCode::saveState),
 	loadState = KeyInfo::appKey(AppKeyCode::loadState),

diff --git a/EmuFramework/include/emuframework/EmuApp.hh b/EmuFramework/include/emuframework/EmuApp.hh
@@ -54,6 +54,7 @@ namespace IG
 class BluetoothAdapter;
 class FileIO;
 class BasicNavView;
+class YesNoAlertView;
 }
 
 namespace EmuEx
@@ -252,6 +253,7 @@ public:
 	Gfx::TextureSpan asset(AssetDesc) const;
 	VController &defaultVController() { return inputManager.vController; }
 	static std::unique_ptr<View> makeView(ViewAttachParams, ViewID);
+	std::unique_ptr<YesNoAlertView> makeCloseContentView();
 	void applyOSNavStyle(IG::ApplicationContext, bool inGame);
 	void setCPUNeedsLowLatency(IG::ApplicationContext, bool needed);
 	bool advanceFrames(FrameParams, EmuSystemTask *);

diff --git a/EmuFramework/include/emuframework/EmuSystem.hh b/EmuFramework/include/emuframework/EmuSystem.hh
@@ -22,6 +22,7 @@
 #include <imagine/audio/SampleFormat.hh>
 #include <imagine/util/rectangle2.h>
 #include <imagine/util/memory/DynArray.hh>
+#include <imagine/util/enum.hh>
 #include <emuframework/EmuTiming.hh>
 #include <emuframework/VController.hh>
 #include <emuframework/EmuInput.hh>
@@ -128,6 +129,11 @@ enum class VideoSystem: uint8_t
 	NATIVE_NTSC, PAL
 };
 
+WISE_ENUM_CLASS((DeinterlaceMode, uint8_t),
+	Bob,
+	Weave
+);
+
 using FrameTime = Nanoseconds;
 
 constexpr const char *optionUserPathContentToken = ":CONTENT:";

diff --git a/EmuFramework/include/emuframework/EmuVideo.hh b/EmuFramework/include/emuframework/EmuVideo.hh
@@ -83,6 +83,7 @@ public:
 	IG::PixelFormat renderPixelFormat() const;
 	IG::PixelFormat internalRenderPixelFormat() const;
 	static Gfx::TextureSamplerConfig samplerConfigForLinearFilter(bool useLinearFilter);
+	static MutablePixmapView takeInterlacedFields(MutablePixmapView, bool isOddField);
 
 protected:
 	Gfx::RendererTask *rTask{};
@@ -98,6 +99,9 @@ protected:
 	void doScreenshot(EmuSystemTaskContext, IG::PixmapView pix);
 	void postFrameFinished(EmuSystemTaskContext);
 	Gfx::TextureSamplerConfig samplerConfig() const { return samplerConfigForLinearFilter(useLinearFilter); }
+
+public:
+	bool isOddField{};
 };
 
 }
diff --git a/EmuFramework/include/emuframework/config.hh b/EmuFramework/include/emuframework/config.hh
@@ -29,7 +29,7 @@ namespace EmuEx
 {
 
 #if defined __ANDROID__ || \
-	defined CONFIG_BASE_IOS || \
+	defined CONFIG_OS_IOS || \
 	(defined CONFIG_BASE_X11 && !defined CONFIG_MACHINE_PANDORA)
 #define CONFIG_VCONTROLS_GAMEPAD
 constexpr bool VCONTROLS_GAMEPAD = true;

diff --git a/EmuFramework/linux-armv7-pandora-release.mk b/EmuFramework/linux-armv7-pandora-release.mk
@@ -0,0 +1 @@
+../imagine/make/shortcut/common-builds/linux-armv7-pandora-release.mk
diff --git a/EmuFramework/src/ConfigFile.cc b/EmuFramework/src/ConfigFile.cc
@@ -168,7 +168,7 @@ EmuApp::ConfigParams EmuApp::loadConfigFile(IG::ApplicationContext ctx)
 			FS::rename(oldConfigFilePath, configFilePath);
 		}
 	}
-	#ifdef CONFIG_BASE_IOS
+	#ifdef CONFIG_OS_IOS
 	if(ctx.isSystemApp())
 	{
 		const char *oldConfigDir = "/User/Library/Preferences/explusalpha.com";

diff --git a/EmuFramework/src/EmuApp.cc b/EmuFramework/src/EmuApp.cc
@@ -1208,6 +1208,20 @@ FS::PathString EmuApp::validSearchPath(const FS::PathString &path) const
 	return nullptr;
 }
 
+std::unique_ptr<YesNoAlertView> EmuApp::makeCloseContentView()
+{
+	return std::make_unique<YesNoAlertView>(attachParams(), "Really close current content?",
+		YesNoAlertView::Delegates
+		{
+			.onYes = [this]
+			{
+				closeSystem(); // pops any System Actions views in the stack
+				viewController().popModalViews();
+				return false;
+			}
+		});
+}
+
 bool EmuApp::handleKeyInput(KeyInfo keyInfo, const Input::Event &srcEvent)
 {
 	if(!keyInfo.flags.appCode)
@@ -1246,6 +1260,13 @@ bool EmuApp::handleAppActionKeyInput(InputAction action, const Input::Event &src
 			viewController().pushAndShow(FilePicker::forLoading(attachParams(), srcEvent), srcEvent, false);
 			return true;
 		}
+		case closeContent:
+		{
+			if(!isPushed)
+				break;
+			viewController().pushAndShowModal(makeCloseContentView(), srcEvent, false);
+			return true;
+		}
 		case openSystemActions:
 		{
 			if(!isPushed)

diff --git a/EmuFramework/src/EmuInput.cc b/EmuFramework/src/EmuInput.cc
@@ -323,6 +323,7 @@ std::string_view toString(AppKeyCode code)
 	switch(code)
 	{
 		case AppKeyCode::openContent: return "Open Content";
+		case AppKeyCode::closeContent: return "Close Content";
 		case AppKeyCode::openSystemActions: return "Open System Actions";
 		case AppKeyCode::saveState: return "Save State";
 		case AppKeyCode::loadState: return "Load State";

diff --git a/EmuFramework/src/EmuOptions.cc b/EmuFramework/src/EmuOptions.cc
@@ -37,7 +37,7 @@ constexpr SystemLogger log{"App"};
 
 void EmuApp::initOptions(IG::ApplicationContext ctx)
 {
-	#ifdef CONFIG_BASE_IOS
+	#ifdef CONFIG_OS_IOS
 	if(ctx.deviceIsIPad())
 		defaultFontSize = 5000;
 	#endif

diff --git a/EmuFramework/src/EmuVideo.cc b/EmuFramework/src/EmuVideo.cc
@@ -334,4 +334,11 @@ Gfx::TextureSamplerConfig EmuVideo::samplerConfigForLinearFilter(bool useLinearF
 	return useLinearFilter ? Gfx::SamplerConfigs::noMipClamp : Gfx::SamplerConfigs::noLinearNoMipClamp;
 }
 
+MutablePixmapView EmuVideo::takeInterlacedFields(MutablePixmapView pix, bool isOddField)
+{
+	// Take half the image on the Y axis and double the pitch to isolate the even/odd fields
+	WSize size = {pix.w(), pix.h() / 2};
+	return {pix.desc().makeNewSize(size), pix.data({0, isOddField}), {pix.pitchBytes() * 2, PixmapUnits::BYTE}};
+}
+
 }
diff --git a/EmuFramework/src/EmuVideoLayer.cc b/EmuFramework/src/EmuVideoLayer.cc
@@ -26,6 +26,7 @@
 #include <imagine/gfx/Renderer.hh>
 #include <imagine/gfx/RendererCommands.hh>
 #include <imagine/gfx/Vec3.hh>
+#include <imagine/gfx/Mat4.hh>
 #include <imagine/glm/common.hpp>
 #include <imagine/glm/gtc/color_space.hpp>
 #include <imagine/logger/logger.h>
@@ -176,7 +177,13 @@ void EmuVideoLayer::draw(Gfx::RendererCommands &cmds)
 	}
 	if(srgbOutput)
 		cmds.setSrgbFramebufferWrite(true);
-	cmds.basicEffect().drawSprite(cmds, quad, 0, texture);
+	auto &basicEffect = cmds.basicEffect();
+	if(video.isOddField) // shift image by half a line to reduce interlace flicker
+	{
+		float fieldOffset = (contentRect_.size().y / float(video.size().y)) / 2.f;
+		basicEffect.setModelView(cmds, Mat4::makeTranslate({0, fieldOffset, 0}));
+	}
+	basicEffect.drawSprite(cmds, quad, 0, texture);
 	vidImgOverlay.draw(cmds, c);
 	if(srgbOutput)
 		cmds.setSrgbFramebufferWrite(false);

diff --git a/EmuFramework/src/gui/SystemActionsView.cc b/EmuFramework/src/gui/SystemActionsView.cc
@@ -195,11 +195,7 @@ SystemActionsView::SystemActionsView(ViewAttachParams attach, bool customMenu):
 		"Close Content", attach,
 		[this](const Input::Event &e)
 		{
-			pushAndShowModal(makeView<YesNoAlertView>("Really close current content?",
-				YesNoAlertView::Delegates
-				{
-					.onYes = [this] { app().closeSystem(); return false; } // pops any System Actions views in the stack
-				}), e);
+			pushAndShowModal(app().makeCloseContentView(), e);
 		}
 	}
 {

diff --git a/EmuFramework/src/vcontrols/VController.cc b/EmuFramework/src/vcontrols/VController.cc
@@ -36,7 +36,7 @@ VController::VController(IG::ApplicationContext ctx):
 	alphaF{defaultAlpha / 255.},
 	defaultButtonSize
 	{
-		#ifdef CONFIG_BASE_IOS
+		#ifdef CONFIG_OS_IOS
 		int16_t(ctx.deviceIsIPad() ? 1400 : 850)
 		#else
 		850
@@ -85,6 +85,7 @@ static void updateTexture(const EmuApp &app, VControllerElement &e, Gfx::Rendere
 					{
 						case openMenu: return app.asset(AssetID::more);
 						case openContent: return app.asset(AssetID::openFile);
+						case closeContent: return app.asset(AssetID::close);
 						case saveState: return app.asset(AssetID::save);
 						case loadState: return app.asset(AssetID::load);
 						case decStateSlot: return app.asset(AssetID::leftSwitch);

diff --git a/Saturn.emu/src/main/EmuMenuViews.cc b/Saturn.emu/src/main/EmuMenuViews.cc
@@ -319,6 +319,26 @@ class ConsoleOptionView : public TableView, public MainAppHelper<ConsoleOptionVi
 		}
 	};
 
+	TextMenuItem deinterlaceModeItems[2]
+	{
+		{"Bob",   attachParams(), {.id = DeinterlaceMode::Bob}},
+		{"Weave", attachParams(), {.id = DeinterlaceMode::Weave}},
+	};
+
+	MultiChoiceMenuItem deinterlaceMode
+	{
+		"Deinterlace Mode", attachParams(),
+		MenuId{system().deinterlaceMode},
+		deinterlaceModeItems,
+		{
+			.defaultItemOnSelect = [this](TextMenuItem &item)
+			{
+				system().sessionOptionSet();
+				system().deinterlaceMode = DeinterlaceMode(item.id.val);
+			}
+		}
+	};
+
 	TextMenuItem contentRotationItems[5]
 	{
 		{"Auto",        attachParams(), {.id = Rotation::ANY}},
@@ -457,6 +477,7 @@ class ConsoleOptionView : public TableView, public MainAppHelper<ConsoleOptionVi
 		menuItems.emplace_back(&videoHeading);
 		menuItems.emplace_back(&showHOverscan);
 		menuItems.emplace_back(&visibleVideoLines);
+		menuItems.emplace_back(&deinterlaceMode);
 		menuItems.emplace_back(&contentRotation);
 		menuItems.emplace_back(&inputHeading);
 		menuItems.emplace_back(&multitaps[0]);
@@ -561,7 +582,7 @@ class CustomVideoOptionView : public VideoOptionView, public MainAppHelper<Custo
 		{
 			.defaultItemOnSelect = [this](TextMenuItem &item)
 			{
-				system().defaultNtscLines = std::bit_cast<VideoLineRange>(item.id);
+				system().defaultNtscLines = std::bit_cast<VideoLineRange>(item.id.val);
 			}
 		}
 	};

diff --git a/Saturn.emu/src/main/Main.cc b/Saturn.emu/src/main/Main.cc
@@ -397,6 +397,7 @@ void SaturnSystem::updateVideoSettings()
 
 void SaturnSystem::renderFramebuffer(EmuVideo &video)
 {
+	espec.taskCtx = {};
 	espec.video = &video;
 	int32 lineWidths[2]{video.size().x};
 	espec.LineWidths = lineWidths;
@@ -444,12 +445,18 @@ void MDFN_MidSync(EmulateSpecStruct *espec, const unsigned flags)
 
 void MDFND_commitVideoFrame(EmulateSpecStruct *espec)
 {
-	auto &sys = static_cast<EmuEx::SaturnSystem&>(*espec->sys);
+	auto &sys = static_cast<const EmuEx::SaturnSystem&>(*espec->sys);
 	int width = std::max(espec->LineWidths[0], espec->LineWidths[1]);
-	IG::PixmapView srcPix = sys.mSurfacePix.subView(
-		{espec->DisplayRect.x, espec->DisplayRect.y},
-		{width, espec->DisplayRect.h});
-	espec->video->startFrameWithFormat(espec->taskCtx, srcPix);
+	auto &video = *espec->video;
+	video.isOddField = false;
+	auto srcPix = sys.mSurfacePix.subView({espec->DisplayRect.x, espec->DisplayRect.y}, {width, espec->DisplayRect.h});
+	if(MDFN_IEN_SS::VDP2::InterlaceMode && sys.deinterlaceMode == EmuEx::DeinterlaceMode::Bob)
+	{
+		bool isOddField = espec->LineWidths[1];
+		video.isOddField = isOddField;
+		srcPix = video.takeInterlacedFields(srcPix, isOddField);
+	}
+	video.startFrameWithFormat(espec->taskCtx, srcPix);
 }
 
 void MDFN_MediaStateAction(StateMem *sm, const unsigned load, const bool data_only)

diff --git a/Saturn.emu/src/main/MainSystem.hh b/Saturn.emu/src/main/MainSystem.hh
@@ -80,6 +80,7 @@ enum
 	CFGKEY_VIDEO_LINES = 285, CFGKEY_CORRECT_LINE_ASPECT = 286,
 	CFGKEY_DEFAULT_NTSC_VIDEO_LINES = 287, CFGKEY_DEFAULT_PAL_VIDEO_LINES = 288,
 	CFGKEY_DEFAULT_SHOW_H_OVERSCAN = 289, CFGKEY_SHOW_H_OVERSCAN = 290,
+	CFGKEY_DEINTERLACE_MODE = 291,
 };
 
 struct VideoLineRange
@@ -120,6 +121,7 @@ public:
 	int8_t region{};
 	int8_t biosLanguage{MDFN_IEN_SS::SMPC_RTC_LANG_ENGLISH};
 	InputConfig inputConfig{};
+	DeinterlaceMode deinterlaceMode{DeinterlaceMode::Bob};
 	bool defaultShowHOverscan{};
 	bool showHOverscan{};
 	bool correctLineAspect{};

diff --git a/Saturn.emu/src/main/options.cc b/Saturn.emu/src/main/options.cc
@@ -49,6 +49,7 @@ bool SaturnSystem::resetSessionOptions(EmuApp &app)
 	sysContentRotation = Rotation::ANY;
 	videoLines = {};
 	showHOverscan = defaultShowHOverscan;
+	deinterlaceMode = DeinterlaceMode::Bob;
 	onSessionOptionsLoaded(app);
 	return true;
 }
@@ -88,6 +89,7 @@ bool SaturnSystem::readConfig(ConfigType type, MapIO &io, unsigned key, size_t r
 			case CFGKEY_SYSTEM_CONTENT_ROTATION: return readOptionValue(io, readSize, sysContentRotation);
 			case CFGKEY_VIDEO_LINES: return readOptionValue(io, readSize, videoLines);
 			case CFGKEY_SHOW_H_OVERSCAN: return readOptionValue(io, readSize, showHOverscan);
+			case CFGKEY_DEINTERLACE_MODE: return readOptionValue(io, readSize, deinterlaceMode);
 		}
 	}
 	return false;
@@ -105,7 +107,7 @@ void SaturnSystem::writeConfig(ConfigType type, FileIO &io)
 		writeOptionValueIfNotDefault(io, CFGKEY_AUTO_RTC_TIME, autoRTCTime, true);
 		writeOptionValueIfNotDefault(io, CFGKEY_DEFAULT_NTSC_VIDEO_LINES, defaultNtscLines, safeNtscLines);
 		writeOptionValueIfNotDefault(io, CFGKEY_DEFAULT_PAL_VIDEO_LINES, defaultPalLines, safePalLines);
-		writeOptionValueIfNotDefault(io, CFGKEY_DEFAULT_SHOW_H_OVERSCAN, defaultShowHOverscan, false);;
+		writeOptionValueIfNotDefault(io, CFGKEY_DEFAULT_SHOW_H_OVERSCAN, defaultShowHOverscan, false);
 	}
 	else if(type == ConfigType::SESSION)
 	{
@@ -115,6 +117,7 @@ void SaturnSystem::writeConfig(ConfigType type, FileIO &io)
 		writeOptionValueIfNotDefault(io, CFGKEY_SYSTEM_CONTENT_ROTATION, sysContentRotation, Rotation::ANY);
 		writeOptionValueIfNotDefault(io, CFGKEY_VIDEO_LINES, videoLines, MDFN_IEN_SS::VDP2::PAL ? defaultPalLines : defaultNtscLines);
 		writeOptionValueIfNotDefault(io, CFGKEY_SHOW_H_OVERSCAN, showHOverscan, defaultShowHOverscan);
+		writeOptionValueIfNotDefault(io, CFGKEY_DEINTERLACE_MODE, deinterlaceMode, DeinterlaceMode::Bob);
 	}
 }
 

diff --git a/Snes9x/res/pandora/gpOverlay.png b/Snes9x/res/pandora/gpOverlay.png
@@ -0,0 +1 @@
+/home/robert/projects/Snes9x/res/ios/gpOverlay.png
diff --git a/Snes9x/src/main/EmuMenuViews.cc b/Snes9x/src/main/EmuMenuViews.cc
@@ -136,6 +136,26 @@ class ConsoleOptionView : public TableView, public MainAppHelper<ConsoleOptionVi
 		}
 	};
 
+	TextMenuItem deinterlaceModeItems[2]
+	{
+		{"Bob",   attachParams(), {.id = DeinterlaceMode::Bob}},
+		{"Weave", attachParams(), {.id = DeinterlaceMode::Weave}},
+	};
+
+	MultiChoiceMenuItem deinterlaceMode
+	{
+		"Deinterlace Mode", attachParams(),
+		MenuId{system().deinterlaceMode},
+		deinterlaceModeItems,
+		{
+			.defaultItemOnSelect = [this](TextMenuItem &item)
+			{
+				system().sessionOptionSet();
+				system().deinterlaceMode = DeinterlaceMode(item.id.val);
+			}
+		}
+	};
+
 	#ifndef SNES9X_VERSION_1_4
 	TextHeadingMenuItem emulationHacks{"Emulation Hacks", attachParams()};
 
@@ -218,13 +238,14 @@ class ConsoleOptionView : public TableView, public MainAppHelper<ConsoleOptionVi
 	};
 	#endif
 
-	std::array<MenuItem*, IS_SNES9X_VERSION_1_4 ? 5 : 9> menuItem
+	std::array<MenuItem*, IS_SNES9X_VERSION_1_4 ? 6 : 10> menuItem
 	{
 		&inputPorts,
 		&multitap,
 		&videoHeading,
 		&videoSystem,
 		&allowExtendedLines,
+		&deinterlaceMode,
 		#ifndef SNES9X_VERSION_1_4
 		&emulationHacks,
 		&blockInvalidVRAMAccess,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../imagine/make/shortcut/common-builds/linux-armv7-pandora-release.mk
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/home/robert/projects/Snes9x/res/ios/gpOverlay.png