Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame.git

Browse Source
This commit is contained in:
Brad Hughes 2016-04-05 09:58:52 -04:00
commit 89b21ff822
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/src/3rdparty.lua
View File

@ -720,6 +720,7 @@ end
buildoptions { buildoptions {
"-Wno-uninitialized", "-Wno-uninitialized",
"-Wno-unused-function", "-Wno-unused-function",
"-Wno-unused-but-set-variable",
} }
configuration { "rpi" } configuration { "rpi" }
buildoptions { buildoptions {
@ -788,8 +789,17 @@ end
MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_metrics.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_metrics.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/ocornut_imgui.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/scintilla.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbuffercompression.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbufferdecompression.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_demo.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_node_graph_test.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_wm.cpp",
} }
if _OPTIONS["targetos"]=="macosx" then if _OPTIONS["targetos"]=="macosx" then
files { files {

3
scripts/src/osd/modules.lua
View File

@ -129,6 +129,7 @@ function osdmodulesbuild()
"__STDC_LIMIT_MACROS", "__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS", "__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS", "__STDC_CONSTANT_MACROS",
"IMGUI_DISABLE_OBSOLETE_FUNCTIONS",
} }
files { files {
@ -172,7 +173,9 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp",
} }
includedirs { includedirs {
MAME_DIR .. "3rdparty/bgfx/examples/common",
MAME_DIR .. "3rdparty/bgfx/include", MAME_DIR .. "3rdparty/bgfx/include",
MAME_DIR .. "3rdparty/bgfx/3rdparty",
MAME_DIR .. "3rdparty/bx/include", MAME_DIR .. "3rdparty/bx/include",
MAME_DIR .. "3rdparty/rapidjson/include", MAME_DIR .. "3rdparty/rapidjson/include",
} }

2
src/devices/bus/kc/rom.cpp
View File

@ -43,7 +43,7 @@ const device_type KC_M033 = &device_creator<kc_m033_device>;
//------------------------------------------------- //-------------------------------------------------
kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KC_STANDARD, "Standard", tag, owner, clock, "kc_8k", __FILE__), : device_t(mconfig, KC_STANDARD, "Standard 8K ROM module", tag, owner, clock, "kc_8k", __FILE__),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0) device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0)
{ {
} }

8
src/mame/video/bbusters.cpp
View File

@ -200,18 +200,20 @@ void bbusters_state::draw_sprites(bitmap_ind16 &bitmap, const UINT16 *source, in
int offs; int offs;
for (offs = 0;offs <0x800 ;offs += 4) { for (offs = 0;offs <0x800 ;offs += 4) {
int x,y,sprite,colour,fx,fy,scale; int x,sprite,colour,fx,fy,scale;
INT16 y;
int block; int block;
sprite=source[offs+1]; sprite=source[offs+1];
colour=source[offs+0]; colour=source[offs+0];
if (colour==0xf7 && (sprite==0x3fff || sprite==0xffff)) if ((colour==0xf7 || colour==0xffff || colour == 0x43f9) && (sprite==0x3fff || sprite==0xffff || sprite==0x0001))
continue; continue; // sprite 1, color 0x43f9 is the dead sprite in the top-right of the screen in Mechanized Attack's High Score table.
y=source[offs+3]; y=source[offs+3];
x=source[offs+2]; x=source[offs+2];
if (x&0x200) x=-(0x100-(x&0xff)); if (x&0x200) x=-(0x100-(x&0xff));
if (y > 320 || y < -256) y &= 0x1ff; // fix for bbusters ending & "Zing!" attract-mode fullscreen zombie & Helicopter on the 3rd rotation of the attractmode sequence
/* /*
Source[0]: Source[0]:

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

@ -43,6 +43,8 @@
#include "bgfx/slider.h" #include "bgfx/slider.h"
#include "bgfx/target.h" #include "bgfx/target.h"
#include "imgui/imgui.h"
//============================================================ //============================================================
// DEBUGGING // DEBUGGING
//============================================================ //============================================================
@ -198,6 +200,8 @@ int renderer_bgfx::create()
memset(m_white, 0xff, sizeof(uint32_t) * 16 * 16); memset(m_white, 0xff, sizeof(uint32_t) * 16 * 16);
m_texinfo.push_back(rectangle_packer::packable_rectangle(WHITE_HASH, PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32), 16, 16, 16, nullptr, m_white)); m_texinfo.push_back(rectangle_packer::packable_rectangle(WHITE_HASH, PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32), 16, 16, 16, nullptr, m_white));
imguiCreate();
return 0; return 0;
} }
@ -261,6 +265,8 @@ renderer_bgfx::~renderer_bgfx()
void renderer_bgfx::exit() void renderer_bgfx::exit()
{ {
imguiDestroy();
bgfx::shutdown(); bgfx::shutdown();
s_window_set = false; s_window_set = false;
} }