From d39a51009bf140a8a2a7979fe1a542e732203278 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sun, 8 Dec 2024 00:51:34 +0100 Subject: [PATCH] Fix build --- scripts/src/3rdparty.lua | 4 ---- src/osd/modules/debugger/debugimgui.cpp | 9 ++++----- src/osd/modules/render/bgfx/shadermanager.cpp | 4 ---- src/osd/modules/render/drawbgfx.cpp | 2 -- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 0858f10d88a5c..f765586d0576f 100755 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1425,7 +1425,6 @@ project "bimg" MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_partition_tables.cpp", MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_percentile_tables.cpp", MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_pick_best_endpoint_format.cpp", - MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_platform_isa_detection.cpp", MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_quantization.cpp", MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_symbolic_physical.cpp", MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_weight_align.cpp", @@ -1597,15 +1596,12 @@ end MAME_DIR .. "3rdparty/bgfx/src/renderer_agc.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp", - MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d9.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_gl.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_gnm.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_noop.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_nvn.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp", - MAME_DIR .. "3rdparty/bgfx/src/renderer_webgpu.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader.cpp", - MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_spirv.cpp", MAME_DIR .. "3rdparty/bgfx/src/topology.cpp", diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp index 3aee9845f2f2e..060d80e1e5d6c 100644 --- a/src/osd/modules/debugger/debugimgui.cpp +++ b/src/osd/modules/debugger/debugimgui.cpp @@ -182,7 +182,7 @@ class debug_imgui : public osd_module, public debug_module void refresh_filelist(); void refresh_typelist(); void update_cpu_view(device_t* device); - static bool get_view_source(void* data, int idx, const char** out_text); + static const char* get_view_source(void* user_data, int idx); static int history_set(ImGuiInputTextCallbackData* data); running_machine* m_machine; @@ -268,11 +268,10 @@ static inline void map_attr_to_fg_bg(unsigned char attr, rgb_t *fg, rgb_t *bg) } } -bool debug_imgui::get_view_source(void* data, int idx, const char** out_text) +const char* debug_imgui::get_view_source(void* user_data, int idx) { - auto* vw = static_cast(data); - *out_text = vw->source(idx)->name(); - return true; + auto* vw = static_cast(user_data); + return vw->source(idx)->name(); } void debug_imgui::handle_events() diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp index 763a744e4aa25..2b69661953a9b 100644 --- a/src/osd/modules/render/bgfx/shadermanager.cpp +++ b/src/osd/modules/render/bgfx/shadermanager.cpp @@ -86,10 +86,6 @@ std::string shader_manager::make_path_string(const osd_options &options, const s switch (bgfx::getRendererType()) { case bgfx::RendererType::Noop: - case bgfx::RendererType::Direct3D9: - shader_path += "dx9"; - break; - case bgfx::RendererType::Direct3D11: case bgfx::RendererType::Direct3D12: shader_path += "dx11"; diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp index 5fbb697089f86..0fbd255a61166 100644 --- a/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp @@ -344,8 +344,6 @@ bool video_bgfx::init_bgfx_library(osd_window &window) std::string_view const backend(m_options->bgfx_backend()); if (backend == "auto") ; // do nothing - else if (backend == "dx9" || backend == "d3d9") - init.type = bgfx::RendererType::Direct3D9; else if (backend == "dx11" || backend == "d3d11") init.type = bgfx::RendererType::Direct3D11; else if (backend == "dx12" || backend == "d3d12")