diff options
author | 2023-09-08 05:14:35 +1000 | |
---|---|---|
committer | 2023-09-08 05:14:35 +1000 | |
commit | 44eb5ea3c69dcec37e2b687e479297af5303efc3 (patch) | |
tree | 2784753bdf56564ce3b4cf0f410bf07709854fdd /3rdparty/bgfx/examples/07-callback/callback.cpp | |
parent | 1147d8fc44c701ed0235e9374f97d218fae37b32 (diff) |
Revert "Updated bgfx, bx and bimg to current upstream versions. (#11493)"
This reverts commit 1c61ccfe840cdae7a9f92292946a45f3b47e2412.
Diffstat (limited to '3rdparty/bgfx/examples/07-callback/callback.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/07-callback/callback.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/3rdparty/bgfx/examples/07-callback/callback.cpp b/3rdparty/bgfx/examples/07-callback/callback.cpp index 2b7f59c8bfb..418b2a96eae 100644 --- a/3rdparty/bgfx/examples/07-callback/callback.cpp +++ b/3rdparty/bgfx/examples/07-callback/callback.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2011-2023 Branimir Karadzic. All rights reserved. + * Copyright 2011-2022 Branimir Karadzic. All rights reserved. * License: https://github.com/bkaradzic/bgfx/blob/master/LICENSE */ @@ -202,7 +202,7 @@ struct BgfxCallback : public bgfx::CallbackI m_writer = BX_NEW(entry::getAllocator(), AviWriter)(entry::getFileWriter() ); if (!m_writer->open("temp/capture.avi", _width, _height, 60, _yflip) ) { - bx::deleteObject(entry::getAllocator(), m_writer); + BX_DELETE(entry::getAllocator(), m_writer); m_writer = NULL; } } @@ -212,7 +212,7 @@ struct BgfxCallback : public bgfx::CallbackI if (NULL != m_writer) { m_writer->close(); - bx::deleteObject(entry::getAllocator(), m_writer); + BX_DELETE(entry::getAllocator(), m_writer); m_writer = NULL; } } @@ -257,7 +257,7 @@ public: } else { - bx::alignedFree(this, _ptr, _align, bx::Location(_file, _line) ); + bx::alignedFree(this, _ptr, _align, _file, _line); } } @@ -274,7 +274,7 @@ public: return ptr; } - return bx::alignedAlloc(this, _size, _align, bx::Location(_file, _line) ); + return bx::alignedAlloc(this, _size, _align, _file, _line); } if (kNaturalAlignment >= _align) @@ -292,7 +292,7 @@ public: return ptr; } - return bx::alignedRealloc(this, _ptr, _size, _align, bx::Location(_file, _line) ); + return bx::alignedRealloc(this, _ptr, _size, _align, _file, _line); } void dumpStats() const @@ -331,7 +331,6 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; |