mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

This commit is contained in:
Branimir Karadžić 2018-11-14 20:01:51 -08:00
parent a50b76a9a3
commit 48074e3eeb
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/24-nbody/nbody.cpp
View File

@ -365,8 +365,8 @@ public:
bgfx::dispatch(0, m_updateInstancesProgram, uint16_t(m_paramsData.dispatchSize), 1, 1);
}
bx::xchg(m_currPositionBuffer0, m_currPositionBuffer1);
bx::xchg(m_prevPositionBuffer0, m_prevPositionBuffer1);
bx::swap(m_currPositionBuffer0, m_currPositionBuffer1);
bx::swap(m_prevPositionBuffer0, m_prevPositionBuffer1);
// Update camera.
cameraUpdate(deltaTime, m_mouseState);

13
makefile
View File

@ -39,7 +39,6 @@ clean: ## Clean all intermediate files.
@mkdir .build
projgen: ## Generate project files for all configurations.
$(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2015
$(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2017
$(GENIE) --with-tools --with-combined-examples --vs=winstore100 vs2017
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=mingw-gcc gmake
@ -125,18 +124,6 @@ mingw-clang-release64: .build/projects/gmake-mingw-clang ## Build - MinGW Clang
$(MAKE) -R -C .build/projects/gmake-mingw-clang config=release64
mingw-clang: mingw-clang-debug32 mingw-clang-release32 mingw-clang-debug64 mingw-clang-release64 ## Build - MinGW Clang x86/x64 Debug and Release
.build/projects/vs2015:
$(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2015
vs2015-debug32: .build/projects/vs2015 ## Build - VS2015 x86 Debug
devenv .build/projects/vs2015/bgfx.sln /Build "Debug|Win32"
vs2015-release32: .build/projects/vs2015 ## Build - VS2015 x86 Release
devenv .build/projects/vs2015/bgfx.sln /Build "Release|Win32"
vs2015-debug64: .build/projects/vs2015 ## Build - VS2015 x64 Debug
devenv .build/projects/vs2015/bgfx.sln /Build "Debug|x64"
vs2015-release64: .build/projects/vs2015 ## Build - VS2015 x64 Release
devenv .build/projects/vs2015/bgfx.sln /Build "Release|x64"
vs2015: vs2015-debug32 vs2015-release32 vs2015-debug64 vs2015-release64 ## Build - VS2015 x86/x64 Debug and Release
.build/projects/vs2017:
$(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2017
vs2017-debug32: .build/projects/vs2017 ## Build - vs2017 x86 Debug

2
src/bgfx.cpp
View File

@ -2097,7 +2097,7 @@ namespace bgfx
m_submit->finish();
bx::xchg(m_render, m_submit);
bx::swap(m_render, m_submit);
bx::memCopy(m_render->m_occlusion, m_submit->m_occlusion, sizeof(m_submit->m_occlusion) );

6
src/renderer_d3d12.cpp
View File

@ -4354,7 +4354,7 @@ namespace bgfx { namespace d3d12
, _state
);
bx::xchg(m_state, _state);
bx::swap(m_state, _state);
}
return _state;
@ -4955,7 +4955,7 @@ namespace bgfx { namespace d3d12
, _state
);
bx::xchg(m_state, _state);
bx::swap(m_state, _state);
}
return _state;
@ -5287,7 +5287,7 @@ namespace bgfx { namespace d3d12
DX_RELEASE(colorBuffer, 0);
bx::xchg(m_state, _state);
bx::swap(m_state, _state);
}
return _state;

6
src/topology.cpp
View File

@ -78,9 +78,9 @@ namespace bgfx
const IndexT* tri = &_indices[ii];
IndexT i0 = tri[0], i1 = tri[1], i2 = tri[2];
if (i0 > i1) { bx::xchg(i0, i1); }
if (i1 > i2) { bx::xchg(i1, i2); }
if (i0 > i1) { bx::xchg(i0, i1); }
if (i0 > i1) { bx::swap(i0, i1); }
if (i1 > i2) { bx::swap(i1, i2); }
if (i0 > i1) { bx::swap(i0, i1); }
BX_CHECK(i0 < i1 && i1 < i2, "");
dst[1] = i0; dst[0] = i1;