From a274c9a6c56893d8b70e8317afce54d467f8ec70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 15 Jul 2017 00:17:29 -0700 Subject: [PATCH] Replaced BX_OVERRIDE with override. --- examples/00-helloworld/helloworld.cpp | 6 +- examples/01-cubes/cubes.cpp | 6 +- examples/02-metaballs/metaballs.cpp | 6 +- examples/03-raymarch/raymarch.cpp | 6 +- examples/04-mesh/mesh.cpp | 6 +- examples/05-instancing/instancing.cpp | 6 +- examples/06-bump/bump.cpp | 6 +- examples/07-callback/callback.cpp | 26 ++-- examples/08-update/update.cpp | 6 +- examples/09-hdr/hdr.cpp | 6 +- examples/10-font/font.cpp | 6 +- examples/11-fontsdf/fontsdf.cpp | 6 +- examples/12-lod/lod.cpp | 6 +- examples/13-stencil/stencil.cpp | 6 +- examples/14-shadowvolumes/shadowvolumes.cpp | 6 +- .../shadowmaps_simple.cpp | 6 +- examples/16-shadowmaps/shadowmaps.cpp | 6 +- examples/17-drawstress/drawstress.cpp | 6 +- examples/18-ibl/ibl.cpp | 6 +- examples/19-oit/oit.cpp | 6 +- examples/20-nanovg/nanovg.cpp | 6 +- examples/21-deferred/deferred.cpp | 6 +- examples/22-windows/windows.cpp | 6 +- examples/23-vectordisplay/main.cpp | 6 +- examples/24-nbody/nbody.cpp | 6 +- examples/26-occlusion/occlusion.cpp | 6 +- examples/27-terrain/terrain.cpp | 6 +- examples/28-wireframe/wireframe.cpp | 6 +- examples/29-debugdraw/debugdraw.cpp | 6 +- examples/30-picking/picking.cpp | 6 +- examples/31-rsm/reflectiveshadowmap.cpp | 6 +- examples/32-particles/particles.cpp | 6 +- examples/33-pom/pom.cpp | 6 +- examples/common/entry/entry.cpp | 4 +- examples/common/imgui/scintilla.cpp | 136 +++++++++--------- src/bgfx.cpp | 40 +++--- src/hmd_ovr.h | 26 ++-- src/renderer_d3d11.cpp | 94 ++++++------ src/renderer_d3d12.cpp | 84 +++++------ src/renderer_d3d9.cpp | 84 +++++------ src/renderer_gl.cpp | 92 ++++++------ src/renderer_gl.h | 2 +- src/renderer_mtl.mm | 88 ++++++------ src/renderer_noop.cpp | 84 +++++------ src/renderer_vk.cpp | 84 +++++------ tools/shaderc/shaderc.cpp | 4 +- tools/shaderc/shaderc.h | 2 +- tools/shaderc/shaderc_spirv.cpp | 2 +- 48 files changed, 522 insertions(+), 522 deletions(-) diff --git a/examples/00-helloworld/helloworld.cpp b/examples/00-helloworld/helloworld.cpp index eca76181b..a66acd13f 100644 --- a/examples/00-helloworld/helloworld.cpp +++ b/examples/00-helloworld/helloworld.cpp @@ -20,7 +20,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -46,7 +46,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -56,7 +56,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/01-cubes/cubes.cpp b/examples/01-cubes/cubes.cpp index c048b8096..3e1f86ade 100644 --- a/examples/01-cubes/cubes.cpp +++ b/examples/01-cubes/cubes.cpp @@ -83,7 +83,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { BX_UNUSED(s_cubeTriList, s_cubeTriStrip); @@ -132,7 +132,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -147,7 +147,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/02-metaballs/metaballs.cpp b/examples/02-metaballs/metaballs.cpp index 391b99c55..a0dd5f9b0 100644 --- a/examples/02-metaballs/metaballs.cpp +++ b/examples/02-metaballs/metaballs.cpp @@ -484,7 +484,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -524,7 +524,7 @@ public: imguiCreate(); } - int shutdown() BX_OVERRIDE + int shutdown() override { imguiDestroy(); @@ -539,7 +539,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { const uint32_t ypitch = DIMS; const uint32_t zpitch = DIMS*DIMS; diff --git a/examples/03-raymarch/raymarch.cpp b/examples/03-raymarch/raymarch.cpp index 04708eeec..a82e43209 100644 --- a/examples/03-raymarch/raymarch.cpp +++ b/examples/03-raymarch/raymarch.cpp @@ -107,7 +107,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -144,7 +144,7 @@ public: imguiCreate(); } - int shutdown() BX_OVERRIDE + int shutdown() override { imguiDestroy(); @@ -160,7 +160,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/04-mesh/mesh.cpp b/examples/04-mesh/mesh.cpp index 0ee50996a..4bb7e607b 100644 --- a/examples/04-mesh/mesh.cpp +++ b/examples/04-mesh/mesh.cpp @@ -18,7 +18,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -53,7 +53,7 @@ public: imguiCreate(); } - int shutdown() BX_OVERRIDE + int shutdown() override { imguiDestroy(); @@ -70,7 +70,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/05-instancing/instancing.cpp b/examples/05-instancing/instancing.cpp index 5d34f2a78..4ee421be1 100644 --- a/examples/05-instancing/instancing.cpp +++ b/examples/05-instancing/instancing.cpp @@ -67,7 +67,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -112,7 +112,7 @@ public: imguiCreate(); } - int shutdown() BX_OVERRIDE + int shutdown() override { imguiDestroy(); @@ -127,7 +127,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/06-bump/bump.cpp b/examples/06-bump/bump.cpp index 62e3c6024..ad1ed2ed8 100644 --- a/examples/06-bump/bump.cpp +++ b/examples/06-bump/bump.cpp @@ -90,7 +90,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -158,7 +158,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -179,7 +179,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/07-callback/callback.cpp b/examples/07-callback/callback.cpp index 9b6f06974..c3a47b8dd 100644 --- a/examples/07-callback/callback.cpp +++ b/examples/07-callback/callback.cpp @@ -127,7 +127,7 @@ struct BgfxCallback : public bgfx::CallbackI { } - virtual void fatal(bgfx::Fatal::Enum _code, const char* _str) BX_OVERRIDE + virtual void fatal(bgfx::Fatal::Enum _code, const char* _str) override { // Something unexpected happened, inform user and bail out. bx::debugPrintf("Fatal error: 0x%08x: %s", _code, _str); @@ -136,13 +136,13 @@ struct BgfxCallback : public bgfx::CallbackI abort(); } - virtual void traceVargs(const char* _filePath, uint16_t _line, const char* _format, va_list _argList) BX_OVERRIDE + virtual void traceVargs(const char* _filePath, uint16_t _line, const char* _format, va_list _argList) override { bx::debugPrintf("%s (%d): ", _filePath, _line); bx::debugPrintfVargs(_format, _argList); } - virtual uint32_t cacheReadSize(uint64_t _id) BX_OVERRIDE + virtual uint32_t cacheReadSize(uint64_t _id) override { char filePath[256]; bx::snprintf(filePath, sizeof(filePath), "temp/%016" PRIx64, _id); @@ -162,7 +162,7 @@ struct BgfxCallback : public bgfx::CallbackI return 0; } - virtual bool cacheRead(uint64_t _id, void* _data, uint32_t _size) BX_OVERRIDE + virtual bool cacheRead(uint64_t _id, void* _data, uint32_t _size) override { char filePath[256]; bx::snprintf(filePath, sizeof(filePath), "temp/%016" PRIx64, _id); @@ -184,7 +184,7 @@ struct BgfxCallback : public bgfx::CallbackI return false; } - virtual void cacheWrite(uint64_t _id, const void* _data, uint32_t _size) BX_OVERRIDE + virtual void cacheWrite(uint64_t _id, const void* _data, uint32_t _size) override { char filePath[256]; bx::snprintf(filePath, sizeof(filePath), "temp/%016" PRIx64, _id); @@ -200,7 +200,7 @@ struct BgfxCallback : public bgfx::CallbackI } } - virtual void screenShot(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t _pitch, const void* _data, uint32_t /*_size*/, bool _yflip) BX_OVERRIDE + virtual void screenShot(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t _pitch, const void* _data, uint32_t /*_size*/, bool _yflip) override { char temp[1024]; @@ -209,7 +209,7 @@ struct BgfxCallback : public bgfx::CallbackI saveTga(temp, _width, _height, _pitch, _data, false, _yflip); } - virtual void captureBegin(uint32_t _width, uint32_t _height, uint32_t /*_pitch*/, bgfx::TextureFormat::Enum /*_format*/, bool _yflip) BX_OVERRIDE + virtual void captureBegin(uint32_t _width, uint32_t _height, uint32_t /*_pitch*/, bgfx::TextureFormat::Enum /*_format*/, bool _yflip) override { m_writer = BX_NEW(entry::getAllocator(), AviWriter)(entry::getFileWriter() ); if (!m_writer->open("temp/capture.avi", _width, _height, 60, _yflip) ) @@ -219,7 +219,7 @@ struct BgfxCallback : public bgfx::CallbackI } } - virtual void captureEnd() BX_OVERRIDE + virtual void captureEnd() override { if (NULL != m_writer) { @@ -229,7 +229,7 @@ struct BgfxCallback : public bgfx::CallbackI } } - virtual void captureFrame(const void* _data, uint32_t /*_size*/) BX_OVERRIDE + virtual void captureFrame(const void* _data, uint32_t /*_size*/) override { if (NULL != m_writer) { @@ -253,7 +253,7 @@ public: { } - virtual void* realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) BX_OVERRIDE + virtual void* realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) override { if (0 == _size) { @@ -322,7 +322,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -379,7 +379,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -396,7 +396,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { bool exit = false; diff --git a/examples/08-update/update.cpp b/examples/08-update/update.cpp index 3ce7b80cf..cd1cacd0b 100644 --- a/examples/08-update/update.cpp +++ b/examples/08-update/update.cpp @@ -127,7 +127,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -292,7 +292,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -346,7 +346,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/09-hdr/hdr.cpp b/examples/09-hdr/hdr.cpp index e8766061a..141c55b0a 100644 --- a/examples/09-hdr/hdr.cpp +++ b/examples/09-hdr/hdr.cpp @@ -145,7 +145,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -231,7 +231,7 @@ public: m_time = 0.0f; } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { // Cleanup. imguiDestroy(); @@ -273,7 +273,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp index 3b8e338e6..f34007a57 100644 --- a/examples/10-font/font.cpp +++ b/examples/10-font/font.cpp @@ -59,7 +59,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -185,7 +185,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -214,7 +214,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/11-fontsdf/fontsdf.cpp b/examples/11-fontsdf/fontsdf.cpp index c6478d248..560c7c47e 100644 --- a/examples/11-fontsdf/fontsdf.cpp +++ b/examples/11-fontsdf/fontsdf.cpp @@ -42,7 +42,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -102,7 +102,7 @@ public: m_textSize = 14.0f; } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -124,7 +124,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/12-lod/lod.cpp b/examples/12-lod/lod.cpp index 32bb2f21c..2b4d915c3 100644 --- a/examples/12-lod/lod.cpp +++ b/examples/12-lod/lod.cpp @@ -34,7 +34,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -99,7 +99,7 @@ public: m_targetLod = 0; } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -126,7 +126,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/13-stencil/stencil.cpp b/examples/13-stencil/stencil.cpp index 34200e2f0..7bdd4b1c5 100644 --- a/examples/13-stencil/stencil.cpp +++ b/examples/13-stencil/stencil.cpp @@ -795,7 +795,7 @@ public: { } - virtual void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + virtual void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -876,7 +876,7 @@ public: m_updateScene = true; } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { // Cleanup. m_bunnyMesh.unload(); @@ -908,7 +908,7 @@ public: return 0; } - virtual bool update() BX_OVERRIDE + virtual bool update() override { if (!entry::processEvents(m_viewState.m_width, m_viewState.m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp index 9bcd55ff7..713083247 100644 --- a/examples/14-shadowvolumes/shadowvolumes.cpp +++ b/examples/14-shadowvolumes/shadowvolumes.cpp @@ -1875,7 +1875,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -2041,7 +2041,7 @@ public: cameraGetViewMtx(m_viewState.m_view); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { // Cleanup m_bunnyLowPolyModel.unload(); @@ -2089,7 +2089,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_viewState.m_width, m_viewState.m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp index b1442f329..96db3e217 100644 --- a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp +++ b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp @@ -66,7 +66,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -221,7 +221,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -251,7 +251,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/16-shadowmaps/shadowmaps.cpp b/examples/16-shadowmaps/shadowmaps.cpp index 561e1a498..a86f69ede 100644 --- a/examples/16-shadowmaps/shadowmaps.cpp +++ b/examples/16-shadowmaps/shadowmaps.cpp @@ -1289,7 +1289,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -1905,7 +1905,7 @@ public: m_timeAccumulatorScene = 0.0f; } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { m_bunnyMesh.unload(); m_treeMesh.unload(); @@ -1943,7 +1943,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/17-drawstress/drawstress.cpp b/examples/17-drawstress/drawstress.cpp index fb7561924..ae6a506fd 100644 --- a/examples/17-drawstress/drawstress.cpp +++ b/examples/17-drawstress/drawstress.cpp @@ -91,7 +91,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -154,7 +154,7 @@ public: imguiCreate(); } - int shutdown() BX_OVERRIDE + int shutdown() override { // Cleanup. imguiDestroy(); @@ -168,7 +168,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/18-ibl/ibl.cpp b/examples/18-ibl/ibl.cpp index fe94a1a81..135237e3a 100644 --- a/examples/18-ibl/ibl.cpp +++ b/examples/18-ibl/ibl.cpp @@ -489,7 +489,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -542,7 +542,7 @@ public: m_meshOrb = meshLoad("meshes/orb.bin"); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { meshUnload(m_meshBunny); meshUnload(m_meshOrb); @@ -574,7 +574,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/19-oit/oit.cpp b/examples/19-oit/oit.cpp index 3bd9c93b6..b21c0a636 100644 --- a/examples/19-oit/oit.cpp +++ b/examples/19-oit/oit.cpp @@ -157,7 +157,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -230,7 +230,7 @@ public: m_timeOffset = bx::getHPCounter(); } - int shutdown() BX_OVERRIDE + int shutdown() override { // Cleanup. imguiDestroy(); @@ -253,7 +253,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/20-nanovg/nanovg.cpp b/examples/20-nanovg/nanovg.cpp index 0e91733a8..77e8d41f1 100644 --- a/examples/20-nanovg/nanovg.cpp +++ b/examples/20-nanovg/nanovg.cpp @@ -1241,7 +1241,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -1277,7 +1277,7 @@ public: m_timeOffset = bx::getHPCounter(); } - int shutdown() BX_OVERRIDE + int shutdown() override { freeDemoData(m_nvg, &m_data); @@ -1291,7 +1291,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/21-deferred/deferred.cpp b/examples/21-deferred/deferred.cpp index 85bc8b1ce..97c1ee55d 100644 --- a/examples/21-deferred/deferred.cpp +++ b/examples/21-deferred/deferred.cpp @@ -198,7 +198,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -316,7 +316,7 @@ public: cameraSetVerticalAngle(0.0f); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { // Cleanup. cameraDestroy(); @@ -357,7 +357,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/22-windows/windows.cpp b/examples/22-windows/windows.cpp index 1a45e6bdb..91bc4e396 100644 --- a/examples/22-windows/windows.cpp +++ b/examples/22-windows/windows.cpp @@ -74,7 +74,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -140,7 +140,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -165,7 +165,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { entry::WindowState state; if (!entry::processWindowEvents(state, m_debug, m_reset) ) diff --git a/examples/23-vectordisplay/main.cpp b/examples/23-vectordisplay/main.cpp index 700aa7876..e71943e08 100644 --- a/examples/23-vectordisplay/main.cpp +++ b/examples/23-vectordisplay/main.cpp @@ -42,7 +42,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); m_width = _width; @@ -75,7 +75,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -88,7 +88,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/24-nbody/nbody.cpp b/examples/24-nbody/nbody.cpp index 00d63cee5..29804974c 100644 --- a/examples/24-nbody/nbody.cpp +++ b/examples/24-nbody/nbody.cpp @@ -118,7 +118,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -213,7 +213,7 @@ public: } } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { // Cleanup. cameraDestroy(); @@ -242,7 +242,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/26-occlusion/occlusion.cpp b/examples/26-occlusion/occlusion.cpp index 77b8e99bd..708aa9442 100644 --- a/examples/26-occlusion/occlusion.cpp +++ b/examples/26-occlusion/occlusion.cpp @@ -70,7 +70,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -135,7 +135,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -157,7 +157,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/27-terrain/terrain.cpp b/examples/27-terrain/terrain.cpp index 3c9e2d7ed..3c8f74405 100644 --- a/examples/27-terrain/terrain.cpp +++ b/examples/27-terrain/terrain.cpp @@ -67,7 +67,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -135,7 +135,7 @@ public: cameraSetVerticalAngle(-bx::kPi/4.0f); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { // Cleanup. cameraDestroy(); @@ -381,7 +381,7 @@ public: } } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/28-wireframe/wireframe.cpp b/examples/28-wireframe/wireframe.cpp index 891a5723c..b08ac6e6e 100644 --- a/examples/28-wireframe/wireframe.cpp +++ b/examples/28-wireframe/wireframe.cpp @@ -291,7 +291,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -337,7 +337,7 @@ public: m_drawMode = DrawMode::WireframeShaded; } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { // Cleanup. imguiDestroy(); @@ -357,7 +357,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/29-debugdraw/debugdraw.cpp b/examples/29-debugdraw/debugdraw.cpp index 0e197e510..8b3d8d6e7 100644 --- a/examples/29-debugdraw/debugdraw.cpp +++ b/examples/29-debugdraw/debugdraw.cpp @@ -37,7 +37,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -78,7 +78,7 @@ public: imguiCreate(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { imguiDestroy(); @@ -94,7 +94,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/30-picking/picking.cpp b/examples/30-picking/picking.cpp index 06ed4a2ba..e14a1800b 100644 --- a/examples/30-picking/picking.cpp +++ b/examples/30-picking/picking.cpp @@ -26,7 +26,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -153,7 +153,7 @@ public: imguiCreate(); } - int shutdown() BX_OVERRIDE + int shutdown() override { for (uint32_t ii = 0; ii < 12; ++ii) { @@ -180,7 +180,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/31-rsm/reflectiveshadowmap.cpp b/examples/31-rsm/reflectiveshadowmap.cpp index b686620a4..b592066fe 100644 --- a/examples/31-rsm/reflectiveshadowmap.cpp +++ b/examples/31-rsm/reflectiveshadowmap.cpp @@ -199,7 +199,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -375,7 +375,7 @@ public: imguiCreate(); } - int shutdown() BX_OVERRIDE + int shutdown() override { for (uint32_t ii = 0; ii < BX_COUNTOF(s_meshPaths); ++ii) { @@ -431,7 +431,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/32-particles/particles.cpp b/examples/32-particles/particles.cpp index b4afa829c..4824978be 100644 --- a/examples/32-particles/particles.cpp +++ b/examples/32-particles/particles.cpp @@ -235,7 +235,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -292,7 +292,7 @@ public: m_timeOffset = bx::getHPCounter(); } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { for (uint32_t ii = 0; ii < BX_COUNTOF(m_emitter); ++ii) { @@ -313,7 +313,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/33-pom/pom.cpp b/examples/33-pom/pom.cpp index b1c2867c9..77e269d6e 100644 --- a/examples/33-pom/pom.cpp +++ b/examples/33-pom/pom.cpp @@ -116,7 +116,7 @@ public: { } - void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) BX_OVERRIDE + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); @@ -180,7 +180,7 @@ public: m_num_steps = 16; } - virtual int shutdown() BX_OVERRIDE + virtual int shutdown() override { // Cleanup. bgfx::destroyIndexBuffer(m_ibh); @@ -204,7 +204,7 @@ public: return 0; } - bool update() BX_OVERRIDE + bool update() override { if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp index 84cb5ee12..bc6d956be 100644 --- a/examples/common/entry/entry.cpp +++ b/examples/common/entry/entry.cpp @@ -62,7 +62,7 @@ namespace entry typedef bx::FileReader super; public: - virtual bool open(const bx::FilePath& _filePath, bx::Error* _err) BX_OVERRIDE + virtual bool open(const bx::FilePath& _filePath, bx::Error* _err) override { String filePath(s_currentDir); filePath.append(_filePath.get() ); @@ -75,7 +75,7 @@ namespace entry typedef bx::FileWriter super; public: - virtual bool open(const bx::FilePath& _filePath, bool _append, bx::Error* _err) BX_OVERRIDE + virtual bool open(const bx::FilePath& _filePath, bool _append, bx::Error* _err) override { String filePath(s_currentDir); filePath.append(_filePath.get() ); diff --git a/examples/common/imgui/scintilla.cpp b/examples/common/imgui/scintilla.cpp index b11befea8..0b881c091 100644 --- a/examples/common/imgui/scintilla.cpp +++ b/examples/common/imgui/scintilla.cpp @@ -104,79 +104,79 @@ public: { } - virtual void Init(Scintilla::WindowID /*_wid*/) BX_OVERRIDE + virtual void Init(Scintilla::WindowID /*_wid*/) override { } - virtual void Init(Scintilla::SurfaceID /*_sid*/, Scintilla::WindowID /*_wid*/) BX_OVERRIDE + virtual void Init(Scintilla::SurfaceID /*_sid*/, Scintilla::WindowID /*_wid*/) override { } - virtual void InitPixMap(int /*_width*/, int /*_height*/, Scintilla::Surface* /*_surface*/, Scintilla::WindowID /*_wid*/) BX_OVERRIDE + virtual void InitPixMap(int /*_width*/, int /*_height*/, Scintilla::Surface* /*_surface*/, Scintilla::WindowID /*_wid*/) override { } - virtual void Release() BX_OVERRIDE + virtual void Release() override { } - virtual bool Initialised() BX_OVERRIDE + virtual bool Initialised() override { return true; } - virtual void PenColour(Scintilla::ColourDesired /*_fore*/) BX_OVERRIDE + virtual void PenColour(Scintilla::ColourDesired /*_fore*/) override { } - virtual int LogPixelsY() BX_OVERRIDE + virtual int LogPixelsY() override { return 72; } - virtual int DeviceHeightFont(int /*points*/) BX_OVERRIDE + virtual int DeviceHeightFont(int /*points*/) override { return 1500; } - virtual void MoveTo(int _x, int _y) BX_OVERRIDE + virtual void MoveTo(int _x, int _y) override { BX_UNUSED(_x, _y); } - virtual void LineTo(int _x, int _y) BX_OVERRIDE + virtual void LineTo(int _x, int _y) override { BX_UNUSED(_x, _y); } - virtual void Polygon(Scintilla::Point *pts, int npts, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) BX_OVERRIDE + virtual void Polygon(Scintilla::Point *pts, int npts, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) override { BX_UNUSED(pts, npts, fore, back); } - virtual void RectangleDraw(Scintilla::PRectangle rc, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) BX_OVERRIDE + virtual void RectangleDraw(Scintilla::PRectangle rc, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) override { BX_UNUSED(fore); FillRectangle(rc, back); } - virtual void FillRectangle(Scintilla::PRectangle rc, Scintilla::ColourDesired back) BX_OVERRIDE + virtual void FillRectangle(Scintilla::PRectangle rc, Scintilla::ColourDesired back) override { fillRectangle(rc, back); } - virtual void FillRectangle(Scintilla::PRectangle rc, Scintilla::Surface& surfacePattern) BX_OVERRIDE + virtual void FillRectangle(Scintilla::PRectangle rc, Scintilla::Surface& surfacePattern) override { BX_UNUSED(rc, surfacePattern); } - virtual void RoundedRectangle(Scintilla::PRectangle rc, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) BX_OVERRIDE + virtual void RoundedRectangle(Scintilla::PRectangle rc, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) override { BX_UNUSED(rc, fore, back); } - virtual void AlphaRectangle(Scintilla::PRectangle _rc, int /*_cornerSize*/, Scintilla::ColourDesired _fill, int _alphaFill, Scintilla::ColourDesired /*_outline*/, int /*_alphaOutline*/, int /*_flags*/) BX_OVERRIDE + virtual void AlphaRectangle(Scintilla::PRectangle _rc, int /*_cornerSize*/, Scintilla::ColourDesired _fill, int _alphaFill, Scintilla::ColourDesired /*_outline*/, int /*_alphaOutline*/, int /*_flags*/) override { unsigned int back = 0 | (uint32_t)( (_fill.AsLong() & 0xffffff) @@ -187,37 +187,37 @@ public: } - virtual void DrawRGBAImage(Scintilla::PRectangle /*_rc*/, int /*_width*/, int /*_height*/, const unsigned char* /*_pixelsImage*/) BX_OVERRIDE + virtual void DrawRGBAImage(Scintilla::PRectangle /*_rc*/, int /*_width*/, int /*_height*/, const unsigned char* /*_pixelsImage*/) override { } - virtual void Ellipse(Scintilla::PRectangle rc, Scintilla::ColourDesired fore, Scintilla::ColourDesired /*back*/) BX_OVERRIDE + virtual void Ellipse(Scintilla::PRectangle rc, Scintilla::ColourDesired fore, Scintilla::ColourDesired /*back*/) override { FillRectangle(rc, fore); } - virtual void Copy(Scintilla::PRectangle /*_rc*/, Scintilla::Point /*_from*/, Scintilla::Surface& /*_surfaceSource*/) BX_OVERRIDE + virtual void Copy(Scintilla::PRectangle /*_rc*/, Scintilla::Point /*_from*/, Scintilla::Surface& /*_surfaceSource*/) override { } - virtual void DrawTextNoClip(Scintilla::PRectangle rc, Scintilla::Font& _font, Scintilla::XYPOSITION ybase, const char *s, int len, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) BX_OVERRIDE + virtual void DrawTextNoClip(Scintilla::PRectangle rc, Scintilla::Font& _font, Scintilla::XYPOSITION ybase, const char *s, int len, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) override { BX_UNUSED(back); DrawTextBase(rc, _font, ybase, s, len, fore); } - virtual void DrawTextClipped(Scintilla::PRectangle rc, Scintilla::Font& _font, Scintilla::XYPOSITION ybase, const char *s, int len, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) BX_OVERRIDE + virtual void DrawTextClipped(Scintilla::PRectangle rc, Scintilla::Font& _font, Scintilla::XYPOSITION ybase, const char *s, int len, Scintilla::ColourDesired fore, Scintilla::ColourDesired back) override { BX_UNUSED(back); DrawTextBase(rc, _font, ybase, s, len, fore); } - virtual void DrawTextTransparent(Scintilla::PRectangle rc, Scintilla::Font& _font, Scintilla::XYPOSITION ybase, const char *s, int len, Scintilla::ColourDesired fore) BX_OVERRIDE + virtual void DrawTextTransparent(Scintilla::PRectangle rc, Scintilla::Font& _font, Scintilla::XYPOSITION ybase, const char *s, int len, Scintilla::ColourDesired fore) override { DrawTextBase(rc, _font, ybase, s, len, fore); } - virtual void MeasureWidths(Scintilla::Font& /*_font*/, const char* _str, int _len, Scintilla::XYPOSITION* _positions) BX_OVERRIDE + virtual void MeasureWidths(Scintilla::Font& /*_font*/, const char* _str, int _len, Scintilla::XYPOSITION* _positions) override { float position = 0; @@ -230,63 +230,63 @@ public: } } - virtual Scintilla::XYPOSITION WidthText(Scintilla::Font& /*_font*/, const char* _str, int _len) BX_OVERRIDE + virtual Scintilla::XYPOSITION WidthText(Scintilla::Font& /*_font*/, const char* _str, int _len) override { ImVec2 t = ImGui::CalcTextSize(_str, _str + _len); return t.x; } - virtual Scintilla::XYPOSITION WidthChar(Scintilla::Font& _font, char ch) BX_OVERRIDE + virtual Scintilla::XYPOSITION WidthChar(Scintilla::Font& _font, char ch) override { FontInt* fi = (FontInt*)_font.GetID(); return fi->m_font->GetCharAdvance( (unsigned int)ch) * fi->m_scale; } - virtual Scintilla::XYPOSITION Ascent(Scintilla::Font& _font) BX_OVERRIDE + virtual Scintilla::XYPOSITION Ascent(Scintilla::Font& _font) override { FontInt* fi = (FontInt*)_font.GetID(); return fi->m_font->Ascent * fi->m_scale; } - virtual Scintilla::XYPOSITION Descent(Scintilla::Font& _font) BX_OVERRIDE + virtual Scintilla::XYPOSITION Descent(Scintilla::Font& _font) override { FontInt* fi = (FontInt*)_font.GetID(); return -fi->m_font->Descent * fi->m_scale; } - virtual Scintilla::XYPOSITION InternalLeading(Scintilla::Font& /*_font*/) BX_OVERRIDE + virtual Scintilla::XYPOSITION InternalLeading(Scintilla::Font& /*_font*/) override { return 0; } - virtual Scintilla::XYPOSITION ExternalLeading(Scintilla::Font& /*_font*/) BX_OVERRIDE + virtual Scintilla::XYPOSITION ExternalLeading(Scintilla::Font& /*_font*/) override { return 0; } - virtual Scintilla::XYPOSITION Height(Scintilla::Font& _font) BX_OVERRIDE + virtual Scintilla::XYPOSITION Height(Scintilla::Font& _font) override { return Ascent(_font) + Descent(_font); } - virtual Scintilla::XYPOSITION AverageCharWidth(Scintilla::Font& _font) BX_OVERRIDE + virtual Scintilla::XYPOSITION AverageCharWidth(Scintilla::Font& _font) override { return WidthChar(_font, 'n'); } - virtual void SetClip(Scintilla::PRectangle /*_rc*/) BX_OVERRIDE + virtual void SetClip(Scintilla::PRectangle /*_rc*/) override { } - virtual void FlushCachedState() BX_OVERRIDE + virtual void FlushCachedState() override { } - virtual void SetUnicodeMode(bool /*_unicodeMode*/) BX_OVERRIDE + virtual void SetUnicodeMode(bool /*_unicodeMode*/) override { } - virtual void SetDBCSMode(int /*_codePage*/) BX_OVERRIDE + virtual void SetDBCSMode(int /*_codePage*/) override { } @@ -350,11 +350,11 @@ public: { } - virtual void SetFont(Scintilla::Font& /*_font*/) BX_OVERRIDE + virtual void SetFont(Scintilla::Font& /*_font*/) override { } - virtual void Create(Scintilla::Window& /*_parent*/, int /*_ctrlID*/, Scintilla::Point _location, int _lineHeight, bool _unicodeMode, int /*_technology*/) BX_OVERRIDE + virtual void Create(Scintilla::Window& /*_parent*/, int /*_ctrlID*/, Scintilla::Point _location, int _lineHeight, bool _unicodeMode, int /*_technology*/) override { m_location = _location; m_lineHeight = _lineHeight; @@ -363,22 +363,22 @@ public: wid = Scintilla::WindowID(4); } - virtual void SetAverageCharWidth(int width) BX_OVERRIDE + virtual void SetAverageCharWidth(int width) override { m_aveCharWidth = width; } - virtual void SetVisibleRows(int rows) BX_OVERRIDE + virtual void SetVisibleRows(int rows) override { m_desiredVisibleRows = rows; } - virtual int GetVisibleRows() const BX_OVERRIDE + virtual int GetVisibleRows() const override { return m_desiredVisibleRows; } - virtual Scintilla::PRectangle GetDesiredRect() BX_OVERRIDE + virtual Scintilla::PRectangle GetDesiredRect() override { Scintilla::PRectangle rc; rc.top = 0; @@ -388,60 +388,60 @@ public: return rc; } - virtual int CaretFromEdge() BX_OVERRIDE + virtual int CaretFromEdge() override { return 4 + 16; } - virtual void Clear() BX_OVERRIDE + virtual void Clear() override { } - virtual void Append(char* /*s*/, int /*type = -1*/) BX_OVERRIDE + virtual void Append(char* /*s*/, int /*type = -1*/) override { } - virtual int Length() BX_OVERRIDE + virtual int Length() override { return 0; } - virtual void Select(int /*n*/) BX_OVERRIDE + virtual void Select(int /*n*/) override { } - virtual int GetSelection() BX_OVERRIDE + virtual int GetSelection() override { return 0; } - virtual int Find(const char* /*prefix*/) BX_OVERRIDE + virtual int Find(const char* /*prefix*/) override { return 0; } - virtual void GetValue(int /*n*/, char* value, int /*len*/) BX_OVERRIDE + virtual void GetValue(int /*n*/, char* value, int /*len*/) override { value[0] = '\0'; } - virtual void RegisterImage(int /*type*/, const char* /*xpm_data*/) BX_OVERRIDE + virtual void RegisterImage(int /*type*/, const char* /*xpm_data*/) override { } - virtual void RegisterRGBAImage(int /*type*/, int /*width*/, int /*height*/, const unsigned char* /*pixelsImage*/) BX_OVERRIDE + virtual void RegisterRGBAImage(int /*type*/, int /*width*/, int /*height*/, const unsigned char* /*pixelsImage*/) override { } - virtual void ClearRegisteredImages() BX_OVERRIDE + virtual void ClearRegisteredImages() override { } - virtual void SetDoubleClickAction(Scintilla::CallBackAction, void*) BX_OVERRIDE + virtual void SetDoubleClickAction(Scintilla::CallBackAction, void*) override { } - virtual void SetList(const char* /*list*/, char /*separator*/, char /*typesep*/) BX_OVERRIDE + virtual void SetList(const char* /*list*/, char /*separator*/, char /*typesep*/) override { } @@ -499,7 +499,7 @@ public: { } - virtual void Initialise() BX_OVERRIDE + virtual void Initialise() override { wMain = AllocateWindowInt(); @@ -560,7 +560,7 @@ public: CaretSetPeriod(0); } - virtual void CreateCallTipWindow(Scintilla::PRectangle /*_rc*/) BX_OVERRIDE + virtual void CreateCallTipWindow(Scintilla::PRectangle /*_rc*/) override { if (!ct.wCallTip.Created() ) { @@ -569,7 +569,7 @@ public: } } - virtual void AddToPopUp(const char* /*_label*/, int /*_cmd*/, bool /*_enabled*/) BX_OVERRIDE + virtual void AddToPopUp(const char* /*_label*/, int /*_cmd*/, bool /*_enabled*/) override { } @@ -581,16 +581,16 @@ public: wMain.SetPosition(Scintilla::PRectangle::FromInts(0, 0, m_width, m_height) ); } - virtual void SetVerticalScrollPos() BX_OVERRIDE + virtual void SetVerticalScrollPos() override { } - virtual void SetHorizontalScrollPos() BX_OVERRIDE + virtual void SetHorizontalScrollPos() override { xOffset = 0; } - virtual bool ModifyScrollBars(int /*nMax*/, int /*nPage*/) BX_OVERRIDE + virtual bool ModifyScrollBars(int /*nMax*/, int /*nPage*/) override { return false; } @@ -599,37 +599,37 @@ public: { } - virtual void Copy() BX_OVERRIDE + virtual void Copy() override { } - virtual void Paste() BX_OVERRIDE + virtual void Paste() override { } - virtual void NotifyChange() BX_OVERRIDE + virtual void NotifyChange() override { } - virtual void NotifyParent(Scintilla::SCNotification /*scn*/) BX_OVERRIDE + virtual void NotifyParent(Scintilla::SCNotification /*scn*/) override { } - virtual void CopyToClipboard(const Scintilla::SelectionText& /*selectedText*/) BX_OVERRIDE + virtual void CopyToClipboard(const Scintilla::SelectionText& /*selectedText*/) override { } - virtual void SetMouseCapture(bool /*on*/) BX_OVERRIDE + virtual void SetMouseCapture(bool /*on*/) override { } - virtual bool HaveMouseCapture() BX_OVERRIDE + virtual bool HaveMouseCapture() override { return false; } - virtual sptr_t DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, sptr_t /*lParam*/) BX_OVERRIDE + virtual sptr_t DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, sptr_t /*lParam*/) override { return 0; } diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 1800c8f3c..a50f5bccf 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -66,7 +66,7 @@ namespace bgfx { } - virtual void traceVargs(const char* _filePath, uint16_t _line, const char* _format, va_list _argList) BX_OVERRIDE + virtual void traceVargs(const char* _filePath, uint16_t _line, const char* _format, va_list _argList) override { char temp[2048]; char* out = temp; @@ -85,7 +85,7 @@ namespace bgfx bx::debugOutput(out); } - virtual void fatal(Fatal::Enum _code, const char* _str) BX_OVERRIDE + virtual void fatal(Fatal::Enum _code, const char* _str) override { if (Fatal::DebugCheck == _code) { @@ -99,21 +99,21 @@ namespace bgfx } } - virtual uint32_t cacheReadSize(uint64_t /*_id*/) BX_OVERRIDE + virtual uint32_t cacheReadSize(uint64_t /*_id*/) override { return 0; } - virtual bool cacheRead(uint64_t /*_id*/, void* /*_data*/, uint32_t /*_size*/) BX_OVERRIDE + virtual bool cacheRead(uint64_t /*_id*/, void* /*_data*/, uint32_t /*_size*/) override { return false; } - virtual void cacheWrite(uint64_t /*_id*/, const void* /*_data*/, uint32_t /*_size*/) BX_OVERRIDE + virtual void cacheWrite(uint64_t /*_id*/, const void* /*_data*/, uint32_t /*_size*/) override { } - virtual void screenShot(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t _pitch, const void* _data, uint32_t _size, bool _yflip) BX_OVERRIDE + virtual void screenShot(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t _pitch, const void* _data, uint32_t _size, bool _yflip) override { BX_UNUSED(_filePath, _width, _height, _pitch, _data, _size, _yflip); @@ -130,16 +130,16 @@ namespace bgfx } } - virtual void captureBegin(uint32_t /*_width*/, uint32_t /*_height*/, uint32_t /*_pitch*/, TextureFormat::Enum /*_format*/, bool /*_yflip*/) BX_OVERRIDE + virtual void captureBegin(uint32_t /*_width*/, uint32_t /*_height*/, uint32_t /*_pitch*/, TextureFormat::Enum /*_format*/, bool /*_yflip*/) override { BX_TRACE("Warning: using capture without callback (a.k.a. pointless)."); } - virtual void captureEnd() BX_OVERRIDE + virtual void captureEnd() override { } - virtual void captureFrame(const void* /*_data*/, uint32_t /*_size*/) BX_OVERRIDE + virtual void captureFrame(const void* /*_data*/, uint32_t /*_size*/) override { } }; @@ -159,7 +159,7 @@ namespace bgfx { } - virtual void* realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) BX_OVERRIDE + virtual void* realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) override { if (0 == _size) { @@ -4096,47 +4096,47 @@ namespace bgfx { } - virtual void fatal(Fatal::Enum _code, const char* _str) BX_OVERRIDE + virtual void fatal(Fatal::Enum _code, const char* _str) override { m_interface->vtbl->fatal(m_interface, (bgfx_fatal_t)_code, _str); } - virtual void traceVargs(const char* _filePath, uint16_t _line, const char* _format, va_list _argList) BX_OVERRIDE + virtual void traceVargs(const char* _filePath, uint16_t _line, const char* _format, va_list _argList) override { m_interface->vtbl->trace_vargs(m_interface, _filePath, _line, _format, _argList); } - virtual uint32_t cacheReadSize(uint64_t _id) BX_OVERRIDE + virtual uint32_t cacheReadSize(uint64_t _id) override { return m_interface->vtbl->cache_read_size(m_interface, _id); } - virtual bool cacheRead(uint64_t _id, void* _data, uint32_t _size) BX_OVERRIDE + virtual bool cacheRead(uint64_t _id, void* _data, uint32_t _size) override { return m_interface->vtbl->cache_read(m_interface, _id, _data, _size); } - virtual void cacheWrite(uint64_t _id, const void* _data, uint32_t _size) BX_OVERRIDE + virtual void cacheWrite(uint64_t _id, const void* _data, uint32_t _size) override { m_interface->vtbl->cache_write(m_interface, _id, _data, _size); } - virtual void screenShot(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t _pitch, const void* _data, uint32_t _size, bool _yflip) BX_OVERRIDE + virtual void screenShot(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t _pitch, const void* _data, uint32_t _size, bool _yflip) override { m_interface->vtbl->screen_shot(m_interface, _filePath, _width, _height, _pitch, _data, _size, _yflip); } - virtual void captureBegin(uint32_t _width, uint32_t _height, uint32_t _pitch, TextureFormat::Enum _format, bool _yflip) BX_OVERRIDE + virtual void captureBegin(uint32_t _width, uint32_t _height, uint32_t _pitch, TextureFormat::Enum _format, bool _yflip) override { m_interface->vtbl->capture_begin(m_interface, _width, _height, _pitch, (bgfx_texture_format_t)_format, _yflip); } - virtual void captureEnd() BX_OVERRIDE + virtual void captureEnd() override { m_interface->vtbl->capture_end(m_interface); } - virtual void captureFrame(const void* _data, uint32_t _size) BX_OVERRIDE + virtual void captureFrame(const void* _data, uint32_t _size) override { m_interface->vtbl->capture_frame(m_interface, _data, _size); } @@ -4151,7 +4151,7 @@ namespace bgfx { } - virtual void* realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) BX_OVERRIDE + virtual void* realloc(void* _ptr, size_t _size, size_t _align, const char* _file, uint32_t _line) override { return m_interface->vtbl->realloc(m_interface, _ptr, _size, _align, _file, _line); } diff --git a/src/hmd_ovr.h b/src/hmd_ovr.h index 7a0f482aa..f41d429df 100644 --- a/src/hmd_ovr.h +++ b/src/hmd_ovr.h @@ -35,25 +35,25 @@ namespace bgfx VRImplOVR(); virtual ~VRImplOVR() = 0; - virtual bool init() BX_OVERRIDE; - virtual void shutdown() BX_OVERRIDE; - virtual void connect(VRDesc* _desc) BX_OVERRIDE; - virtual void disconnect() BX_OVERRIDE; + virtual bool init() override; + virtual void shutdown() override; + virtual void connect(VRDesc* _desc) override; + virtual void disconnect() override; - virtual bool isConnected() const BX_OVERRIDE + virtual bool isConnected() const override { return NULL != m_session; } - virtual bool updateTracking(HMD& _hmd) BX_OVERRIDE; - virtual void updateInput(HMD& _hmd) BX_OVERRIDE; - virtual void recenter() BX_OVERRIDE; + virtual bool updateTracking(HMD& _hmd) override; + virtual void updateInput(HMD& _hmd) override; + virtual void recenter() override; - virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) BX_OVERRIDE = 0; - virtual void destroySwapChain() BX_OVERRIDE = 0; - virtual void destroyMirror() BX_OVERRIDE = 0; - virtual void makeRenderTargetActive(const VRDesc& _desc) BX_OVERRIDE = 0; - virtual bool submitSwapChain(const VRDesc& _desc) BX_OVERRIDE = 0; + virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) override = 0; + virtual void destroySwapChain() override = 0; + virtual void destroyMirror() override = 0; + virtual void makeRenderTargetActive(const VRDesc& _desc) override = 0; + virtual bool submitSwapChain(const VRDesc& _desc) override = 0; protected: ovrSession m_session; diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index 7083fbc1a..8d9e00e34 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -655,11 +655,11 @@ namespace bgfx { namespace d3d11 public: VRImplOVRD3D11(); - virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) BX_OVERRIDE; - virtual void destroySwapChain() BX_OVERRIDE; - virtual void destroyMirror() BX_OVERRIDE; - virtual void makeRenderTargetActive(const VRDesc& _desc) BX_OVERRIDE; - virtual bool submitSwapChain(const VRDesc& _desc) BX_OVERRIDE; + virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) override; + virtual void destroySwapChain() override; + virtual void destroyMirror() override; + virtual void makeRenderTargetActive(const VRDesc& _desc) override; + virtual bool submitSwapChain(const VRDesc& _desc) override; private: ID3D11DepthStencilView* m_depthBuffer; @@ -1805,117 +1805,117 @@ BX_PRAGMA_DIAGNOSTIC_POP(); #endif // USE_D3D11_DYNAMIC_LIB } - RendererType::Enum getRendererType() const BX_OVERRIDE + RendererType::Enum getRendererType() const override { return RendererType::Direct3D11; } - const char* getRendererName() const BX_OVERRIDE + const char* getRendererName() const override { return BGFX_RENDERER_DIRECT3D11_NAME; } - void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) BX_OVERRIDE + void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_mem->size, _mem->data, _flags); } - void destroyIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) BX_OVERRIDE + void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) override { VertexDecl& decl = m_vertexDecls[_handle.idx]; bx::memCopy(&decl, &_decl, sizeof(VertexDecl) ); dump(decl); } - void destroyVertexDecl(VertexDeclHandle /*_handle*/) BX_OVERRIDE + void destroyVertexDecl(VertexDeclHandle /*_handle*/) override { } - void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) BX_OVERRIDE + void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) override { m_vertexBuffers[_handle.idx].create(_mem->size, _mem->data, _declHandle, _flags); } - void destroyVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_size, NULL, _flags); } - void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_indexBuffers[_handle.idx].update(_offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { VertexDeclHandle decl = BGFX_INVALID_HANDLE; m_vertexBuffers[_handle.idx].create(_size, NULL, decl, _flags); } - void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_vertexBuffers[_handle.idx].update(_offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createShader(ShaderHandle _handle, Memory* _mem) BX_OVERRIDE + void createShader(ShaderHandle _handle, Memory* _mem) override { m_shaders[_handle.idx].create(_mem); } - void destroyShader(ShaderHandle _handle) BX_OVERRIDE + void destroyShader(ShaderHandle _handle) override { m_shaders[_handle.idx].destroy(); } - void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) BX_OVERRIDE + void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) override { m_program[_handle.idx].create(&m_shaders[_vsh.idx], isValid(_fsh) ? &m_shaders[_fsh.idx] : NULL); } - void destroyProgram(ProgramHandle _handle) BX_OVERRIDE + void destroyProgram(ProgramHandle _handle) override { m_program[_handle.idx].destroy(); } - void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) BX_OVERRIDE + void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) override { m_textures[_handle.idx].create(_mem, _flags, _skip); } - void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) BX_OVERRIDE + void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) override { } - void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) BX_OVERRIDE + void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) override { m_textures[_handle.idx].update(_side, _mip, _rect, _z, _depth, _pitch, _mem); } - void updateTextureEnd() BX_OVERRIDE + void updateTextureEnd() override { } - void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) BX_OVERRIDE + void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) override { const TextureD3D11& texture = m_textures[_handle.idx]; D3D11_MAPPED_SUBRESOURCE mapped; @@ -1943,7 +1943,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); m_deviceCtx->Unmap(texture.m_ptr, _mip); } - void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) BX_OVERRIDE + void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) override { TextureD3D11& texture = m_textures[_handle.idx]; @@ -1971,7 +1971,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); release(mem); } - void overrideInternal(TextureHandle _handle, uintptr_t _ptr) BX_OVERRIDE + void overrideInternal(TextureHandle _handle, uintptr_t _ptr) override { // Resource ref. counts might be messed up outside of bgfx. // Disabling ref. count check once texture is overridden. @@ -1979,7 +1979,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); m_textures[_handle.idx].overrideInternal(_ptr); } - uintptr_t getInternal(TextureHandle _handle) BX_OVERRIDE + uintptr_t getInternal(TextureHandle _handle) override { // Resource ref. counts might be messed up outside of bgfx. // Disabling ref. count check once texture is overridden. @@ -1987,24 +1987,24 @@ BX_PRAGMA_DIAGNOSTIC_POP(); return uintptr_t(m_textures[_handle.idx].m_ptr); } - void destroyTexture(TextureHandle _handle) BX_OVERRIDE + void destroyTexture(TextureHandle _handle) override { m_textures[_handle.idx].destroy(); } - void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) override { m_frameBuffers[_handle.idx].create(_num, _attachment); } - void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) override { uint16_t denseIdx = m_numWindows++; m_windows[denseIdx] = _handle; m_frameBuffers[_handle.idx].create(denseIdx, _nwh, _width, _height, _depthFormat); } - void destroyFrameBuffer(FrameBufferHandle _handle) BX_OVERRIDE + void destroyFrameBuffer(FrameBufferHandle _handle) override { uint16_t denseIdx = m_frameBuffers[_handle.idx].destroy(); if (UINT16_MAX != denseIdx) @@ -2019,7 +2019,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); } } - void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) BX_OVERRIDE + void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) override { if (NULL != m_uniforms[_handle.idx]) { @@ -2033,14 +2033,14 @@ BX_PRAGMA_DIAGNOSTIC_POP(); m_uniformReg.add(_handle, _name, data); } - void destroyUniform(UniformHandle _handle) BX_OVERRIDE + void destroyUniform(UniformHandle _handle) override { BX_FREE(g_allocator, m_uniforms[_handle.idx]); m_uniforms[_handle.idx] = NULL; m_uniformReg.remove(_handle); } - void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) BX_OVERRIDE + void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) override { IDXGISwapChain* swapChain = isValid(_handle) ? m_frameBuffers[_handle.idx].m_swapChain @@ -2114,7 +2114,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); DX_RELEASE(backBuffer, 0); } - void updateViewName(uint8_t _id, const char* _name) BX_OVERRIDE + void updateViewName(uint8_t _id, const char* _name) override { if (BX_ENABLED(BGFX_CONFIG_DEBUG_PIX) ) { @@ -2130,12 +2130,12 @@ BX_PRAGMA_DIAGNOSTIC_POP(); ); } - void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE + void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) override { bx::memCopy(m_uniforms[_loc], _data, _size); } - void setMarker(const char* _marker, uint32_t _size) BX_OVERRIDE + void setMarker(const char* _marker, uint32_t _size) override { if (BX_ENABLED(BGFX_CONFIG_DEBUG_PIX) ) { @@ -2146,16 +2146,16 @@ BX_PRAGMA_DIAGNOSTIC_POP(); } } - void invalidateOcclusionQuery(OcclusionQueryHandle _handle) BX_OVERRIDE + void invalidateOcclusionQuery(OcclusionQueryHandle _handle) override { m_occlusionQuery.invalidate(_handle); } void submitBlit(BlitState& _bs, uint16_t _view); - void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) BX_OVERRIDE; + void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) override; - void blitSetup(TextVideoMemBlitter& _blitter) BX_OVERRIDE + void blitSetup(TextVideoMemBlitter& _blitter) override { ID3D11DeviceContext* deviceCtx = m_deviceCtx; @@ -2212,7 +2212,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); commitTextureStage(); } - void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE + void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override { const uint32_t numVertices = _numIndices*4/6; if (0 < numVertices) @@ -2330,12 +2330,12 @@ BX_PRAGMA_DIAGNOSTIC_POP(); capturePostReset(); } - bool isDeviceRemoved() BX_OVERRIDE + bool isDeviceRemoved() override { return m_lost; } - void flip(HMD& _hmd) BX_OVERRIDE + void flip(HMD& _hmd) override { if (NULL != m_swapChain && !m_lost) diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index d28a579da..b2a6c5c1a 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -1294,22 +1294,22 @@ namespace bgfx { namespace d3d12 #endif // USE_D3D12_DYNAMIC_LIB } - RendererType::Enum getRendererType() const BX_OVERRIDE + RendererType::Enum getRendererType() const override { return RendererType::Direct3D12; } - const char* getRendererName() const BX_OVERRIDE + const char* getRendererName() const override { return BGFX_RENDERER_DIRECT3D12_NAME; } - bool isDeviceRemoved() BX_OVERRIDE + bool isDeviceRemoved() override { return m_lost; } - void flip(HMD& /*_hmd*/) BX_OVERRIDE + void flip(HMD& /*_hmd*/) override { if (NULL != m_swapChain && !m_lost) @@ -1344,107 +1344,107 @@ namespace bgfx { namespace d3d12 } } - void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) BX_OVERRIDE + void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_mem->size, _mem->data, _flags, false); } - void destroyIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) BX_OVERRIDE + void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) override { VertexDecl& decl = m_vertexDecls[_handle.idx]; bx::memCopy(&decl, &_decl, sizeof(VertexDecl) ); dump(decl); } - void destroyVertexDecl(VertexDeclHandle /*_handle*/) BX_OVERRIDE + void destroyVertexDecl(VertexDeclHandle /*_handle*/) override { } - void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) BX_OVERRIDE + void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) override { m_vertexBuffers[_handle.idx].create(_mem->size, _mem->data, _declHandle, _flags); } - void destroyVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_size, NULL, _flags, false); } - void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_indexBuffers[_handle.idx].update(m_commandList, _offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { VertexDeclHandle decl = BGFX_INVALID_HANDLE; m_vertexBuffers[_handle.idx].create(_size, NULL, decl, _flags); } - void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_vertexBuffers[_handle.idx].update(m_commandList, _offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createShader(ShaderHandle _handle, Memory* _mem) BX_OVERRIDE + void createShader(ShaderHandle _handle, Memory* _mem) override { m_shaders[_handle.idx].create(_mem); } - void destroyShader(ShaderHandle _handle) BX_OVERRIDE + void destroyShader(ShaderHandle _handle) override { m_shaders[_handle.idx].destroy(); } - void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) BX_OVERRIDE + void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) override { m_program[_handle.idx].create(&m_shaders[_vsh.idx], isValid(_fsh) ? &m_shaders[_fsh.idx] : NULL); } - void destroyProgram(ProgramHandle _handle) BX_OVERRIDE + void destroyProgram(ProgramHandle _handle) override { m_program[_handle.idx].destroy(); } - void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) BX_OVERRIDE + void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) override { m_textures[_handle.idx].create(_mem, _flags, _skip); } - void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) BX_OVERRIDE + void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) override { } - void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) BX_OVERRIDE + void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) override { m_textures[_handle.idx].update(m_commandList, _side, _mip, _rect, _z, _depth, _pitch, _mem); } - void updateTextureEnd() BX_OVERRIDE + void updateTextureEnd() override { } - void readTexture(TextureHandle _handle, void* _data, uint8_t _mip ) BX_OVERRIDE + void readTexture(TextureHandle _handle, void* _data, uint8_t _mip ) override { const TextureD3D12& texture = m_textures[_handle.idx]; @@ -1505,7 +1505,7 @@ namespace bgfx { namespace d3d12 DX_RELEASE(readback, 0); } - void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) BX_OVERRIDE + void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) override { TextureD3D12& texture = m_textures[_handle.idx]; @@ -1533,35 +1533,35 @@ namespace bgfx { namespace d3d12 release(mem); } - void overrideInternal(TextureHandle _handle, uintptr_t _ptr) BX_OVERRIDE + void overrideInternal(TextureHandle _handle, uintptr_t _ptr) override { BX_UNUSED(_handle, _ptr); } - uintptr_t getInternal(TextureHandle _handle) BX_OVERRIDE + uintptr_t getInternal(TextureHandle _handle) override { BX_UNUSED(_handle); return 0; } - void destroyTexture(TextureHandle _handle) BX_OVERRIDE + void destroyTexture(TextureHandle _handle) override { m_textures[_handle.idx].destroy(); } - void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) override { m_frameBuffers[_handle.idx].create(_num, _attachment); } - void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) override { uint16_t denseIdx = m_numWindows++; m_windows[denseIdx] = _handle; m_frameBuffers[_handle.idx].create(denseIdx, _nwh, _width, _height, _depthFormat); } - void destroyFrameBuffer(FrameBufferHandle _handle) BX_OVERRIDE + void destroyFrameBuffer(FrameBufferHandle _handle) override { uint16_t denseIdx = m_frameBuffers[_handle.idx].destroy(); if (UINT16_MAX != denseIdx) @@ -1576,7 +1576,7 @@ namespace bgfx { namespace d3d12 } } - void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) BX_OVERRIDE + void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) override { if (NULL != m_uniforms[_handle.idx]) { @@ -1590,14 +1590,14 @@ namespace bgfx { namespace d3d12 m_uniformReg.add(_handle, _name, data); } - void destroyUniform(UniformHandle _handle) BX_OVERRIDE + void destroyUniform(UniformHandle _handle) override { BX_FREE(g_allocator, m_uniforms[_handle.idx]); m_uniforms[_handle.idx] = NULL; m_uniformReg.remove(_handle); } - void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) BX_OVERRIDE + void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) override { BX_UNUSED(_handle); @@ -1664,29 +1664,29 @@ namespace bgfx { namespace d3d12 DX_RELEASE(readback, 0); } - void updateViewName(uint8_t /*_id*/, const char* /*_name*/) BX_OVERRIDE + void updateViewName(uint8_t /*_id*/, const char* /*_name*/) override { } - void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE + void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) override { bx::memCopy(m_uniforms[_loc], _data, _size); } - void setMarker(const char* /*_marker*/, uint32_t /*_size*/) BX_OVERRIDE + void setMarker(const char* /*_marker*/, uint32_t /*_size*/) override { } - void invalidateOcclusionQuery(OcclusionQueryHandle _handle) BX_OVERRIDE + void invalidateOcclusionQuery(OcclusionQueryHandle _handle) override { m_occlusionQuery.invalidate(_handle); } void submitBlit(BlitState& _bs, uint16_t _view); - void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) BX_OVERRIDE; + void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) override; - void blitSetup(TextVideoMemBlitter& _blitter) BX_OVERRIDE + void blitSetup(TextVideoMemBlitter& _blitter) override { const uint32_t width = getBufferWidth(); const uint32_t height = getBufferHeight(); @@ -1770,7 +1770,7 @@ namespace bgfx { namespace d3d12 m_commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); } - void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE + void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override { const uint32_t numVertices = _numIndices*4/6; if (0 < numVertices) diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index c3ac406c6..c40229984 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -934,12 +934,12 @@ namespace bgfx { namespace d3d9 m_initialized = false; } - RendererType::Enum getRendererType() const BX_OVERRIDE + RendererType::Enum getRendererType() const override { return RendererType::Direct3D9; } - const char* getRendererName() const BX_OVERRIDE + const char* getRendererName() const override { if (NULL != m_d3d9ex) { @@ -949,111 +949,111 @@ namespace bgfx { namespace d3d9 return BGFX_RENDERER_DIRECT3D9_NAME; } - void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) BX_OVERRIDE + void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_mem->size, _mem->data, _flags); } - void destroyIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) BX_OVERRIDE + void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) override { VertexDecl& decl = m_vertexDecls[_handle.idx]; bx::memCopy(&decl, &_decl, sizeof(VertexDecl) ); dump(decl); } - void destroyVertexDecl(VertexDeclHandle /*_handle*/) BX_OVERRIDE + void destroyVertexDecl(VertexDeclHandle /*_handle*/) override { } - void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t /*_flags*/) BX_OVERRIDE + void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t /*_flags*/) override { m_vertexBuffers[_handle.idx].create(_mem->size, _mem->data, _declHandle); } - void destroyVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_size, NULL, _flags); } - void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_indexBuffers[_handle.idx].update(_offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t /*_flags*/) BX_OVERRIDE + void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t /*_flags*/) override { VertexDeclHandle decl = BGFX_INVALID_HANDLE; m_vertexBuffers[_handle.idx].create(_size, NULL, decl); } - void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_vertexBuffers[_handle.idx].update(_offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createShader(ShaderHandle _handle, Memory* _mem) BX_OVERRIDE + void createShader(ShaderHandle _handle, Memory* _mem) override { m_shaders[_handle.idx].create(_mem); } - void destroyShader(ShaderHandle _handle) BX_OVERRIDE + void destroyShader(ShaderHandle _handle) override { m_shaders[_handle.idx].destroy(); } - void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) BX_OVERRIDE + void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) override { m_program[_handle.idx].create(m_shaders[_vsh.idx], m_shaders[_fsh.idx]); } - void destroyProgram(ProgramHandle _handle) BX_OVERRIDE + void destroyProgram(ProgramHandle _handle) override { m_program[_handle.idx].destroy(); } - void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) BX_OVERRIDE + void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) override { m_textures[_handle.idx].create(_mem, _flags, _skip); } - void updateTextureBegin(TextureHandle _handle, uint8_t _side, uint8_t _mip) BX_OVERRIDE + void updateTextureBegin(TextureHandle _handle, uint8_t _side, uint8_t _mip) override { m_updateTexture = &m_textures[_handle.idx]; m_updateTexture->updateBegin(_side, _mip); } - void updateTexture(TextureHandle /*_handle*/, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) BX_OVERRIDE + void updateTexture(TextureHandle /*_handle*/, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) override { m_updateTexture->update(_side, _mip, _rect, _z, _depth, _pitch, _mem); } - void updateTextureEnd() BX_OVERRIDE + void updateTextureEnd() override { m_updateTexture->updateEnd(); m_updateTexture = NULL; } - void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) BX_OVERRIDE + void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) override { TextureD3D9& texture = m_textures[_handle.idx]; @@ -1086,7 +1086,7 @@ namespace bgfx { namespace d3d9 DX_CHECK(texture.m_texture2d->UnlockRect(_mip) ); } - void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) BX_OVERRIDE + void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) override { TextureD3D9& texture = m_textures[_handle.idx]; @@ -1114,7 +1114,7 @@ namespace bgfx { namespace d3d9 release(mem); } - void overrideInternal(TextureHandle _handle, uintptr_t _ptr) BX_OVERRIDE + void overrideInternal(TextureHandle _handle, uintptr_t _ptr) override { // Resource ref. counts might be messed up outside of bgfx. // Disabling ref. count check once texture is overridden. @@ -1122,7 +1122,7 @@ namespace bgfx { namespace d3d9 m_textures[_handle.idx].overrideInternal(_ptr); } - uintptr_t getInternal(TextureHandle _handle) BX_OVERRIDE + uintptr_t getInternal(TextureHandle _handle) override { // Resource ref. counts might be messed up outside of bgfx. // Disabling ref. count check once texture is overridden. @@ -1130,24 +1130,24 @@ namespace bgfx { namespace d3d9 return uintptr_t(m_textures[_handle.idx].m_ptr); } - void destroyTexture(TextureHandle _handle) BX_OVERRIDE + void destroyTexture(TextureHandle _handle) override { m_textures[_handle.idx].destroy(); } - void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) override { m_frameBuffers[_handle.idx].create(_num, _attachment); } - void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) override { uint16_t denseIdx = m_numWindows++; m_windows[denseIdx] = _handle; m_frameBuffers[_handle.idx].create(denseIdx, _nwh, _width, _height, _depthFormat); } - void destroyFrameBuffer(FrameBufferHandle _handle) BX_OVERRIDE + void destroyFrameBuffer(FrameBufferHandle _handle) override { uint16_t denseIdx = m_frameBuffers[_handle.idx].destroy(); if (UINT16_MAX != denseIdx) @@ -1162,7 +1162,7 @@ namespace bgfx { namespace d3d9 } } - void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) BX_OVERRIDE + void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) override { if (NULL != m_uniforms[_handle.idx]) { @@ -1176,14 +1176,14 @@ namespace bgfx { namespace d3d9 m_uniformReg.add(_handle, _name, data); } - void destroyUniform(UniformHandle _handle) BX_OVERRIDE + void destroyUniform(UniformHandle _handle) override { BX_FREE(g_allocator, m_uniforms[_handle.idx]); m_uniforms[_handle.idx] = NULL; m_uniformReg.remove(_handle); } - void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) BX_OVERRIDE + void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) override { #if BX_PLATFORM_WINDOWS IDirect3DSwapChain9* swapChain = isValid(_handle) @@ -1254,7 +1254,7 @@ namespace bgfx { namespace d3d9 #endif // BX_PLATFORM_WINDOWS } - void updateViewName(uint8_t _id, const char* _name) BX_OVERRIDE + void updateViewName(uint8_t _id, const char* _name) override { if (BX_ENABLED(BGFX_CONFIG_DEBUG_PIX) ) { @@ -1270,12 +1270,12 @@ namespace bgfx { namespace d3d9 ); } - void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE + void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) override { bx::memCopy(m_uniforms[_loc], _data, _size); } - void setMarker(const char* _marker, uint32_t _size) BX_OVERRIDE + void setMarker(const char* _marker, uint32_t _size) override { #if BGFX_CONFIG_DEBUG_PIX uint32_t size = _size*sizeof(wchar_t); @@ -1286,16 +1286,16 @@ namespace bgfx { namespace d3d9 BX_UNUSED(_marker, _size); } - void invalidateOcclusionQuery(OcclusionQueryHandle _handle) BX_OVERRIDE + void invalidateOcclusionQuery(OcclusionQueryHandle _handle) override { m_occlusionQuery.invalidate(_handle); } void submitBlit(BlitState& _bs, uint16_t _view); - void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) BX_OVERRIDE; + void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) override; - void blitSetup(TextVideoMemBlitter& _blitter) BX_OVERRIDE + void blitSetup(TextVideoMemBlitter& _blitter) override { uint32_t width = m_params.BackBufferWidth; uint32_t height = m_params.BackBufferHeight; @@ -1344,7 +1344,7 @@ namespace bgfx { namespace d3d9 m_textures[_blitter.m_texture.idx].commit(0, BGFX_TEXTURE_INTERNAL_DEFAULT_SAMPLER, NULL); } - void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE + void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override { const uint32_t numVertices = _numIndices*4/6; if (0 < numVertices) @@ -1514,12 +1514,12 @@ namespace bgfx { namespace d3d9 m_flushQuery->GetData(NULL, 0, D3DGETDATA_FLUSH); } - bool isDeviceRemoved() BX_OVERRIDE + bool isDeviceRemoved() override { return false; } - void flip(HMD& /*_hmd*/) BX_OVERRIDE + void flip(HMD& /*_hmd*/) override { if (NULL != m_swapChain) { diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 8ec68fb28..2e9d899a6 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -1655,11 +1655,11 @@ namespace bgfx { namespace gl public: VRImplOVRGL(); - virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) BX_OVERRIDE; - virtual void destroySwapChain() BX_OVERRIDE; - virtual void destroyMirror() BX_OVERRIDE; - virtual void makeRenderTargetActive(const VRDesc& _desc) BX_OVERRIDE; - virtual bool submitSwapChain(const VRDesc& _desc) BX_OVERRIDE; + virtual bool createSwapChain(const VRDesc& _desc, int _msaaSamples, int _mirrorWidth, int _mirrorHeight) override; + virtual void destroySwapChain() override; + virtual void destroyMirror() override; + virtual void makeRenderTargetActive(const VRDesc& _desc) override; + virtual bool submitSwapChain(const VRDesc& _desc) override; private: GLuint m_eyeTarget[4]; @@ -2548,7 +2548,7 @@ namespace bgfx { namespace gl unloadRenderDoc(m_renderdocdll); } - RendererType::Enum getRendererType() const BX_OVERRIDE + RendererType::Enum getRendererType() const override { if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL) ) { @@ -2558,12 +2558,12 @@ namespace bgfx { namespace gl return RendererType::OpenGLES; } - const char* getRendererName() const BX_OVERRIDE + const char* getRendererName() const override { return BGFX_RENDERER_OPENGL_NAME; } - bool isDeviceRemoved() BX_OVERRIDE + bool isDeviceRemoved() override { return false; } @@ -2598,108 +2598,108 @@ namespace bgfx { namespace gl } } - void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) BX_OVERRIDE + void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_mem->size, _mem->data, _flags); } - void destroyIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) BX_OVERRIDE + void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) override { VertexDecl& decl = m_vertexDecls[_handle.idx]; bx::memCopy(&decl, &_decl, sizeof(VertexDecl) ); dump(decl); } - void destroyVertexDecl(VertexDeclHandle /*_handle*/) BX_OVERRIDE + void destroyVertexDecl(VertexDeclHandle /*_handle*/) override { } - void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) BX_OVERRIDE + void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) override { m_vertexBuffers[_handle.idx].create(_mem->size, _mem->data, _declHandle, _flags); } - void destroyVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_size, NULL, _flags); } - void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_indexBuffers[_handle.idx].update(_offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { VertexDeclHandle decl = BGFX_INVALID_HANDLE; m_vertexBuffers[_handle.idx].create(_size, NULL, decl, _flags); } - void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_vertexBuffers[_handle.idx].update(_offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createShader(ShaderHandle _handle, Memory* _mem) BX_OVERRIDE + void createShader(ShaderHandle _handle, Memory* _mem) override { m_shaders[_handle.idx].create(_mem); } - void destroyShader(ShaderHandle _handle) BX_OVERRIDE + void destroyShader(ShaderHandle _handle) override { m_shaders[_handle.idx].destroy(); } - void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) BX_OVERRIDE + void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) override { ShaderGL dummyFragmentShader; m_program[_handle.idx].create(m_shaders[_vsh.idx], isValid(_fsh) ? m_shaders[_fsh.idx] : dummyFragmentShader); } - void destroyProgram(ProgramHandle _handle) BX_OVERRIDE + void destroyProgram(ProgramHandle _handle) override { m_program[_handle.idx].destroy(); } - void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) BX_OVERRIDE + void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) override { m_textures[_handle.idx].create(_mem, _flags, _skip); } - void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) BX_OVERRIDE + void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) override { } - void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) BX_OVERRIDE + void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) override { m_textures[_handle.idx].update(_side, _mip, _rect, _z, _depth, _pitch, _mem); } - void updateTextureEnd() BX_OVERRIDE + void updateTextureEnd() override { } - void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) BX_OVERRIDE + void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) override { if (m_readBackSupported) { @@ -2729,7 +2729,7 @@ namespace bgfx { namespace gl } } - void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) BX_OVERRIDE + void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) override { TextureGL& texture = m_textures[_handle.idx]; @@ -2757,34 +2757,34 @@ namespace bgfx { namespace gl release(mem); } - void overrideInternal(TextureHandle _handle, uintptr_t _ptr) BX_OVERRIDE + void overrideInternal(TextureHandle _handle, uintptr_t _ptr) override { m_textures[_handle.idx].overrideInternal(_ptr); } - uintptr_t getInternal(TextureHandle _handle) BX_OVERRIDE + uintptr_t getInternal(TextureHandle _handle) override { return uintptr_t(m_textures[_handle.idx].m_id); } - void destroyTexture(TextureHandle _handle) BX_OVERRIDE + void destroyTexture(TextureHandle _handle) override { m_textures[_handle.idx].destroy(); } - void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) override { m_frameBuffers[_handle.idx].create(_num, _attachment); } - void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) override { uint16_t denseIdx = m_numWindows++; m_windows[denseIdx] = _handle; m_frameBuffers[_handle.idx].create(denseIdx, _nwh, _width, _height, _depthFormat); } - void destroyFrameBuffer(FrameBufferHandle _handle) BX_OVERRIDE + void destroyFrameBuffer(FrameBufferHandle _handle) override { uint16_t denseIdx = m_frameBuffers[_handle.idx].destroy(); if (UINT16_MAX != denseIdx) @@ -2799,7 +2799,7 @@ namespace bgfx { namespace gl } } - void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) BX_OVERRIDE + void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) override { if (NULL != m_uniforms[_handle.idx]) { @@ -2813,14 +2813,14 @@ namespace bgfx { namespace gl m_uniformReg.add(_handle, _name, m_uniforms[_handle.idx]); } - void destroyUniform(UniformHandle _handle) BX_OVERRIDE + void destroyUniform(UniformHandle _handle) override { BX_FREE(g_allocator, m_uniforms[_handle.idx]); m_uniforms[_handle.idx] = NULL; m_uniformReg.remove(_handle); } - void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) BX_OVERRIDE + void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) override { SwapChainGL* swapChain = NULL; uint32_t width = m_resolution.m_width; @@ -2863,7 +2863,7 @@ namespace bgfx { namespace gl BX_FREE(g_allocator, data); } - void updateViewName(uint8_t _id, const char* _name) BX_OVERRIDE + void updateViewName(uint8_t _id, const char* _name) override { bx::strCopy(&s_viewName[_id][BGFX_CONFIG_MAX_VIEW_NAME_RESERVED] , BX_COUNTOF(s_viewName[0])-BGFX_CONFIG_MAX_VIEW_NAME_RESERVED @@ -2871,26 +2871,26 @@ namespace bgfx { namespace gl ); } - void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE + void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) override { bx::memCopy(m_uniforms[_loc], _data, _size); } - void setMarker(const char* _marker, uint32_t _size) BX_OVERRIDE + void setMarker(const char* _marker, uint32_t _size) override { GL_CHECK(glInsertEventMarker(_size, _marker) ); } - void invalidateOcclusionQuery(OcclusionQueryHandle _handle) BX_OVERRIDE + void invalidateOcclusionQuery(OcclusionQueryHandle _handle) override { m_occlusionQuery.invalidate(_handle); } void submitBlit(BlitState& _bs, uint16_t _view); - void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) BX_OVERRIDE; + void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) override; - void blitSetup(TextVideoMemBlitter& _blitter) BX_OVERRIDE + void blitSetup(TextVideoMemBlitter& _blitter) override { if (0 != m_vao) { @@ -2940,7 +2940,7 @@ namespace bgfx { namespace gl } } - void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE + void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override { const uint32_t numVertices = _numIndices*4/6; if (0 < numVertices) diff --git a/src/renderer_gl.h b/src/renderer_gl.h index 91301be0e..7e35b4915 100644 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -1525,7 +1525,7 @@ namespace bgfx { namespace gl { } - virtual int32_t read(void* _data, int32_t _size, bx::Error* _err) BX_OVERRIDE + virtual int32_t read(void* _data, int32_t _size, bx::Error* _err) override { if (m_str[m_pos] == '\0' || m_pos == m_size) diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm index 27f50d803..fbb3671c0 100644 --- a/src/renderer_mtl.mm +++ b/src/renderer_mtl.mm @@ -687,117 +687,117 @@ namespace bgfx { namespace mtl MTL_RELEASE(m_device); } - RendererType::Enum getRendererType() const BX_OVERRIDE + RendererType::Enum getRendererType() const override { return RendererType::Metal; } - const char* getRendererName() const BX_OVERRIDE + const char* getRendererName() const override { return BGFX_RENDERER_METAL_NAME; } - void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) BX_OVERRIDE + void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_mem->size, _mem->data, _flags); } - void destroyIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) BX_OVERRIDE + void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) override { VertexDecl& decl = m_vertexDecls[_handle.idx]; bx::memCopy(&decl, &_decl, sizeof(VertexDecl) ); dump(decl); } - void destroyVertexDecl(VertexDeclHandle /*_handle*/) BX_OVERRIDE + void destroyVertexDecl(VertexDeclHandle /*_handle*/) override { } - void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) BX_OVERRIDE + void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) override { m_vertexBuffers[_handle.idx].create(_mem->size, _mem->data, _declHandle, _flags); } - void destroyVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_size, NULL, _flags); } - void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_indexBuffers[_handle.idx].update(_offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { VertexDeclHandle decl = BGFX_INVALID_HANDLE; m_vertexBuffers[_handle.idx].create(_size, NULL, decl, _flags); } - void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { m_vertexBuffers[_handle.idx].update(_offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createShader(ShaderHandle _handle, Memory* _mem) BX_OVERRIDE + void createShader(ShaderHandle _handle, Memory* _mem) override { m_shaders[_handle.idx].create(_mem); } - void destroyShader(ShaderHandle _handle) BX_OVERRIDE + void destroyShader(ShaderHandle _handle) override { m_shaders[_handle.idx].destroy(); } - void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) BX_OVERRIDE + void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) override { m_program[_handle.idx].create(&m_shaders[_vsh.idx], &m_shaders[_fsh.idx]); } - void destroyProgram(ProgramHandle _handle) BX_OVERRIDE + void destroyProgram(ProgramHandle _handle) override { m_program[_handle.idx].destroy(); } - void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) BX_OVERRIDE + void createTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip) override { m_textures[_handle.idx].create(_mem, _flags, _skip); } - void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) BX_OVERRIDE + void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) override { } - void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) BX_OVERRIDE + void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) override { m_textures[_handle.idx].update(_side, _mip, _rect, _z, _depth, _pitch, _mem); } - void updateTextureEnd() BX_OVERRIDE + void updateTextureEnd() override { } - void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) BX_OVERRIDE + void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) override { m_cmd.kick(false, true); m_commandBuffer = m_cmd.alloc(); @@ -816,7 +816,7 @@ namespace bgfx { namespace mtl } - void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) BX_OVERRIDE + void resizeTexture(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips) override { TextureMtl& texture = m_textures[_handle.idx]; @@ -844,35 +844,35 @@ namespace bgfx { namespace mtl release(mem); } - void overrideInternal(TextureHandle _handle, uintptr_t _ptr) BX_OVERRIDE + void overrideInternal(TextureHandle _handle, uintptr_t _ptr) override { BX_UNUSED(_handle, _ptr); } - uintptr_t getInternal(TextureHandle _handle) BX_OVERRIDE + uintptr_t getInternal(TextureHandle _handle) override { BX_UNUSED(_handle); return 0; } - void destroyTexture(TextureHandle _handle) BX_OVERRIDE + void destroyTexture(TextureHandle _handle) override { m_textures[_handle.idx].destroy(); } - void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) override { m_frameBuffers[_handle.idx].create(_num, _attachment); } - void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle _handle, void* _nwh, uint32_t _width, uint32_t _height, TextureFormat::Enum _depthFormat) override { uint16_t denseIdx = m_numWindows++; m_windows[denseIdx] = _handle; m_frameBuffers[_handle.idx].create(denseIdx, _nwh, _width, _height, _depthFormat); } - void destroyFrameBuffer(FrameBufferHandle _handle) BX_OVERRIDE + void destroyFrameBuffer(FrameBufferHandle _handle) override { uint16_t denseIdx = m_frameBuffers[_handle.idx].destroy(); if (UINT16_MAX != denseIdx) @@ -887,7 +887,7 @@ namespace bgfx { namespace mtl } } - void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) BX_OVERRIDE + void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) override { if (NULL != m_uniforms[_handle.idx]) { @@ -901,7 +901,7 @@ namespace bgfx { namespace mtl m_uniformReg.add(_handle, _name, data); } - void destroyUniform(UniformHandle _handle) BX_OVERRIDE + void destroyUniform(UniformHandle _handle) override { BX_FREE(g_allocator, m_uniforms[_handle.idx]); m_uniforms[_handle.idx] = NULL; @@ -909,14 +909,14 @@ namespace bgfx { namespace mtl } //cmdPre - void requestScreenShotPre(const char* _filePath) BX_OVERRIDE + void requestScreenShotPre(const char* _filePath) override { BX_UNUSED(_filePath); m_saveScreenshot = true; } //cmdPost - void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) BX_OVERRIDE + void requestScreenShot(FrameBufferHandle _handle, const char* _filePath) override { BX_UNUSED(_handle); @@ -951,7 +951,7 @@ namespace bgfx { namespace mtl m_commandBuffer = m_cmd.alloc(); } - void updateViewName(uint8_t _id, const char* _name) BX_OVERRIDE + void updateViewName(uint8_t _id, const char* _name) override { if (BX_ENABLED(BGFX_CONFIG_DEBUG_PIX) ) { @@ -962,12 +962,12 @@ namespace bgfx { namespace mtl } } - void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE + void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) override { bx::memCopy(m_uniforms[_loc], _data, _size); } - void setMarker(const char* _marker, uint32_t /*_size*/) BX_OVERRIDE + void setMarker(const char* _marker, uint32_t /*_size*/) override { if (BX_ENABLED(BGFX_CONFIG_DEBUG_MTL) ) { @@ -975,16 +975,16 @@ namespace bgfx { namespace mtl } } - void invalidateOcclusionQuery(OcclusionQueryHandle _handle) BX_OVERRIDE + void invalidateOcclusionQuery(OcclusionQueryHandle _handle) override { m_occlusionQuery.invalidate(_handle); } void submitBlit(BlitState& _bs, uint16_t _view); - void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) BX_OVERRIDE; + void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) override; - void blitSetup(TextVideoMemBlitter& _blitter) BX_OVERRIDE + void blitSetup(TextVideoMemBlitter& _blitter) override { RenderCommandEncoder rce = m_renderCommandEncoder; @@ -1062,7 +1062,7 @@ namespace bgfx { namespace mtl m_textures[_blitter.m_texture.idx].commit(0, false, true); } - void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE + void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override { const uint32_t numVertices = _numIndices*4/6; if (0 < numVertices) @@ -1077,12 +1077,12 @@ namespace bgfx { namespace mtl } } - bool isDeviceRemoved() BX_OVERRIDE + bool isDeviceRemoved() override { return false; } - void flip(HMD& /*_hmd*/) BX_OVERRIDE + void flip(HMD& /*_hmd*/) override { if (NULL == m_commandBuffer) { @@ -3084,7 +3084,7 @@ namespace bgfx { namespace mtl } } - void RendererContextMtl::submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) BX_OVERRIDE + void RendererContextMtl::submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) override { m_cmd.finish(false); diff --git a/src/renderer_noop.cpp b/src/renderer_noop.cpp index 3f247560d..a8d2afec3 100644 --- a/src/renderer_noop.cpp +++ b/src/renderer_noop.cpp @@ -44,175 +44,175 @@ namespace bgfx { namespace noop { } - RendererType::Enum getRendererType() const BX_OVERRIDE + RendererType::Enum getRendererType() const override { return RendererType::Noop; } - const char* getRendererName() const BX_OVERRIDE + const char* getRendererName() const override { return BGFX_RENDERER_NOOP_NAME; } - bool isDeviceRemoved() BX_OVERRIDE + bool isDeviceRemoved() override { return false; } - void flip(HMD& /*_hmd*/) BX_OVERRIDE + void flip(HMD& /*_hmd*/) override { } - void createIndexBuffer(IndexBufferHandle /*_handle*/, Memory* /*_mem*/, uint16_t /*_flags*/) BX_OVERRIDE + void createIndexBuffer(IndexBufferHandle /*_handle*/, Memory* /*_mem*/, uint16_t /*_flags*/) override { } - void destroyIndexBuffer(IndexBufferHandle /*_handle*/) BX_OVERRIDE + void destroyIndexBuffer(IndexBufferHandle /*_handle*/) override { } - void createVertexDecl(VertexDeclHandle /*_handle*/, const VertexDecl& /*_decl*/) BX_OVERRIDE + void createVertexDecl(VertexDeclHandle /*_handle*/, const VertexDecl& /*_decl*/) override { } - void destroyVertexDecl(VertexDeclHandle /*_handle*/) BX_OVERRIDE + void destroyVertexDecl(VertexDeclHandle /*_handle*/) override { } - void createVertexBuffer(VertexBufferHandle /*_handle*/, Memory* /*_mem*/, VertexDeclHandle /*_declHandle*/, uint16_t /*_flags*/) BX_OVERRIDE + void createVertexBuffer(VertexBufferHandle /*_handle*/, Memory* /*_mem*/, VertexDeclHandle /*_declHandle*/, uint16_t /*_flags*/) override { } - void destroyVertexBuffer(VertexBufferHandle /*_handle*/) BX_OVERRIDE + void destroyVertexBuffer(VertexBufferHandle /*_handle*/) override { } - void createDynamicIndexBuffer(IndexBufferHandle /*_handle*/, uint32_t /*_size*/, uint16_t /*_flags*/) BX_OVERRIDE + void createDynamicIndexBuffer(IndexBufferHandle /*_handle*/, uint32_t /*_size*/, uint16_t /*_flags*/) override { } - void updateDynamicIndexBuffer(IndexBufferHandle /*_handle*/, uint32_t /*_offset*/, uint32_t /*_size*/, Memory* /*_mem*/) BX_OVERRIDE + void updateDynamicIndexBuffer(IndexBufferHandle /*_handle*/, uint32_t /*_offset*/, uint32_t /*_size*/, Memory* /*_mem*/) override { } - void destroyDynamicIndexBuffer(IndexBufferHandle /*_handle*/) BX_OVERRIDE + void destroyDynamicIndexBuffer(IndexBufferHandle /*_handle*/) override { } - void createDynamicVertexBuffer(VertexBufferHandle /*_handle*/, uint32_t /*_size*/, uint16_t /*_flags*/) BX_OVERRIDE + void createDynamicVertexBuffer(VertexBufferHandle /*_handle*/, uint32_t /*_size*/, uint16_t /*_flags*/) override { } - void updateDynamicVertexBuffer(VertexBufferHandle /*_handle*/, uint32_t /*_offset*/, uint32_t /*_size*/, Memory* /*_mem*/) BX_OVERRIDE + void updateDynamicVertexBuffer(VertexBufferHandle /*_handle*/, uint32_t /*_offset*/, uint32_t /*_size*/, Memory* /*_mem*/) override { } - void destroyDynamicVertexBuffer(VertexBufferHandle /*_handle*/) BX_OVERRIDE + void destroyDynamicVertexBuffer(VertexBufferHandle /*_handle*/) override { } - void createShader(ShaderHandle /*_handle*/, Memory* /*_mem*/) BX_OVERRIDE + void createShader(ShaderHandle /*_handle*/, Memory* /*_mem*/) override { } - void destroyShader(ShaderHandle /*_handle*/) BX_OVERRIDE + void destroyShader(ShaderHandle /*_handle*/) override { } - void createProgram(ProgramHandle /*_handle*/, ShaderHandle /*_vsh*/, ShaderHandle /*_fsh*/) BX_OVERRIDE + void createProgram(ProgramHandle /*_handle*/, ShaderHandle /*_vsh*/, ShaderHandle /*_fsh*/) override { } - void destroyProgram(ProgramHandle /*_handle*/) BX_OVERRIDE + void destroyProgram(ProgramHandle /*_handle*/) override { } - void createTexture(TextureHandle /*_handle*/, Memory* /*_mem*/, uint32_t /*_flags*/, uint8_t /*_skip*/) BX_OVERRIDE + void createTexture(TextureHandle /*_handle*/, Memory* /*_mem*/, uint32_t /*_flags*/, uint8_t /*_skip*/) override { } - void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) BX_OVERRIDE + void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) override { } - void updateTexture(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/, const Rect& /*_rect*/, uint16_t /*_z*/, uint16_t /*_depth*/, uint16_t /*_pitch*/, const Memory* /*_mem*/) BX_OVERRIDE + void updateTexture(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/, const Rect& /*_rect*/, uint16_t /*_z*/, uint16_t /*_depth*/, uint16_t /*_pitch*/, const Memory* /*_mem*/) override { } - void updateTextureEnd() BX_OVERRIDE + void updateTextureEnd() override { } - void readTexture(TextureHandle /*_handle*/, void* /*_data*/, uint8_t /*_mip*/) BX_OVERRIDE + void readTexture(TextureHandle /*_handle*/, void* /*_data*/, uint8_t /*_mip*/) override { } - void resizeTexture(TextureHandle /*_handle*/, uint16_t /*_width*/, uint16_t /*_height*/, uint8_t /*_numMips*/) BX_OVERRIDE + void resizeTexture(TextureHandle /*_handle*/, uint16_t /*_width*/, uint16_t /*_height*/, uint8_t /*_numMips*/) override { } - void overrideInternal(TextureHandle /*_handle*/, uintptr_t /*_ptr*/) BX_OVERRIDE + void overrideInternal(TextureHandle /*_handle*/, uintptr_t /*_ptr*/) override { } - uintptr_t getInternal(TextureHandle /*_handle*/) BX_OVERRIDE + uintptr_t getInternal(TextureHandle /*_handle*/) override { return 0; } - void destroyTexture(TextureHandle /*_handle*/) BX_OVERRIDE + void destroyTexture(TextureHandle /*_handle*/) override { } - void createFrameBuffer(FrameBufferHandle /*_handle*/, uint8_t /*_num*/, const Attachment* /*_attachment*/) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle /*_handle*/, uint8_t /*_num*/, const Attachment* /*_attachment*/) override { } - void createFrameBuffer(FrameBufferHandle /*_handle*/, void* /*_nwh*/, uint32_t /*_width*/, uint32_t /*_height*/, TextureFormat::Enum /*_depthFormat*/) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle /*_handle*/, void* /*_nwh*/, uint32_t /*_width*/, uint32_t /*_height*/, TextureFormat::Enum /*_depthFormat*/) override { } - void destroyFrameBuffer(FrameBufferHandle /*_handle*/) BX_OVERRIDE + void destroyFrameBuffer(FrameBufferHandle /*_handle*/) override { } - void createUniform(UniformHandle /*_handle*/, UniformType::Enum /*_type*/, uint16_t /*_num*/, const char* /*_name*/) BX_OVERRIDE + void createUniform(UniformHandle /*_handle*/, UniformType::Enum /*_type*/, uint16_t /*_num*/, const char* /*_name*/) override { } - void destroyUniform(UniformHandle /*_handle*/) BX_OVERRIDE + void destroyUniform(UniformHandle /*_handle*/) override { } - void requestScreenShot(FrameBufferHandle /*_handle*/, const char* /*_filePath*/) BX_OVERRIDE + void requestScreenShot(FrameBufferHandle /*_handle*/, const char* /*_filePath*/) override { } - void updateViewName(uint8_t /*_id*/, const char* /*_name*/) BX_OVERRIDE + void updateViewName(uint8_t /*_id*/, const char* /*_name*/) override { } - void updateUniform(uint16_t /*_loc*/, const void* /*_data*/, uint32_t /*_size*/) BX_OVERRIDE + void updateUniform(uint16_t /*_loc*/, const void* /*_data*/, uint32_t /*_size*/) override { } - void setMarker(const char* /*_marker*/, uint32_t /*_size*/) BX_OVERRIDE + void setMarker(const char* /*_marker*/, uint32_t /*_size*/) override { } - void invalidateOcclusionQuery(OcclusionQueryHandle /*_handle*/) BX_OVERRIDE + void invalidateOcclusionQuery(OcclusionQueryHandle /*_handle*/) override { } - void submit(Frame* /*_render*/, ClearQuad& /*_clearQuad*/, TextVideoMemBlitter& /*_textVideoMemBlitter*/) BX_OVERRIDE + void submit(Frame* /*_render*/, ClearQuad& /*_clearQuad*/, TextVideoMemBlitter& /*_textVideoMemBlitter*/) override { } - void blitSetup(TextVideoMemBlitter& /*_blitter*/) BX_OVERRIDE + void blitSetup(TextVideoMemBlitter& /*_blitter*/) override { } - void blitRender(TextVideoMemBlitter& /*_blitter*/, uint32_t /*_numIndices*/) BX_OVERRIDE + void blitRender(TextVideoMemBlitter& /*_blitter*/, uint32_t /*_numIndices*/) override { } }; diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index d6b83102b..410313c67 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -1911,22 +1911,22 @@ VK_IMPORT_DEVICE unloadRenderDoc(m_renderdocdll); } - RendererType::Enum getRendererType() const BX_OVERRIDE + RendererType::Enum getRendererType() const override { return RendererType::Vulkan; } - const char* getRendererName() const BX_OVERRIDE + const char* getRendererName() const override { return BGFX_RENDERER_VULKAN_NAME; } - bool isDeviceRemoved() BX_OVERRIDE + bool isDeviceRemoved() override { return false; } - void flip(HMD& /*_hmd*/) BX_OVERRIDE + void flip(HMD& /*_hmd*/) override { if (VK_NULL_HANDLE != m_swapchain) { @@ -1943,140 +1943,140 @@ VK_IMPORT_DEVICE } } - void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) BX_OVERRIDE + void createIndexBuffer(IndexBufferHandle _handle, Memory* _mem, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_mem->size, _mem->data, _flags, false); } - void destroyIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) BX_OVERRIDE + void createVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) override { VertexDecl& decl = m_vertexDecls[_handle.idx]; bx::memCopy(&decl, &_decl, sizeof(VertexDecl) ); dump(decl); } - void destroyVertexDecl(VertexDeclHandle /*_handle*/) BX_OVERRIDE + void destroyVertexDecl(VertexDeclHandle /*_handle*/) override { } - void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) BX_OVERRIDE + void createVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle, uint16_t _flags) override { m_vertexBuffers[_handle.idx].create(_mem->size, _mem->data, _declHandle, _flags); } - void destroyVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { m_indexBuffers[_handle.idx].create(_size, NULL, _flags, false); } - void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { BX_UNUSED(_handle, _offset, _size, _mem); // m_indexBuffers[_handle.idx].update(m_commandBuffer, _offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicIndexBuffer(IndexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicIndexBuffer(IndexBufferHandle _handle) override { m_indexBuffers[_handle.idx].destroy(); } - void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) BX_OVERRIDE + void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) override { VertexDeclHandle decl = BGFX_INVALID_HANDLE; m_vertexBuffers[_handle.idx].create(_size, NULL, decl, _flags); } - void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) BX_OVERRIDE + void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) override { BX_UNUSED(_handle, _offset, _size, _mem); // m_vertexBuffers[_handle.idx].update(m_commandBuffer, _offset, bx::uint32_min(_size, _mem->size), _mem->data); } - void destroyDynamicVertexBuffer(VertexBufferHandle _handle) BX_OVERRIDE + void destroyDynamicVertexBuffer(VertexBufferHandle _handle) override { m_vertexBuffers[_handle.idx].destroy(); } - void createShader(ShaderHandle _handle, Memory* _mem) BX_OVERRIDE + void createShader(ShaderHandle _handle, Memory* _mem) override { m_shaders[_handle.idx].create(_mem); } - void destroyShader(ShaderHandle _handle) BX_OVERRIDE + void destroyShader(ShaderHandle _handle) override { m_shaders[_handle.idx].destroy(); } - void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) BX_OVERRIDE + void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) override { m_program[_handle.idx].create(&m_shaders[_vsh.idx], isValid(_fsh) ? &m_shaders[_fsh.idx] : NULL); } - void destroyProgram(ProgramHandle _handle) BX_OVERRIDE + void destroyProgram(ProgramHandle _handle) override { m_program[_handle.idx].destroy(); } - void createTexture(TextureHandle /*_handle*/, Memory* /*_mem*/, uint32_t /*_flags*/, uint8_t /*_skip*/) BX_OVERRIDE + void createTexture(TextureHandle /*_handle*/, Memory* /*_mem*/, uint32_t /*_flags*/, uint8_t /*_skip*/) override { } - void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) BX_OVERRIDE + void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) override { } - void updateTexture(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/, const Rect& /*_rect*/, uint16_t /*_z*/, uint16_t /*_depth*/, uint16_t /*_pitch*/, const Memory* /*_mem*/) BX_OVERRIDE + void updateTexture(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/, const Rect& /*_rect*/, uint16_t /*_z*/, uint16_t /*_depth*/, uint16_t /*_pitch*/, const Memory* /*_mem*/) override { } - void updateTextureEnd() BX_OVERRIDE + void updateTextureEnd() override { } - void readTexture(TextureHandle /*_handle*/, void* /*_data*/, uint8_t /*_mip*/) BX_OVERRIDE + void readTexture(TextureHandle /*_handle*/, void* /*_data*/, uint8_t /*_mip*/) override { } - void resizeTexture(TextureHandle /*_handle*/, uint16_t /*_width*/, uint16_t /*_height*/, uint8_t /*_numMips*/) BX_OVERRIDE + void resizeTexture(TextureHandle /*_handle*/, uint16_t /*_width*/, uint16_t /*_height*/, uint8_t /*_numMips*/) override { } - void overrideInternal(TextureHandle /*_handle*/, uintptr_t /*_ptr*/) BX_OVERRIDE + void overrideInternal(TextureHandle /*_handle*/, uintptr_t /*_ptr*/) override { } - uintptr_t getInternal(TextureHandle /*_handle*/) BX_OVERRIDE + uintptr_t getInternal(TextureHandle /*_handle*/) override { return 0; } - void destroyTexture(TextureHandle /*_handle*/) BX_OVERRIDE + void destroyTexture(TextureHandle /*_handle*/) override { } - void createFrameBuffer(FrameBufferHandle /*_handle*/, uint8_t /*_num*/, const Attachment* /*_attachment*/) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle /*_handle*/, uint8_t /*_num*/, const Attachment* /*_attachment*/) override { } - void createFrameBuffer(FrameBufferHandle /*_handle*/, void* /*_nwh*/, uint32_t /*_width*/, uint32_t /*_height*/, TextureFormat::Enum /*_depthFormat*/) BX_OVERRIDE + void createFrameBuffer(FrameBufferHandle /*_handle*/, void* /*_nwh*/, uint32_t /*_width*/, uint32_t /*_height*/, TextureFormat::Enum /*_depthFormat*/) override { } - void destroyFrameBuffer(FrameBufferHandle /*_handle*/) BX_OVERRIDE + void destroyFrameBuffer(FrameBufferHandle /*_handle*/) override { } - void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) BX_OVERRIDE + void createUniform(UniformHandle _handle, UniformType::Enum _type, uint16_t _num, const char* _name) override { if (NULL != m_uniforms[_handle.idx]) { @@ -2090,17 +2090,17 @@ VK_IMPORT_DEVICE m_uniformReg.add(_handle, _name, data); } - void destroyUniform(UniformHandle _handle) BX_OVERRIDE + void destroyUniform(UniformHandle _handle) override { BX_FREE(g_allocator, m_uniforms[_handle.idx]); m_uniforms[_handle.idx] = NULL; } - void requestScreenShot(FrameBufferHandle /*_handle*/, const char* /*_filePath*/) BX_OVERRIDE + void requestScreenShot(FrameBufferHandle /*_handle*/, const char* /*_filePath*/) override { } - void updateViewName(uint8_t _id, const char* _name) BX_OVERRIDE + void updateViewName(uint8_t _id, const char* _name) override { bx::strCopy(&s_viewName[_id][BGFX_CONFIG_MAX_VIEW_NAME_RESERVED] , BX_COUNTOF(s_viewName[0]) - BGFX_CONFIG_MAX_VIEW_NAME_RESERVED @@ -2108,29 +2108,29 @@ VK_IMPORT_DEVICE ); } - void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE + void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) override { bx::memCopy(m_uniforms[_loc], _data, _size); } - void setMarker(const char* /*_marker*/, uint32_t /*_size*/) BX_OVERRIDE + void setMarker(const char* /*_marker*/, uint32_t /*_size*/) override { } - void invalidateOcclusionQuery(OcclusionQueryHandle _handle) BX_OVERRIDE + void invalidateOcclusionQuery(OcclusionQueryHandle _handle) override { BX_UNUSED(_handle); } void submitBlit(BlitState& _bs, uint16_t _view); - void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) BX_OVERRIDE; + void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) override; - void blitSetup(TextVideoMemBlitter& /*_blitter*/) BX_OVERRIDE + void blitSetup(TextVideoMemBlitter& /*_blitter*/) override { } - void blitRender(TextVideoMemBlitter& /*_blitter*/, uint32_t /*_numIndices*/) BX_OVERRIDE + void blitRender(TextVideoMemBlitter& /*_blitter*/, uint32_t /*_numIndices*/) override { } diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index 169aafed3..9d348f3e3 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -224,13 +224,13 @@ namespace bgfx { } - virtual void close() BX_OVERRIDE + virtual void close() override { generate(); return bx::FileWriter::close(); } - virtual int32_t write(const void* _data, int32_t _size, bx::Error*) BX_OVERRIDE + virtual int32_t write(const void* _data, int32_t _size, bx::Error*) override { const char* data = (const char*)_data; m_buffer.insert(m_buffer.end(), data, data+_size); diff --git a/tools/shaderc/shaderc.h b/tools/shaderc/shaderc.h index 7ddfba635..84189c633 100644 --- a/tools/shaderc/shaderc.h +++ b/tools/shaderc/shaderc.h @@ -78,7 +78,7 @@ namespace bgfx { } - virtual int32_t read(void* _data, int32_t _size, bx::Error* _err) BX_OVERRIDE + virtual int32_t read(void* _data, int32_t _size, bx::Error* _err) override { if (m_str[m_pos] == '\0' || m_pos == m_size) diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp index 6cf530107..79581a905 100644 --- a/tools/shaderc/shaderc_spirv.cpp +++ b/tools/shaderc/shaderc_spirv.cpp @@ -519,7 +519,7 @@ namespace bgfx { namespace spirv struct DebugOutputWriter : public bx::WriterI { - virtual int32_t write(const void* _data, int32_t _size, bx::Error*) BX_OVERRIDE + virtual int32_t write(const void* _data, int32_t _size, bx::Error*) override { char* out = (char*)alloca(_size + 1); bx::memCopy(out, _data, _size);