summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2017-01-02 14:46:55 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2017-01-02 14:46:55 +0100
commita64328499ca0e94c94bb81e51ff5a7e5c0df4336 (patch)
treecfdb0d4ad3c057c3abe537dd218fa66a9ce684dc /src/osd
parentfadb547f630d377b1ff69a7ab09f852855930c56 (diff)
Fix compile with latest BGFX (nw)
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/render/bgfx/chainentry.cpp2
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.cpp5
-rw-r--r--src/osd/modules/render/bgfx/effectmanager.cpp6
-rw-r--r--src/osd/modules/render/bgfx/shadermanager.cpp8
-rw-r--r--src/osd/modules/render/drawbgfx.cpp11
5 files changed, 17 insertions, 15 deletions
diff --git a/src/osd/modules/render/bgfx/chainentry.cpp b/src/osd/modules/render/bgfx/chainentry.cpp
index ab18b4029fa..a53ed759940 100644
--- a/src/osd/modules/render/bgfx/chainentry.cpp
+++ b/src/osd/modules/render/bgfx/chainentry.cpp
@@ -270,7 +270,7 @@ bool bgfx_chain_entry::setup_view(int view, uint16_t screen_width, uint16_t scre
void bgfx_chain_entry::put_screen_buffer(render_primitive* prim, bgfx::TransientVertexBuffer* buffer) const
{
- if (bgfx::checkAvailTransientVertexBuffer(6, ScreenVertex::ms_decl))
+ if (6 == bgfx::getAvailTransientVertexBuffer(6, ScreenVertex::ms_decl))
{
bgfx::allocTransientVertexBuffer(buffer, 6, ScreenVertex::ms_decl);
}
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index 64e71bd213a..40776bb20ce 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/src/osd/modules/render/bgfx/chainmanager.cpp
@@ -9,6 +9,9 @@
//
//============================================================
+#include <bx/readerwriter.h>
+#include <bx/crtimpl.h>
+
#include "emu.h"
#include "../frontend/mame/ui/slider.h"
@@ -18,8 +21,6 @@
#include <rapidjson/document.h>
#include <rapidjson/error/en.h>
-#include <bx/readerwriter.h>
-#include <bx/crtimpl.h>
#include "bgfxutil.h"
#include "chainmanager.h"
diff --git a/src/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp
index 2b6951e18c8..3affa36f2ec 100644
--- a/src/osd/modules/render/bgfx/effectmanager.cpp
+++ b/src/osd/modules/render/bgfx/effectmanager.cpp
@@ -12,12 +12,12 @@
#include <rapidjson/document.h>
#include <rapidjson/error/en.h>
+#include <bx/readerwriter.h>
+#include <bx/crtimpl.h>
+
#include "emu.h"
-#include <bgfx/bgfxplatform.h>
#include <bgfx/bgfx.h>
-#include <bx/readerwriter.h>
-#include <bx/crtimpl.h>
#include "effectmanager.h"
#include "effectreader.h"
diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp
index 6e683b9d14c..e4a665d967c 100644
--- a/src/osd/modules/render/bgfx/shadermanager.cpp
+++ b/src/osd/modules/render/bgfx/shadermanager.cpp
@@ -9,14 +9,14 @@
//
//============================================================
-#include "emu.h"
-
-#include <bgfx/bgfxplatform.h>
-#include <bgfx/bgfx.h>
#include <bx/fpumath.h>
#include <bx/readerwriter.h>
#include <bx/crtimpl.h>
+#include "emu.h"
+
+#include <bgfx/bgfx.h>
+
#include "shadermanager.h"
shader_manager::~shader_manager()
diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index f23a5084d9f..2fb0d0b3a1e 100644
--- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp
@@ -5,6 +5,9 @@
// drawbgfx.cpp - BGFX renderer
//
//============================================================
+#include <bx/fpumath.h>
+#include <bx/readerwriter.h>
+
#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS) || defined(OSD_UWP)
// standard windows headers
#include <windows.h>
@@ -21,10 +24,8 @@
#include "rendutil.h"
#include "aviwrite.h"
-#include <bgfx/bgfxplatform.h>
#include <bgfx/bgfx.h>
-#include <bx/fpumath.h>
-#include <bx/readerwriter.h>
+#include <bgfx/platform.h>
#include <algorithm>
#include "drawbgfx.h"
@@ -866,7 +867,7 @@ int renderer_bgfx::draw(int update)
void renderer_bgfx::update_recording()
{
- bgfx::blit(s_current_view > 0 ? s_current_view - 1 : 0, m_avi_texture, 0, 0, m_avi_target->target());
+ bgfx::blit(s_current_view > 0 ? s_current_view - 1 : 0, m_avi_texture, 0, 0, bgfx::getTexture(m_avi_target->target()));
bgfx::readTexture(m_avi_texture, m_avi_data);
int i = 0;
@@ -1260,7 +1261,7 @@ void renderer_bgfx::allocate_buffer(render_primitive *prim, uint32_t blend, bgfx
}
}
- if (vertices > 0 && bgfx::checkAvailTransientVertexBuffer(vertices, ScreenVertex::ms_decl))
+ if (vertices > 0 && vertices==bgfx::getAvailTransientVertexBuffer(vertices, ScreenVertex::ms_decl))
{
bgfx::allocTransientVertexBuffer(buffer, vertices, ScreenVertex::ms_decl);
}