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

Merge branch 'master' of github.com:bkaradzic/bgfx

Browse source
This commit is contained in:
bkaradzic 2013-02-12 23:45:14 -08:00
commit ff8cc805fe
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/bgfx_p.h
View file

@ -96,11 +96,14 @@ namespace tinystl
# include <TINYSTL/unordered_set.h> # include <TINYSTL/unordered_set.h>
namespace stl = tinystl; namespace stl = tinystl;
#else #else
namespace std { namespace tr1 {} using namespace tr1; } // namespace std
# include <string> # include <string>
# include <unordered_map> # include <unordered_map>
# include <unordered_set> # include <unordered_set>
namespace stl = std; namespace std { namespace tr1 {} }
namespace stl {
using namespace std;
using namespace std::tr1;
}
#endif // BGFX_CONFIG_USE_TINYSTL #endif // BGFX_CONFIG_USE_TINYSTL
#include <list> #include <list>
@ -594,7 +597,7 @@ namespace bgfx
uint16_t m_idx; uint16_t m_idx;
uint16_t m_flags; uint16_t m_flags;
}; };
struct Uniform struct Uniform
{ {
UniformType::Enum m_type; UniformType::Enum m_type;
@ -763,7 +766,7 @@ namespace bgfx
~UniformRegistry() ~UniformRegistry()
{ {
} }
const UniformInfo* find(const char* _name) const const UniformInfo* find(const char* _name) const
{ {
UniformHashMap::const_iterator it = m_uniforms.find(_name); UniformHashMap::const_iterator it = m_uniforms.find(_name);
@ -785,7 +788,7 @@ namespace bgfx
info.m_func = _func; info.m_func = _func;
stl::pair<UniformHashMap::iterator, bool> result = m_uniforms.insert(UniformHashMap::value_type(_name, info) ); stl::pair<UniformHashMap::iterator, bool> result = m_uniforms.insert(UniformHashMap::value_type(_name, info) );
return result.first->second; return result.first->second;
} }
return it->second; return it->second;
@ -822,7 +825,7 @@ namespace bgfx
m_vertexDecl.idx = invalidHandle; m_vertexDecl.idx = invalidHandle;
m_indexBuffer.idx = invalidHandle; m_indexBuffer.idx = invalidHandle;
m_instanceDataBuffer.idx = invalidHandle; m_instanceDataBuffer.idx = invalidHandle;
for (uint32_t ii = 0; ii < BGFX_STATE_TEX_COUNT; ++ii) for (uint32_t ii = 0; ii < BGFX_STATE_TEX_COUNT; ++ii)
{ {
m_sampler[ii].m_idx = invalidHandle; m_sampler[ii].m_idx = invalidHandle;
@ -2332,7 +2335,7 @@ namespace bgfx
flip(); flip();
gameSemWait(); gameSemWait();
rendererExecCommands(m_render->m_cmdPre); rendererExecCommands(m_render->m_cmdPre);
if (m_rendererInitialized) if (m_rendererInitialized)
{ {
@ -2399,7 +2402,7 @@ namespace bgfx
rendererUpdateUniform(loc, data, size); rendererUpdateUniform(loc, data, size);
} }
} }
void rendererExecCommands(CommandBuffer& _cmdbuf) void rendererExecCommands(CommandBuffer& _cmdbuf)
{ {
_cmdbuf.reset(); _cmdbuf.reset();