Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clean up #includes in src/osd (#10029)

Browse Source 
* Clean up #includes in src/osd

* render/bgfx/view.cpp: Add license header
This commit is contained in:
ajrhacker 2022-07-04 20:46:05 -04:00 committed by GitHub
parent 09f33c2ba3
commit 0d22ff1a9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
70 changed files with 287 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/osd/mac/video.cpp
View File

@ -21,6 +21,7 @@
#include "window.h"
#include "osdmac.h"
#include "modules/lib/osdlib.h"
#include "modules/monitor/monitor_module.h"
//============================================================
// CONSTANTS

2
src/osd/mac/window.h
View File

@ -12,7 +12,7 @@
#define __MACWINDOW__
#include "osdmac.h"
#include "video.h"
#include "osdsync.h"
#include "modules/osdwindow.h"

7
src/osd/modules/font/font_dwrite.cpp
View File

@ -13,7 +13,9 @@
#include <windows.h>
#include <cmath>
#include <memory>
#include <stdexcept>
// Windows Imaging Components
#include <wincodec.h>
@ -35,6 +37,7 @@ DEFINE_GUID(GUID_WICPixelFormat8bppAlpha, 0xe6cd0116, 0xeeba, 0x4161, 0xaa, 0x85
#include "strconv.h"
#include "corestr.h"
#include "winutil.h"
#include "osdcore.h"
using namespace Microsoft::WRL;
@ -226,7 +229,7 @@ public:
{
if (m_designUnitsPerEm != other.m_designUnitsPerEm || m_emSizeInDip != other.m_emSizeInDip)
{
throw emu_fatalerror("Attempted subtraction of FontDimension with different scale.");
throw std::invalid_argument("Attempted subtraction of FontDimension with different scale.");
}
return FontDimension(m_designUnitsPerEm, m_emSizeInDip, m_designUnits - other.m_designUnits);
@ -236,7 +239,7 @@ public:
{
if (m_designUnitsPerEm != other.m_designUnitsPerEm || m_emSizeInDip != other.m_emSizeInDip)
{
throw emu_fatalerror("Attempted addition of FontDimension with different scale.");
throw std::invalid_argument("Attempted addition of FontDimension with different scale.");
}
return FontDimension(m_designUnitsPerEm, m_emSizeInDip, m_designUnits + other.m_designUnits);

2
src/osd/modules/font/font_osx.cpp
View File

@ -10,7 +10,9 @@
#ifdef SDLMAME_MACOSX
#include "emucore.h"
#include "fileio.h"
#include "osdcore.h"
#include <ApplicationServices/ApplicationServices.h>
#include <CoreFoundation/CoreFoundation.h>

2
src/osd/modules/font/font_sdl.cpp
View File

@ -11,8 +11,10 @@
#if defined(SDLMAME_UNIX) && !defined(SDLMAME_MACOSX) && !defined(SDLMAME_HAIKU) && !defined(SDLMAME_ANDROID)
#include "corestr.h"
#include "emucore.h"
#include "fileio.h"
#include "unicode.h"
#include "osdcore.h"
#ifdef SDLMAME_EMSCRIPTEN
#include <SDL_ttf.h>

4
src/osd/modules/font/font_windows.cpp
View File

@ -11,12 +11,10 @@
#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
#include "font_module.h"
#include "modules/osdmodule.h"
#include "strconv.h"
#include "unicode.h"
#include "corestr.h"
#include "osdcore.h"
#include <cstring>

28
src/osd/modules/lib/osdobj_common.cpp
View File

@ -8,10 +8,19 @@
***************************************************************************/
#include "modules/lib/osdobj_common.h"
#include "modules/font/font_module.h"
#include "modules/input/input_module.h"
#include "modules/sound/sound_module.h"
#include "modules/debugger/debug_module.h"
#include "modules/netdev/netdev_module.h"
#include "modules/midi/midi_module.h"
#include "modules/monitor/monitor_module.h"
#include "watchdog.h"
#include "emu.h"
#include "osdepend.h"
#include "modules/lib/osdobj_common.h"
#include "../frontend/mame/ui/menuitem.h"
#include <iostream>
@ -758,3 +767,18 @@ void osd_common_t::video_options_add(const char *name, void *type)
//m_video_options.add(name, type, false);
m_video_names.push_back(name);
}
osd_font::ptr osd_common_t::font_alloc()
{
return m_font_module->font_alloc();
}
bool osd_common_t::get_font_families(std::string const &font_path, std::vector<std::pair<std::string, std::string> > &result)
{
return m_font_module->get_font_families(font_path, result);
}
std::unique_ptr<osd_midi_device> osd_common_t::create_midi_device()
{
return m_midi->create_midi_device();
}

40
src/osd/modules/lib/osdobj_common.h
View File

@ -13,19 +13,12 @@
#ifndef MAME_OSD_LIB_OSDOBJ_COMMON_H
#define MAME_OSD_LIB_OSDOBJ_COMMON_H
#include "osdcore.h"
#include "osdepend.h"
#include "watchdog.h"
#include "modules/osdmodule.h"
#include "modules/font/font_module.h"
#include "modules/input/input_module.h"
#include "modules/sound/sound_module.h"
#include "modules/debugger/debug_module.h"
#include "modules/netdev/netdev_module.h"
#include "modules/midi/midi_module.h"
#include "modules/output/output_module.h"
#include "modules/monitor/monitor_module.h"
#include "emuopts.h"
#include "../frontend/mame/ui/menuitem.h"
#include "strformat.h"
#include <list>
//============================================================
@ -130,10 +123,10 @@ public:
const char *aspect() const { return value(OSDOPTION_ASPECT); }
const char *resolution() const { return value(OSDOPTION_RESOLUTION); }
const char *view() const { return value(OSDOPTION_VIEW); }
const char *screen(int index) const { return value(string_format("%s%d", OSDOPTION_SCREEN, index)); }
const char *aspect(int index) const { return value(string_format("%s%d", OSDOPTION_ASPECT, index)); }
const char *resolution(int index) const { return value(string_format("%s%d", OSDOPTION_RESOLUTION, index)); }
const char *view(int index) const { return value(string_format("%s%d", OSDOPTION_VIEW, index)); }
const char *screen(int index) const { return value(util::string_format("%s%d", OSDOPTION_SCREEN, index)); }
const char *aspect(int index) const { return value(util::string_format("%s%d", OSDOPTION_ASPECT, index)); }
const char *resolution(int index) const { return value(util::string_format("%s%d", OSDOPTION_RESOLUTION, index)); }
const char *view(int index) const { return value(util::string_format("%s%d", OSDOPTION_VIEW, index)); }
// full screen options
bool switch_res() const { return bool_value(OSDOPTION_SWITCHRES); }
@ -149,8 +142,8 @@ public:
bool gl_pbo() const { return bool_value(OSDOPTION_GL_PBO); }
bool gl_glsl() const { return bool_value(OSDOPTION_GL_GLSL); }
int glsl_filter() const { return int_value(OSDOPTION_GLSL_FILTER); }
const char *shader_mame(int index) const { return value(string_format("%s%d", OSDOPTION_SHADER_MAME, index)); }
const char *shader_screen(int index) const { return value(string_format("%s%d", OSDOPTION_SHADER_SCREEN, index)); }
const char *shader_mame(int index) const { return value(util::string_format("%s%d", OSDOPTION_SHADER_MAME, index)); }
const char *shader_screen(int index) const { return value(util::string_format("%s%d", OSDOPTION_SHADER_SCREEN, index)); }
// sound options
const char *sound() const { return value(OSDOPTION_SOUND); }
@ -158,7 +151,7 @@ public:
// CoreAudio specific options
const char *audio_output() const { return value(OSDOPTION_AUDIO_OUTPUT); }
const char *audio_effect(int index) const { return value(string_format("%s%d", OSDOPTION_AUDIO_EFFECT, index)); }
const char *audio_effect(int index) const { return value(util::string_format("%s%d", OSDOPTION_AUDIO_EFFECT, index)); }
// BGFX specific options
const char *bgfx_path() const { return value(OSDOPTION_BGFX_PATH); }
@ -178,6 +171,15 @@ public:
};
// ======================> osd_interface
class font_module;
class sound_module;
class debug_module;
class midi_module;
class input_module;
class output_module;
class monitor_module;
class osd_watchdog;
class osd_window;
// description of the currently-running machine
@ -214,10 +216,10 @@ public:
// command option overrides
virtual bool execute_command(const char *command) override;
virtual osd_font::ptr font_alloc() override { return m_font_module->font_alloc(); }
virtual bool get_font_families(std::string const &font_path, std::vector<std::pair<std::string, std::string> > &result) override { return m_font_module->get_font_families(font_path, result); }
virtual osd_font::ptr font_alloc() override;
virtual bool get_font_families(std::string const &font_path, std::vector<std::pair<std::string, std::string> > &result) override;
virtual std::unique_ptr<osd_midi_device> create_midi_device() override { return m_midi->create_midi_device(); }
virtual std::unique_ptr<osd_midi_device> create_midi_device() override;
// FIXME: everything below seems to be osd specific and not part of
// this INTERFACE but part of the osd IMPLEMENTATION

9
src/osd/modules/monitor/monitor_common.cpp
View File

@ -5,12 +5,15 @@
*
*/
#include "emu.h"
#include <algorithm>
#include "monitor_common.h"
#include "modules/lib/osdobj_common.h"
#include "modules/osdwindow.h"
#include "osdcore.h"
#include <algorithm>
std::shared_ptr<osd_monitor_info> monitor_module_base::pick_monitor(osd_options& options, int index)
{
// get the aspect ratio

2
src/osd/modules/monitor/monitor_common.h
View File

@ -7,7 +7,7 @@
#ifndef __MONITOR_COMMON_H__
#define __MONITOR_COMMON_H__
#include "modules/lib/osdobj_common.h"
#include "monitor_module.h"
#include <map>
//============================================================

2
src/osd/modules/monitor/monitor_dxgi.cpp
View File

@ -5,7 +5,6 @@
*
*/
#include "emu.h"
#include "modules/osdmodule.h"
#include "monitor_module.h"
@ -20,6 +19,7 @@
#include "strconv.h"
#include "modules/lib/osdlib.h"
#include "monitor_common.h"
#include "osdcore.h"
#include "window.h"
#include "windows/video.h"

2
src/osd/modules/monitor/monitor_mac.cpp
View File

@ -8,7 +8,6 @@
//
//============================================================
#include "emu.h"
#include "modules/osdmodule.h"
#include "monitor_module.h"
@ -21,6 +20,7 @@
#include "modules/osdwindow.h"
#include "monitor_common.h"
#include "osdcore.h"
#include "window.h"
//============================================================

2
src/osd/modules/monitor/monitor_sdl.cpp
View File

@ -5,7 +5,6 @@
*
*/
#include "emu.h"
#include "modules/osdmodule.h"
#include "monitor_module.h"
@ -16,6 +15,7 @@
#include "modules/osdwindow.h"
#include "monitor_common.h"
#include "osdcore.h"
#include "window.h"
inline osd_rect SDL_Rect_to_osd_rect(const SDL_Rect &r)

2
src/osd/modules/monitor/monitor_win32.cpp
View File

@ -5,7 +5,6 @@
*
*/
#include "emu.h"
#include "modules/osdmodule.h"
#include "monitor_module.h"
@ -15,6 +14,7 @@
#include <windows.h>
#undef interface
#include "osdcore.h"
#include "strconv.h"
#include "windows/video.h"
#include "window.h"

1
src/osd/modules/osdmodule.cpp
View File

@ -6,6 +6,7 @@
*/
#include "modules/osdmodule.h"
#include "osdcore.h"
#include <algorithm>

3
src/osd/modules/osdmodule.h
View File

@ -12,9 +12,6 @@
#pragma once
#include "osdcore.h"
#include "osdepend.h"
#include <functional>
#include <memory>
#include <string>

19
src/osd/modules/osdwindow.cpp
View File

@ -8,6 +8,8 @@
#include "emu.h"
#include "osdwindow.h"
#include "modules/lib/osdobj_common.h"
#include "modules/monitor/monitor_module.h"
#include "render/drawnone.h"
#include "render/drawbgfx.h"
@ -57,6 +59,23 @@ float osd_window::pixel_aspect() const
return monitor()->pixel_aspect();
}
bool osd_window::swap_xy() const
{
bool orientation_swap_xy =
(machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
bool rotation_swap_xy =
(target()->orientation() & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
return orientation_swap_xy ^ rotation_swap_xy;
};
bool osd_window::keepaspect() const
{
if (m_target != nullptr)
return m_target->keepaspect();
else
return false;
}
std::unique_ptr<osd_renderer> osd_renderer::make_for_type(int mode, std::shared_ptr<osd_window> window, int extra_flags)
{
switch(mode)

19
src/osd/modules/osdwindow.h
View File

@ -9,7 +9,7 @@
#ifndef __OSDWINDOW__
#define __OSDWINDOW__
#include "render.h"
#include "emucore.h"
#include "osdhelper.h"
#include "../frontend/mame/ui/menuitem.h"
@ -87,22 +87,9 @@ public:
float pixel_aspect() const;
bool swap_xy() const
{
bool orientation_swap_xy =
(machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
bool rotation_swap_xy =
(target()->orientation() & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
return orientation_swap_xy ^ rotation_swap_xy;
};
bool swap_xy() const;
bool keepaspect() const
{
if (m_target != nullptr)
return m_target->keepaspect();
else
return false;
}
bool keepaspect() const;
virtual osd_dim get_size() = 0;

2
src/osd/modules/output/console.cpp
View File

@ -11,6 +11,8 @@
#include "output_module.h"
#include "modules/osdmodule.h"
#include "osdcore.h"
class output_console : public osd_module, public output_module
{
public:

9
src/osd/modules/render/bgfx/chain.cpp
View File

@ -6,7 +6,12 @@
//
//============================================================
#include "chain.h"
#include "emu.h"
#include "render.h"
#include "rendlay.h"
#include "screen.h"
#include <bx/timer.h>
@ -19,13 +24,9 @@
#include "chainmanager.h"
#include "target.h"
#include "vertex.h"
#include "rendlay.h"
#include "screen.h"
#include "clear.h"
#include "modules/osdwindow.h"
#include "chain.h"
bgfx_chain::bgfx_chain(std::string name, std::string author, bool transform, target_manager& targets, std::vector<bgfx_slider*> sliders, std::vector<bgfx_parameter*> params, std::vector<bgfx_chain_entry*> entries, std::vector<bgfx_target*> target_list, std::uint32_t screen_index)
: m_name(name)
, m_author(author)

4
src/osd/modules/render/bgfx/chainentry.cpp
View File

@ -9,13 +9,12 @@
//
//============================================================
#include "emu.h"
#include "chainmanager.h"
#include <bgfx/bgfx.h>
#include <bx/math.h>
#include <cmath>
#include "chainmanager.h"
#include "chainentry.h"
#include "effect.h"
@ -27,6 +26,7 @@
#include "vertex.h"
#include "suppressor.h"
#include "emucore.h"
#include "render.h"

6
src/osd/modules/render/bgfx/chainentryreader.cpp
View File

@ -6,17 +6,15 @@
//
//============================================================
#include <string>
#include "chainentryreader.h"
#include "emu.h"
#include "emucore.h"
#include "fileio.h"
#include "rendutil.h"
#include <modules/render/copyutil.h>
#include <modules/lib/osdobj_common.h>
#include "chainentryreader.h"
#include "texturemanager.h"
#include "targetmanager.h"
#include "effectmanager.h"

25
src/osd/modules/render/bgfx/chainmanager.cpp
View File

@ -9,13 +9,16 @@
//
//============================================================
#include "chainmanager.h"
#include <bx/readerwriter.h>
#include <bx/file.h>
#include "emu.h"
#include "emucore.h"
#include "render.h"
#include "../frontend/mame/ui/slider.h"
#include "osdcore.h"
#include "modules/lib/osdobj_common.h"
#include "modules/osdwindow.h"
#include <rapidjson/document.h>
@ -23,7 +26,6 @@
#include "bgfxutil.h"
#include "chainmanager.h"
#include "chainreader.h"
#include "chain.h"
@ -33,10 +35,27 @@
#include "sliderdirtynotifier.h"
#include "osdcore.h"
#include "osdfile.h"
using namespace rapidjson;
const uint32_t chain_manager::CHAIN_NONE = 0;
chain_manager::screen_prim::screen_prim(render_primitive *prim)
{
m_prim = prim;
m_screen_width = (uint16_t)floorf(prim->get_full_quad_width() + 0.5f);
m_screen_height = (uint16_t)floorf(prim->get_full_quad_height() + 0.5f);
m_quad_width = (uint16_t)floorf(prim->get_quad_width() + 0.5f);
m_quad_height = (uint16_t)floorf(prim->get_quad_height() + 0.5f);
m_tex_width = (float)prim->texture.width;
m_tex_height = (float)prim->texture.height;
m_rowpixels = prim->texture.rowpixels;
m_palette_length = prim->texture.palette_length;
m_flags = prim->flags;
}
chain_manager::chain_manager(running_machine& machine, osd_options& options, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t window_index, slider_dirty_notifier& slider_notifier)
: m_machine(machine)
, m_options(options)

26
src/osd/modules/render/bgfx/chainmanager.h
View File

@ -14,15 +14,13 @@
#ifndef __DRAWBGFX_CHAIN_MANAGER__
#define __DRAWBGFX_CHAIN_MANAGER__
#include <vector>
#include <map>
#include <string>
#include "texturemanager.h"
#include "targetmanager.h"
#include "effectmanager.h"
#include "../frontend/mame/ui/menuitem.h"
#include "render.h"
#include <map>
#include <string>
#include <vector>
class running_machine;
class osd_window;
@ -30,6 +28,8 @@ struct slider_state;
class slider_dirty_notifier;
class render_primitive;
namespace ui { class menu_item; }
class bgfx_chain;
class bgfx_slider;
@ -81,19 +81,7 @@ public:
{
}
screen_prim(render_primitive *prim)
{
m_prim = prim;
m_screen_width = (uint16_t)floorf(prim->get_full_quad_width() + 0.5f);
m_screen_height = (uint16_t)floorf(prim->get_full_quad_height() + 0.5f);
m_quad_width = (uint16_t)floorf(prim->get_quad_width() + 0.5f);
m_quad_height = (uint16_t)floorf(prim->get_quad_height() + 0.5f);
m_tex_width = (float)prim->texture.width;
m_tex_height = (float)prim->texture.height;
m_rowpixels = prim->texture.rowpixels;
m_palette_length = prim->texture.palette_length;
m_flags = prim->flags;
}
screen_prim(render_primitive *prim);
render_primitive *m_prim;
uint16_t m_screen_width;

6
src/osd/modules/render/bgfx/chainreader.cpp
View File

@ -6,14 +6,12 @@
//
//============================================================
#include "chainreader.h"
#include <string>
#include <vector>
#include <map>
#include "emu.h"
#include <modules/lib/osdobj_common.h>
#include "chainreader.h"
#include "chain.h"
#include "chainmanager.h"
#include "sliderreader.h"

1
src/osd/modules/render/bgfx/effect.cpp
View File

@ -11,6 +11,7 @@
#include "uniform.h"
#include "modules/osdmodule.h"
#include "osdcore.h"
bgfx_effect::bgfx_effect(uint64_t state, bgfx::ShaderHandle vertex_shader, bgfx::ShaderHandle fragment_shader, std::vector<bgfx_uniform*> uniforms)
: m_state(state)

14
src/osd/modules/render/bgfx/effectmanager.cpp
View File

@ -9,20 +9,22 @@
//
//============================================================
#include "effectmanager.h"
#include "effectreader.h"
#include "effect.h"
#include "osdfile.h"
#include "modules/lib/osdobj_common.h"
#include <rapidjson/document.h>
#include <rapidjson/error/en.h>
#include <bx/readerwriter.h>
#include <bx/file.h>
#include "emu.h"
#include <bgfx/bgfx.h>
#include "effectmanager.h"
#include "effectreader.h"
#include "effect.h"
static bool prepare_effect_document(std::string &name, osd_options &options, rapidjson::Document &document)
{
std::string full_name = name;

8
src/osd/modules/render/bgfx/effectreader.cpp
View File

@ -6,11 +6,7 @@
//
//============================================================
#include <string>
#include <bgfx/bgfx.h>
#include "emu.h"
#include "effectreader.h"
#include "effect.h"
#include "blendreader.h"
@ -21,8 +17,6 @@
#include "uniformreader.h"
#include "uniform.h"
#include "effectreader.h"
bgfx_effect *effect_reader::read_from_value(const Value& value, std::string prefix, osd_options &options, shader_manager& shaders)
{
uint64_t flags = 0;

8
src/osd/modules/render/bgfx/effectreader.h
View File

@ -11,12 +11,16 @@
#ifndef __DRAWBGFX_EFFECT_READER__
#define __DRAWBGFX_EFFECT_READER__
#include <string>
#include "statereader.h"
#include <bgfx/bgfx.h>
#include <string>
#include <vector>
class bgfx_effect;
class bgfx_uniform;
class osd_options;
class shader_manager;
class effect_reader : public state_reader

7
src/osd/modules/render/bgfx/inputpair.cpp
View File

@ -9,16 +9,13 @@
//
//============================================================
#include "emu.h"
#include "inputpair.h"
#include "../frontend/mame/ui/slider.h"
#include "emucore.h"
#include "inputpair.h"
#include "texture.h"
#include "target.h"
#include "effect.h"
#include "render.h"
#include "uniform.h"
#include "chainmanager.h"
#include "slider.h"

2
src/osd/modules/render/bgfx/inputpair.h
View File

@ -14,7 +14,9 @@
#ifndef __DRAWBGFX_INPUT_PAIR__
#define __DRAWBGFX_INPUT_PAIR__
#include <memory>
#include <string>
#include <vector>
#include "../frontend/mame/ui/menuitem.h"

11
src/osd/modules/render/bgfx/shadermanager.cpp
View File

@ -9,16 +9,19 @@
//
//============================================================
#include "shadermanager.h"
#include "emucore.h"
#include "osdfile.h"
#include "modules/lib/osdobj_common.h"
#include <bx/math.h>
#include <bx/readerwriter.h>
#include <bx/file.h>
#include "emu.h"
#include <bgfx/bgfx.h>
#include "shadermanager.h"
shader_manager::~shader_manager()
{
for (std::pair<std::string, bgfx::ShaderHandle> shader : m_shaders)

4
src/osd/modules/render/bgfx/shadermanager.h
View File

@ -16,12 +16,12 @@
#include <bgfx/bgfx.h>
#include "modules/lib/osdobj_common.h"
#include <map>
#include <string>
class osd_options;
class shader_manager {
public:
shader_manager() { }

10
src/osd/modules/render/bgfx/slider.cpp
View File

@ -6,11 +6,11 @@
//
//============================================================
#include "emu.h"
#include "slider.h"
#include "../frontend/mame/ui/slider.h"
#include "strformat.h"
bgfx_slider::bgfx_slider(running_machine &machine, std::string name, float min, float def, float max, float step, slider_type type, screen_type screen, std::string format, std::string description, std::vector<std::string>& strings)
: m_name(name)
, m_step(step)
@ -66,7 +66,7 @@ int32_t bgfx_slider::update(std::string *str, int32_t newval)
}
if (str != nullptr)
{
*str = string_format(m_format, m_strings[as_int()]);
*str = util::string_format(m_format, m_strings[as_int()]);
}
return as_int();
}
@ -79,7 +79,7 @@ int32_t bgfx_slider::update(std::string *str, int32_t newval)
}
if (str != nullptr)
{
*str = string_format(m_format, as_int());
*str = util::string_format(m_format, as_int());
}
return as_int();
}
@ -93,7 +93,7 @@ int32_t bgfx_slider::update(std::string *str, int32_t newval)
}
if (str != nullptr)
{
*str = string_format(m_format, *val_ptr);
*str = util::string_format(m_format, *val_ptr);
}
return int32_t(floor(*val_ptr / m_step + 0.5f));
}

4
src/osd/modules/render/bgfx/slider.h
View File

@ -13,11 +13,15 @@
#include <bgfx/bgfx.h>
#include <cmath>
#include <memory>
#include <string>
#include <vector>
struct slider_state;
class running_machine;
class bgfx_slider
{
public:

1
src/osd/modules/render/bgfx/sliderreader.cpp
View File

@ -8,7 +8,6 @@
#include "sliderreader.h"
#include "emu.h"
#include "slider.h"
#include "chainmanager.h"

1
src/osd/modules/render/bgfx/slideruniform.cpp
View File

@ -9,7 +9,6 @@
//
//============================================================
#include "emu.h"
#include "slideruniform.h"
#include "slider.h"

1
src/osd/modules/render/bgfx/slideruniformreader.cpp
View File

@ -6,7 +6,6 @@
//
//==================================================================
#include "emu.h"
#include "slideruniformreader.h"
#include <vector>

16
src/osd/modules/render/bgfx/statereader.cpp
View File

@ -9,8 +9,24 @@
#include "statereader.h"
#include "osdcore.h"
#include <cmath>
bool state_reader::READER_CHECK(bool condition, const char* format, ...)
{
if (!condition)
{
va_list ap;
va_start(ap, format);
char buf[2048];
vsnprintf(buf, 2048, format, ap);
osd_printf_error("Error: %s\n", buf);
va_end(ap);
}
return condition;
}
uint64_t state_reader::get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count)
{
if (value.HasMember(name.c_str()))

17
src/osd/modules/render/bgfx/statereader.h
View File

@ -14,10 +14,9 @@
#include <rapidjson/document.h>
#include <cstdint>
#include <string>
#include "osdcore.h"
using namespace rapidjson;
class state_reader
@ -45,19 +44,7 @@ protected:
static uint64_t get_param_from_string(std::string value, const string_to_enum* enums, const int count);
protected:
static bool READER_CHECK(bool condition, const char* format, ...)
{
if (!condition)
{
va_list ap;
va_start(ap, format);
char buf[2048];
vsnprintf(buf, 2048, format, ap);
osd_printf_error("Error: %s\n", buf);
va_end(ap);
}
return condition;
}
static bool READER_CHECK(bool condition, const char* format, ...);
private:
static void get_vec_values(const Value& value_array, float* data, const unsigned int count);

3
src/osd/modules/render/bgfx/suppressor.cpp
View File

@ -7,11 +7,12 @@
//
//============================================================
#include "emu.h"
#include "suppressor.h"
#include "slider.h"
#include <cstring>
bgfx_suppressor::bgfx_suppressor(std::vector<bgfx_slider*> sliders, uint32_t condition, combine_mode combine, void* value)
: m_sliders(sliders)
, m_condition(condition)

3
src/osd/modules/render/bgfx/suppressorreader.cpp
View File

@ -6,9 +6,6 @@
//
//============================================================
#include "emu.h"
#include <string>
#include "suppressorreader.h"
#include "suppressor.h"

6
src/osd/modules/render/bgfx/targetreader.cpp
View File

@ -6,15 +6,15 @@
//
//============================================================
#include <string>
#include "targetreader.h"
#include "emu.h"
#include <modules/lib/osdobj_common.h>
#include "chainmanager.h"
#include "targetreader.h"
#include "target.h"
#include <cmath>
const target_reader::string_to_enum target_reader::STYLE_NAMES[target_reader::STYLE_COUNT] = {
{ "guest", TARGET_STYLE_GUEST },
{ "native", TARGET_STYLE_NATIVE },

5
src/osd/modules/render/bgfx/texturemanager.cpp
View File

@ -9,13 +9,14 @@
//
//============================================================
#include <bgfx/bgfx.h>
#include "texturemanager.h"
#include "texture.h"
#include "bgfxutil.h"
#include "emucore.h"
#include "fileio.h"
#include "rendutil.h"
#include "osdcore.h"
#include "modules/render/copyutil.h"
texture_manager::~texture_manager()

3
src/osd/modules/render/bgfx/texturemanager.h
View File

@ -14,8 +14,9 @@
#ifndef DRAWBGFX_TEXTURE_MANAGER
#define DRAWBGFX_TEXTURE_MANAGER
#include "emu.h"
#include "bitmap.h"
#include <cstdint>
#include <map>
#include <string>

8
src/osd/modules/render/bgfx/view.cpp
View File

@ -1,6 +1,9 @@
#include "emu.h"
// license:BSD-3-Clause
// copyright-holders:Ryan Holtz
#include "view.h"
#include "window.h"
#include "rendutil.h"
#include "../drawbgfx.h"
#include <bx/math.h>
@ -8,7 +11,6 @@
#include <bgfx/platform.h>
#include "target.h"
#include "view.h"
void bgfx_view::update() {
std::shared_ptr<osd_window> win = m_renderer->assert_window();

2
src/osd/modules/render/bgfxutil.cpp
View File

@ -7,10 +7,10 @@
//============================================================
// MAMEOS headers
#include "emu.h"
#include "bgfxutil.h"
#include "copyutil.h"
#include "emucore.h"
#include "render.h"

4
src/osd/modules/render/bgfxutil.h
View File

@ -7,6 +7,10 @@
#include <bgfx/bgfx.h>
#include "palette.h"
#include <cstdint>
/* sdl_info is the information about SDL for the current screen */
class bgfx_util
{

3
src/osd/modules/render/binpacker.cpp
View File

@ -6,9 +6,10 @@
//
//============================================================
#include "emu.h"
#include "binpacker.h"
#include <algorithm>
#include <cstddef>
bool rectangle_packer::pack(const std::vector<packable_rectangle>& rects, std::vector<std::vector<packed_rectangle>>& packs, int pack_size)
{

2
src/osd/modules/render/binpacker.h
View File

@ -5,7 +5,9 @@
#ifndef __RECTPACKER_H__
#define __RECTPACKER_H__
#include "bitmap.h"
#include <cstdint>
#include <vector>
class rectangle_packer

4
src/osd/modules/render/copyutil.h
View File

@ -11,6 +11,10 @@
#ifndef __RENDER_COPYUTIL__
#define __RENDER_COPYUTIL__
#include "palette.h"
#include <cassert>
class copy_util
{

3
src/osd/modules/render/draw13.h
View File

@ -25,6 +25,9 @@ typedef uint64_t HashT;
// standard SDL headers
#include <SDL2/SDL.h>
#include "emucore.h"
#include "render.h"
struct quad_setup_data
{
quad_setup_data()

27
src/osd/modules/render/drawbgfx.cpp
View File

@ -25,6 +25,7 @@ extern void *GetOSWindow(void *wincontroller);
// MAMEOS headers
#include "emu.h"
#include "window.h"
#include "render.h"
#include "rendutil.h"
#include "aviwrite.h"
@ -49,6 +50,8 @@ extern void *GetOSWindow(void *wincontroller);
#include "bgfx/target.h"
#include "bgfx/view.h"
#include "modules/lib/osdobj_common.h"
#include "imgui/imgui.h"
//============================================================
@ -1047,6 +1050,30 @@ void renderer_bgfx::setup_ortho_view()
m_ortho_view->update();
}
render_primitive_list *renderer_bgfx::get_primitives()
{
auto win = try_getwindow();
if (win == nullptr)
return nullptr;
// determines whether the screen container is transformed by the chain's shaders
bool chain_transform = false;
// check the first chain
bgfx_chain* chain = this->m_chains->screen_chain(0);
if (chain != nullptr)
{
chain_transform = chain->transform();
}
osd_dim wdim = win->get_size();
if (wdim.width() > 0 && wdim.height() > 0)
win->target()->set_bounds(wdim.width(), wdim.height(), win->pixel_aspect());
win->target()->set_transform_container(!chain_transform);
return &win->target()->get_primitives();
}
renderer_bgfx::buffer_status renderer_bgfx::buffer_primitives(bool atlas_valid, render_primitive** prim, bgfx::TransientVertexBuffer* buffer, int32_t screen)
{
int vertices = 0;

25
src/osd/modules/render/drawbgfx.h
View File

@ -15,7 +15,6 @@
#include "bgfx/chain.h"
#include "bgfx/chainmanager.h"
#include "sliderdirtynotifier.h"
#include "../frontend/mame/ui/menuitem.h"
class texture_manager;
class target_manager;
@ -58,29 +57,7 @@ public:
uint32_t get_window_width(uint32_t index) const;
uint32_t get_window_height(uint32_t index) const;
virtual render_primitive_list *get_primitives() override
{
auto win = try_getwindow();
if (win == nullptr)
return nullptr;
// determines whether the screen container is transformed by the chain's shaders
bool chain_transform = false;
// check the first chain
bgfx_chain* chain = this->m_chains->screen_chain(0);
if (chain != nullptr)
{
chain_transform = chain->transform();
}
osd_dim wdim = win->get_size();
if (wdim.width() > 0 && wdim.height() > 0)
win->target()->set_bounds(wdim.width(), wdim.height(), win->pixel_aspect());
win->target()->set_transform_container(!chain_transform);
return &win->target()->get_primitives();
}
virtual render_primitive_list *get_primitives() override;
static char const *const WINDOW_PREFIX;

3
src/osd/modules/render/drawnone.cpp
View File

@ -9,9 +9,6 @@
// standard windows headers
#include <windows.h>
// MAME headers
#include "emu.h"
#include "drawnone.h"
//============================================================

3
src/osd/modules/render/drawogl.h
View File

@ -34,6 +34,9 @@ typedef uint64_t HashT;
#include "modules/opengl/gl_shader_mgr.h"
#include "emucore.h"
#include "render.h"
//============================================================
// Textures
//============================================================

2
src/osd/modules/render/drawsdl.cpp
View File

@ -15,7 +15,7 @@
#include <cstdio>
// MAME headers
#include "emu.h"
#include "emucore.h"
#include "ui/uimain.h"
#include "rendersw.hxx"

2
src/osd/modules/sound/direct_sound.cpp
View File

@ -12,7 +12,7 @@
#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
// MAME headers
#include "emu.h"
#include "osdcore.h"
#include "osdepend.h"
#include "emuopts.h"

2
src/osd/modules/sound/pa_sound.cpp
View File

@ -31,6 +31,8 @@
#define LOG_FILE "pa.log"
#define LOG_BUFCNT 0
using osd::s16;
class sound_pa : public osd_module, public sound_module
{
public:

10
src/osd/modules/sound/pulse_sound.cpp
View File

@ -20,11 +20,15 @@
#include <stdlib.h>
#include <poll.h>
#include <mutex>
#include <thread>
#include <pulse/pulseaudio.h>
#include "modules/lib/osdobj_common.h"
using osd::s16;
using osd::u32;
class sound_pulse : public osd_module, public sound_module
{
public:
@ -293,7 +297,11 @@ int sound_pulse::init(osd_options const &options)
return 1;
pa_sample_spec ss;
ss.format = ENDIANNESS_NATIVE == ENDIANNESS_BIG ? PA_SAMPLE_S16BE : PA_SAMPLE_S16LE;
#ifdef LSB_FIRST
ss.format = PA_SAMPLE_S16LE;
#else
ss.format = PA_SAMPLE_S16BE;
#endif
ss.rate = sample_rate();
ss.channels = 2;
m_stream = pa_stream_new(m_context, "main output", &ss, nullptr);

2
src/osd/modules/sound/sdl_sound.cpp
View File

@ -17,8 +17,8 @@
#include <SDL2/SDL.h>
// MAME headers
#include "emu.h"
#include "emuopts.h"
#include "osdcore.h"
#include "../../sdl/osdsdl.h"

3
src/osd/modules/sound/sound_module.h
View File

@ -8,8 +8,7 @@
#ifndef SOUND_MODULE_H_
#define SOUND_MODULE_H_
#include "osdepend.h"
#include "modules/osdmodule.h"
#include <cstdint>
//============================================================
// CONSTANTS

9
src/osd/modules/sound/xaudio2_sound.cpp
View File

@ -22,13 +22,14 @@
#undef interface
// stdlib includes
#include <mutex>
#include <thread>
#include <queue>
#include <algorithm>
#include <chrono>
#include <mutex>
#include <queue>
#include <thread>
// MAME headers
#include "emu.h"
#include "osdcore.h"
#include "osdepend.h"
#include "winutil.h"

9
src/osd/osdepend.h
View File

@ -13,10 +13,11 @@
#pragma once
#include "emucore.h"
#include "osdcore.h"
#include "../frontend/mame/ui/menuitem.h"
#include "emufwd.h"
#include "bitmap.h"
#include <cstdint>
#include <memory>
#include <string>
#include <vector>
@ -24,6 +25,8 @@
// forward references
class input_type_entry; // FIXME: including emu.h does not work because emu.h includes osdepend.h
class osd_midi_device;
namespace ui { class menu_item; }
//============================================================

2
src/osd/osdsync.h
View File

@ -15,7 +15,7 @@
#include <atomic>
#include <condition_variable>
#include "osdcomm.h"
#include "osdcore.h"
/***************************************************************************
SYNCHRONIZATION INTERFACES - Events

6
src/osd/sdl/osdsdl.h
View File

@ -98,11 +98,11 @@ public:
const char *keymap_file() const { return value(SDLOPTION_KEYMAP_FILE); }
// joystick mapping
const char *joy_index(int index) const { return value(string_format("%s%d", SDLOPTION_JOYINDEX, index)); }
const char *joy_index(int index) const { return value(util::string_format("%s%d", SDLOPTION_JOYINDEX, index)); }
bool sixaxis() const { return bool_value(SDLOPTION_SIXAXIS); }
const char *mouse_index(int index) const { return value(string_format("%s%d", SDLOPTION_MOUSEINDEX, index)); }
const char *keyboard_index(int index) const { return value(string_format("%s%d", SDLOPTION_KEYBINDEX, index)); }
const char *mouse_index(int index) const { return value(util::string_format("%s%d", SDLOPTION_MOUSEINDEX, index)); }
const char *keyboard_index(int index) const { return value(util::string_format("%s%d", SDLOPTION_KEYBINDEX, index)); }
const char *video_driver() const { return value(SDLOPTION_VIDEODRIVER); }
const char *render_driver() const { return value(SDLOPTION_RENDERDRIVER); }

2
src/osd/sdl/video.cpp
View File

@ -18,10 +18,10 @@
// MAMEOS headers
#include "video.h"
#include "window.h"
#include "osdsdl.h"
#include "modules/lib/osdlib.h"
#include "modules/monitor/monitor_module.h"
//============================================================
// CONSTANTS

2
src/osd/sdl/window.h
View File

@ -12,9 +12,9 @@
#define MAME_OSD_SDL_WINDOW_H
#include "osdsdl.h"
#include "video.h"
#include "modules/osdwindow.h"
#include "osdsync.h"
#include <cstdint>
#include <memory>

1
src/osd/windows/video.cpp
View File

@ -20,6 +20,7 @@
#include "window.h"
#include "strconv.h"
#include "modules/monitor/monitor_module.h"
#include "modules/osdwindow.h"
//============================================================

1
src/osd/windows/window.h
View File

@ -10,6 +10,7 @@
#pragma once
#include "emucore.h"
#include "render.h"
#include "modules/osdwindow.h"