sdl3: Don't play chicken with the module names, the core was getting confused. [R. Belmont]

Author: rb6502

src/osd/modules/lib/osdobj_common.cpp

@@ -237,17 +237,28 @@ void osd_common_t::register_options()
 #if !defined(OSD_WINDOWS) && !defined(SDLMAME_WIN32)
 	REGISTER_MODULE(m_mod_man, RENDERER_BGFX); // try BGFX after OpenGL on other operating systems for now
 #endif
+#ifdef SDLMAME_SDL3
+	REGISTER_MODULE(m_mod_man, RENDERER_SDL3ACCEL);
+#if !defined(SDLMAME_EMSCRIPTEN)
+	REGISTER_MODULE(m_mod_man, RENDERER_SDL3SOFT);
+#endif
+#else
 	REGISTER_MODULE(m_mod_man, RENDERER_SDL2);
 #if !defined(SDLMAME_EMSCRIPTEN)
 	REGISTER_MODULE(m_mod_man, RENDERER_SDL1);
+#endif
 #endif
 	REGISTER_MODULE(m_mod_man, RENDERER_NONE);
 
 	REGISTER_MODULE(m_mod_man, SOUND_WASAPI);
 	REGISTER_MODULE(m_mod_man, SOUND_XAUDIO2);
 	REGISTER_MODULE(m_mod_man, SOUND_COREAUDIO);
 	REGISTER_MODULE(m_mod_man, SOUND_JS);
+#ifdef SDLMAME_SDL3
+	REGISTER_MODULE(m_mod_man, SOUND_SDL3);
+#else
 	REGISTER_MODULE(m_mod_man, SOUND_SDL);
+#endif
 #ifndef NO_USE_PORTAUDIO
 	REGISTER_MODULE(m_mod_man, SOUND_PORTAUDIO);
 #endif

src/osd/modules/render/drawsdl3accel.cpp

@@ -929,17 +929,17 @@ render_primitive_list *renderer_sdl2::get_primitives()
 }
 
 
-class video_sdl2 : public osd_module, public render_module
+class video_sdl3_accel : public osd_module, public render_module
 {
 public:
-	video_sdl2()
+	video_sdl3_accel()
 		: osd_module(OSD_RENDERER_PROVIDER, "accel")
 		, m_blit_info_initialized(false)
 		, m_gllib_loaded(false)
 	{
 		std::fill(std::begin(m_blit_info), std::end(m_blit_info), nullptr);
 	}
-	~video_sdl2()
+	~video_sdl3_accel()
 	{
 		free_copy_info();
 	}
@@ -967,7 +967,7 @@ class video_sdl2 : public osd_module, public render_module
 	static copy_info_t const s_blit_info_default[];
 };
 
-int video_sdl2::init(osd_interface &osd, osd_options const &options)
+int video_sdl3_accel::init(osd_interface &osd, osd_options const &options)
 {
 	osd_printf_verbose("Using SDL native texturing driver (SDL 3.2+)\n");
 
@@ -996,7 +996,7 @@ int video_sdl2::init(osd_interface &osd, osd_options const &options)
 	return 0;
 }
 
-std::unique_ptr<osd_renderer> video_sdl2::create(osd_window &window)
+std::unique_ptr<osd_renderer> video_sdl3_accel::create(osd_window &window)
 {
 	if (!m_blit_info_initialized)
 	{
@@ -1009,7 +1009,7 @@ std::unique_ptr<osd_renderer> video_sdl2::create(osd_window &window)
 	return std::make_unique<renderer_sdl2>(window, m_blit_info);
 }
 
-void video_sdl2::expand_copy_info()
+void video_sdl3_accel::expand_copy_info()
 {
 	for (const copy_info_t *bi = s_blit_info_default; bi->src_fmt != -1; bi++)
 	{
@@ -1027,7 +1027,7 @@ void video_sdl2::expand_copy_info()
 	}
 }
 
-void video_sdl2::free_copy_info()
+void video_sdl3_accel::free_copy_info()
 {
 	if (m_blit_info_initialized)
 	{
@@ -1054,7 +1054,7 @@ void video_sdl2::free_copy_info()
 	}
 }
 
-void video_sdl2::add_list(copy_info_t const *&head, copy_info_t const &element, Uint32 bm)
+void video_sdl3_accel::add_list(copy_info_t const *&head, copy_info_t const &element, Uint32 bm)
 {
 	copy_info_t *const newci = new copy_info_t(element);
 
@@ -1072,7 +1072,7 @@ void video_sdl2::add_list(copy_info_t const *&head, copy_info_t const &element,
 #define ENTRY_BM(a,b,f,bm) { SDL_TEXFORMAT_ ## a, SDL_PIXELFORMAT_ ## b, &texcopy_ ## f, bm, #a, #b, 0, 0, 0, 0}
 #define ENTRY_LR(a,b,f) { SDL_TEXFORMAT_ ## a, SDL_PIXELFORMAT_ ## b, &texcopy_ ## f, BM_ALL, #a, #b, 0, 0, 0, -1}
 
-copy_info_t const video_sdl2::s_blit_info_default[] =
+copy_info_t const video_sdl3_accel::s_blit_info_default[] =
 {
 	/* no rotation */
 	ENTRY(ARGB32,           ARGB8888,   argb32_argb32),
@@ -1158,8 +1158,8 @@ copy_info_t const video_sdl2::s_blit_info_default[] =
 
 #else // defined(OSD_SDL) && defined (SDLMAME_SDL3)
 
-namespace osd { namespace { MODULE_NOT_SUPPORTED(video_sdl2, OSD_RENDERER_PROVIDER, "accel") } }
+namespace osd { namespace { MODULE_NOT_SUPPORTED(video_sdl3_accel, OSD_RENDERER_PROVIDER, "accel") } }
 
 #endif // defined(OSD_SDL) && defined (SDLMAME_SDL3)
 
-MODULE_DEFINITION(RENDERER_SDL2, osd::video_sdl2)
+MODULE_DEFINITION(RENDERER_SDL3ACCEL, osd::video_sdl3_accel)

src/osd/modules/render/drawsdl3soft.cpp

@@ -615,10 +615,10 @@ render_primitive_list *renderer_sdl1::get_primitives()
 }
 
 
-class video_sdl1 : public osd_module, public render_module
+class video_sdl3soft : public osd_module, public render_module
 {
 public:
-	video_sdl1()
+	video_sdl3soft()
 		: osd_module(OSD_RENDERER_PROVIDER, "soft")
 		, m_scale_mode(-1)
 	{
@@ -640,7 +640,7 @@ class video_sdl1 : public osd_module, public render_module
 	static sdl_scale_mode const s_scale_modes[];
 };
 
-int video_sdl1::init(osd_interface &osd, osd_options const &options)
+int video_sdl3soft::init(osd_interface &osd, osd_options const &options)
 {
 	osd_printf_verbose("Using SDL multi-window soft driver (SDL 3.2+)\n");
 
@@ -656,12 +656,12 @@ int video_sdl1::init(osd_interface &osd, osd_options const &options)
 	return 0;
 }
 
-std::unique_ptr<osd_renderer> video_sdl1::create(osd_window &window)
+std::unique_ptr<osd_renderer> video_sdl3soft::create(osd_window &window)
 {
 	return std::make_unique<renderer_sdl1>(window, s_scale_modes[m_scale_mode]);
 }
 
-int video_sdl1::get_scale_mode(char const *modestr)
+int video_sdl3soft::get_scale_mode(char const *modestr)
 {
 	const sdl_scale_mode *sm = s_scale_modes;
 	int index = 0;
@@ -675,7 +675,7 @@ int video_sdl1::get_scale_mode(char const *modestr)
 	return -1;
 }
 
-sdl_scale_mode const video_sdl1::s_scale_modes[] = {
+sdl_scale_mode const video_sdl3soft::s_scale_modes[] = {
 		{ "none",    0, 0, 1, 1, DRAW2_SCALEMODE_NEAREST, 0,                    nullptr },
 		{ "hwblit",  1, 0, 1, 1, DRAW2_SCALEMODE_LINEAR,  0,                    nullptr },
 		{ "hwbest",  1, 0, 1, 1, DRAW2_SCALEMODE_BEST,    0,                    nullptr },
@@ -692,8 +692,9 @@ sdl_scale_mode const video_sdl1::s_scale_modes[] = {
 
 #else // defined(OSD_SDL) && defined (SDLMAME_SDL3)
 
-namespace osd { namespace { MODULE_NOT_SUPPORTED(video_sdl1, OSD_RENDERER_PROVIDER, "soft") } }
+namespace osd { namespace { MODULE_NOT_SUPPORTED(video_sdl3soft, OSD_RENDERER_PROVIDER, "soft") } }
 
 #endif // defined(OSD_SDL) && defined (SDLMAME_SDL3)
 
-MODULE_DEFINITION(RENDERER_SDL1, osd::video_sdl1)
+MODULE_DEFINITION(RENDERER_SDL3SOFT, osd::video_sdl3soft)
+

src/osd/modules/sound/sdl3_sound.cpp

@@ -31,15 +31,15 @@ namespace osd {
 
 namespace {
 
-class sound_sdl : public osd_module, public sound_module
+class sound_sdl3 : public osd_module, public sound_module
 {
 public:
-	sound_sdl() :
+	sound_sdl3() :
 		osd_module(OSD_SOUND_PROVIDER, "sdl"), sound_module()
 	{
 	}
 
-	virtual ~sound_sdl() { }
+	virtual ~sound_sdl3() { }
 
 	virtual int init(osd_interface &osd, const osd_options &options) override;
 	virtual void exit() override;
@@ -93,10 +93,10 @@ class sound_sdl : public osd_module, public sound_module
 };
 
 //============================================================
-//  sound_sdl::init
+//  sound_sdl3::init
 //============================================================
 
-int sound_sdl::init(osd_interface &osd, const osd_options &options)
+int sound_sdl3::init(osd_interface &osd, const osd_options &options)
 {
 	m_stream_next_id = 1;
 
@@ -180,18 +180,18 @@ int sound_sdl::init(osd_interface &osd, const osd_options &options)
 	return 0;
 }
 
-void sound_sdl::exit()
+void sound_sdl3::exit()
 {
 	SDL_QuitSubSystem(SDL_INIT_AUDIO);
 	m_devices.clear();
 }
 
-uint32_t sound_sdl::get_generation()
+uint32_t sound_sdl3::get_generation()
 {
 	return 1;
 }
 
-osd::audio_info sound_sdl::get_information()
+osd::audio_info sound_sdl3::get_information()
 {
 	enum { FL, FR, FC, LFE, BL, BR, BC, SL, SR, AUX };
 	static const char *const posname[10] = { "FL", "FR", "FC", "LFE", "BL", "BR", "BC", "SL", "SR", "AUX" };
@@ -247,7 +247,7 @@ osd::audio_info sound_sdl::get_information()
 	return m_deviceinfo;
 }
 
-uint32_t sound_sdl::stream_sink_open(uint32_t node, std::string name, uint32_t rate)
+uint32_t sound_sdl3::stream_sink_open(uint32_t node, std::string name, uint32_t rate)
 {
 	const int devnode = node - 1;
 	const SDL_AudioDeviceID device_id = m_devices[devnode].m_device_id;
@@ -285,7 +285,7 @@ uint32_t sound_sdl::stream_sink_open(uint32_t node, std::string name, uint32_t r
 	return id;
 }
 
-uint32_t sound_sdl::stream_source_open(uint32_t node, std::string name, uint32_t rate)
+uint32_t sound_sdl3::stream_source_open(uint32_t node, std::string name, uint32_t rate)
 {
 	const int devnode = node - 1;
 	const SDL_AudioDeviceID device_id = m_devices[devnode].m_device_id;
@@ -328,7 +328,7 @@ uint32_t sound_sdl::stream_source_open(uint32_t node, std::string name, uint32_t
 	return id;
 }
 
-void sound_sdl::stream_close(uint32_t id)
+void sound_sdl3::stream_close(uint32_t id)
 {
 	osd_printf_verbose("SDL Audio: Closing stream id %d\n", id);
 
@@ -341,7 +341,7 @@ void sound_sdl::stream_close(uint32_t id)
 	m_streams.erase(si);
 }
 
-void sound_sdl::stream_sink_update(uint32_t id, const int16_t *buffer, int samples_this_frame)
+void sound_sdl3::stream_sink_update(uint32_t id, const int16_t *buffer, int samples_this_frame)
 {
 	auto si = m_streams.find(id);
 	if(si == m_streams.end())
@@ -350,7 +350,7 @@ void sound_sdl::stream_sink_update(uint32_t id, const int16_t *buffer, int sampl
 	SDL_PutAudioStreamData(stream->m_sdl_stream, (void *)buffer, samples_this_frame * sizeof(int16_t) * stream->m_buffer.channels());
 }
 
-void sound_sdl::stream_source_update(uint32_t id, int16_t *buffer, int samples_this_frame)
+void sound_sdl3::stream_source_update(uint32_t id, int16_t *buffer, int samples_this_frame)
 {
 	auto si = m_streams.find(id);
 	if (si == m_streams.end())
@@ -365,9 +365,9 @@ void sound_sdl::stream_source_update(uint32_t id, int16_t *buffer, int samples_t
 
 #else // (defined(OSD_SDL) || defined(USE_SDL_SOUND)) && defined(SDLMAME_SDL3)
 
-namespace osd { namespace { MODULE_NOT_SUPPORTED(sound_sdl, OSD_SOUND_PROVIDER, "sdl") } }
+namespace osd { namespace { MODULE_NOT_SUPPORTED(sound_sdl3, OSD_SOUND_PROVIDER, "sdl") } }
 
 #endif
 
-MODULE_DEFINITION(SOUND_SDL, osd::sound_sdl)
+MODULE_DEFINITION(SOUND_SDL3, osd::sound_sdl3)