From b5af383cf892d1449530afb7039d966b1f61d0d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 23 Sep 2017 16:27:16 -0700 Subject: [PATCH] Cleanup. --- examples/14-shadowvolumes/shadowvolumes.cpp | 2 +- examples/common/entry/cmd.cpp | 4 ++-- src/bgfx_p.h | 10 +++++----- src/renderer_d3d11.cpp | 2 +- src/renderer_d3d12.cpp | 4 ++-- src/renderer_gl.cpp | 4 ++-- src/renderer_vk.cpp | 4 ++-- src/vertexdecl.cpp | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp index 32f3fcf1f..9bc131373 100644 --- a/examples/14-shadowvolumes/shadowvolumes.cpp +++ b/examples/14-shadowvolumes/shadowvolumes.cpp @@ -748,7 +748,7 @@ uint16_t weldVertices(WeldedVertex* _output, const bgfx::VertexDecl& _decl, cons { float pos[4]; vertexUnpack(pos, bgfx::Attrib::Position, _decl, _data, ii); - uint32_t hashValue = bx::hashMurmur2A(pos, 3*sizeof(float) ) & hashMask; + uint32_t hashValue = bx::hash(pos, 3*sizeof(float) ) & hashMask; uint16_t offset = hashTable[hashValue]; for (; UINT16_MAX != offset; offset = next[offset]) diff --git a/examples/common/entry/cmd.cpp b/examples/common/entry/cmd.cpp index a22303fda..08fe6b275 100644 --- a/examples/common/entry/cmd.cpp +++ b/examples/common/entry/cmd.cpp @@ -29,7 +29,7 @@ struct CmdContext void add(const char* _name, ConsoleFn _fn, void* _userData) { - uint32_t cmd = bx::hashMurmur2A(_name, (uint32_t)bx::strLen(_name) ); + uint32_t cmd = bx::hash(_name, (uint32_t)bx::strLen(_name) ); BX_CHECK(m_lookup.end() == m_lookup.find(cmd), "Command \"%s\" already exist.", _name); Func fn = { _fn, _userData }; m_lookup.insert(stl::make_pair(cmd, fn) ); @@ -47,7 +47,7 @@ struct CmdContext if (argc > 0) { int err = -1; - uint32_t cmd = bx::hashMurmur2A(argv[0], (uint32_t)bx::strLen(argv[0]) ); + uint32_t cmd = bx::hash(argv[0], (uint32_t)bx::strLen(argv[0]) ); CmdLookup::iterator it = m_lookup.find(cmd); if (it != m_lookup.end() ) { diff --git a/src/bgfx_p.h b/src/bgfx_p.h index ffd916841..297191bff 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -1285,7 +1285,7 @@ namespace bgfx const UniformRegInfo* find(const char* _name) const { - uint16_t handle = m_uniforms.find(bx::hashMurmur2A(_name) ); + uint16_t handle = m_uniforms.find(bx::hash(_name) ); if (kInvalidHandle != handle) { return &m_info[handle]; @@ -1297,7 +1297,7 @@ namespace bgfx const UniformRegInfo& add(UniformHandle _handle, const char* _name, const void* _data) { BX_CHECK(isValid(_handle), "Uniform handle is invalid (name: %s)!", _name); - const uint32_t key = bx::hashMurmur2A(_name); + const uint32_t key = bx::hash(_name); m_uniforms.removeByKey(key); m_uniforms.insert(key, _handle.idx); @@ -3123,7 +3123,7 @@ namespace bgfx return invalid; } - const uint32_t shaderHash = bx::hashMurmur2A(_mem->data, _mem->size); + const uint32_t shaderHash = bx::hash(_mem->data, _mem->size); const uint16_t idx = m_shaderHashMap.find(shaderHash); if (kInvalidHandle != idx) { @@ -3749,7 +3749,7 @@ namespace bgfx _num = bx::uint16_max(1, _num); - uint16_t idx = m_uniformHashMap.find(bx::hashMurmur2A(_name) ); + uint16_t idx = m_uniformHashMap.find(bx::hash(_name) ); if (kInvalidHandle != idx) { UniformHandle handle = { idx }; @@ -3794,7 +3794,7 @@ namespace bgfx uniform.m_type = _type; uniform.m_num = _num; - bool ok = m_uniformHashMap.insert(bx::hashMurmur2A(_name), handle.idx); + bool ok = m_uniformHashMap.insert(bx::hash(_name), handle.idx); BX_CHECK(ok, "Uniform already exists (name: %s)!", _name); BX_UNUSED(ok); CommandBuffer& cmdbuf = getCommandBuffer(CommandBuffer::CreateUniform); diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index 5a0a4ca9d..61946d252 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -4431,7 +4431,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); } else if (BGFX_CHUNK_MAGIC_VSH == magic) { - m_hash = bx::hashMurmur2A(code, shaderSize); + m_hash = bx::hash(code, shaderSize); m_code = copy(code, shaderSize); DX_CHECK(s_renderD3D11->m_device->CreateVertexShader(code, shaderSize, NULL, &m_vertexShader) ); diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index dc89d4197..8d8ade928 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -5225,7 +5225,7 @@ data.NumQualityLevels = 0; currentBindHash = 0; } - uint32_t bindHash = bx::hashMurmur2A(renderBind.m_bind, sizeof(renderBind.m_bind) ); + uint32_t bindHash = bx::hash(renderBind.m_bind, sizeof(renderBind.m_bind) ); if (currentBindHash != bindHash) { currentBindHash = bindHash; @@ -5456,7 +5456,7 @@ data.NumQualityLevels = 0; ); uint16_t scissor = draw.m_scissor; - uint32_t bindHash = bx::hashMurmur2A(renderBind.m_bind, sizeof(renderBind.m_bind) ); + uint32_t bindHash = bx::hash(renderBind.m_bind, sizeof(renderBind.m_bind) ); if (currentBindHash != bindHash || 0 != changedStencil || (hasFactor && blendFactor != draw.m_rgba) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 4e3537ba7..21f24bef0 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -1043,7 +1043,7 @@ namespace bgfx { namespace gl glGetError(); // ignore error if glGetString returns NULL. if (NULL != str) { - return bx::hashMurmur2A(str, (uint32_t)bx::strLen(str) ); + return bx::hash(str, (uint32_t)bx::strLen(str) ); } return 0; @@ -5531,7 +5531,7 @@ namespace bgfx { namespace gl void ShaderGL::create(Memory* _mem) { bx::MemoryReader reader(_mem->data, _mem->size); - m_hash = bx::hashMurmur2A(_mem->data, _mem->size); + m_hash = bx::hash(_mem->data, _mem->size); uint32_t magic; bx::read(&reader, magic); diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index ed4acee65..13770de01 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -3869,7 +3869,7 @@ BX_UNUSED(currentSamplerStateIdx); currentBindHash = 0; } -// uint32_t bindHash = bx::hashMurmur2A(renderBind.m_bind, sizeof(renderBind.m_bind) ); +// uint32_t bindHash = bx::hash(renderBind.m_bind, sizeof(renderBind.m_bind) ); // if (currentBindHash != bindHash) // { // currentBindHash = bindHash; @@ -4095,7 +4095,7 @@ BX_UNUSED(currentSamplerStateIdx); ); uint16_t scissor = draw.m_scissor; - uint32_t bindHash = bx::hashMurmur2A(renderBind.m_bind, sizeof(renderBind.m_bind) ); + uint32_t bindHash = bx::hash(renderBind.m_bind, sizeof(renderBind.m_bind) ); if (currentBindHash != bindHash || 0 != changedStencil || (hasFactor && blendFactor != draw.m_rgba) diff --git a/src/vertexdecl.cpp b/src/vertexdecl.cpp index 3e51dc96e..ba00480dc 100644 --- a/src/vertexdecl.cpp +++ b/src/vertexdecl.cpp @@ -154,7 +154,7 @@ namespace bgfx { bx::debugPrintf("vertexdecl %08x (%08x), stride %d\n" , _decl.m_hash - , bx::hashMurmur2A(_decl.m_attributes) + , bx::hash(_decl.m_attributes) , _decl.m_stride ); @@ -812,7 +812,7 @@ namespace bgfx { float pos[4]; vertexUnpack(pos, Attrib::Position, _decl, _data, ii); - uint32_t hashValue = bx::hashMurmur2A(pos, 3*sizeof(float) ) & hashMask; + uint32_t hashValue = bx::hash(pos, 3*sizeof(float) ) & hashMask; uint16_t offset = hashTable[hashValue]; for (; UINT16_MAX != offset; offset = next[offset])