scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-24 08:38:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup.

Browse source
This commit is contained in:
Branimir Karadžić 2016-02-21 13:59:38 -08:00
parent adfa3a9905
commit dc46b1a36b
8 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/13-stencil/stencil.cpp
View file

@ -9,7 +9,7 @@
#include "common.h"
#include "bgfx_utils.h"
#include <bx/readerwriter.h>
#include <bx/crtimpl.h>
#include "camera.h"
#include "imgui/imgui.h"

2
examples/14-shadowvolumes/shadowvolumes.cpp
View file

@ -21,11 +21,11 @@ using namespace std::tr1;
#include <bgfx/bgfx.h>
#include <bx/timer.h>
#include <bx/readerwriter.h>
#include <bx/allocator.h>
#include <bx/hash.h>
#include <bx/float4_t.h>
#include <bx/fpumath.h>
#include <bx/crtimpl.h>
#include "entry/entry.h"
#include "camera.h"
#include "imgui/imgui.h"

2
examples/16-shadowmaps/shadowmaps.cpp
View file

@ -12,8 +12,8 @@
#include <bgfx/bgfx.h>
#include <bx/timer.h>
#include <bx/readerwriter.h>
#include <bx/fpumath.h>
#include <bx/crtimpl.h>
#include "entry/entry.h"
#include "camera.h"
#include "imgui/imgui.h"

2
examples/common/entry/entry.cpp
View file

@ -6,7 +6,7 @@
#include <bx/bx.h>
#include <bgfx/bgfx.h>
#include <bx/string.h>
#include <bx/readerwriter.h>
#include <bx/crtimpl.h>
#include <time.h>

1
examples/common/imgui/imgui.cpp
View file

@ -28,6 +28,7 @@
#include <bx/uint32_t.h>
#include <bx/fpumath.h>
#include <bx/handlealloc.h>
#include <bx/crtimpl.h>
#include "imgui.h"
#include "ocornut_imgui.h"

1
examples/common/nanovg/nanovg_bgfx.cpp
View file

@ -30,6 +30,7 @@
#include <bx/bx.h>
#include <bx/allocator.h>
#include <bx/crtimpl.h>
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4244); // warning C4244: '=' : conversion from '' to '', possible loss of data

6
src/bgfx.cpp
View file

@ -18,6 +18,8 @@
# include <remotery/lib/Remotery.c>
#endif // BGFX_CONFIG_PROFILER_REMOTERY_BUILD_LIB
#include <bx/crtimpl.h>
namespace bgfx
{
#define BGFX_MAIN_THREAD_MAGIC UINT32_C(0x78666762)
@ -982,13 +984,13 @@ namespace bgfx
{
m_sortKeys[ii] = SortKey::remapView(m_sortKeys[ii], m_viewRemap);
}
bx::radixSort64(m_sortKeys, s_ctx->m_tempKeys, m_sortValues, s_ctx->m_tempValues, m_num);
bx::radixSort(m_sortKeys, s_ctx->m_tempKeys, m_sortValues, s_ctx->m_tempValues, m_num);
for (uint32_t ii = 0, num = m_num; ii < num; ++ii)
{
m_blitKeys[ii] = BlitKey::remapView(m_blitKeys[ii], m_viewRemap);
}
bx::radixSort32(m_blitKeys, (uint32_t*)&s_ctx->m_tempKeys, m_numBlitItems);
bx::radixSort(m_blitKeys, (uint32_t*)&s_ctx->m_tempKeys, m_numBlitItems);
}
RenderFrame::Enum renderFrame()

2
src/bgfx_p.h
View file

@ -504,7 +504,7 @@ namespace bgfx
{
uint32_t* tempKeys = (uint32_t*)alloca(sizeof(m_keys) );
uint32_t* tempValues = (uint32_t*)alloca(sizeof(m_values) );
bx::radixSort32(m_keys, tempKeys, m_values, tempValues, m_num);
bx::radixSort(m_keys, tempKeys, m_values, tempValues, m_num);
return true;
}