From 7a6f94ecb99886d0a3ffd6e5605e2bca6662ba88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 21 May 2018 16:59:17 -0700 Subject: [PATCH] Removed unused data. --- src/bgfx_p.h | 4 +--- src/renderer_d3d11.cpp | 2 +- src/renderer_d3d12.cpp | 2 +- src/renderer_d3d9.cpp | 2 +- src/renderer_gl.cpp | 2 +- src/renderer_mtl.mm | 2 +- src/renderer_vk.cpp | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 9e17320e2..132b875b0 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -1394,7 +1394,6 @@ namespace bgfx struct UniformRegInfo { - const void* m_data; UniformHandle m_handle; }; @@ -1420,7 +1419,7 @@ namespace bgfx return NULL; } - const UniformRegInfo& add(UniformHandle _handle, const char* _name, const void* _data) + const UniformRegInfo& add(UniformHandle _handle, const char* _name) { BX_CHECK(isValid(_handle), "Uniform handle is invalid (name: %s)!", _name); const uint32_t key = bx::hash(_name); @@ -1428,7 +1427,6 @@ namespace bgfx m_uniforms.insert(key, _handle.idx); UniformRegInfo& info = m_info[_handle.idx]; - info.m_data = _data; info.m_handle = _handle; return info; diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index 579ac54b2..aad2a3547 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -1841,7 +1841,7 @@ namespace bgfx { namespace d3d11 void* data = BX_ALLOC(g_allocator, size); bx::memSet(data, 0, size); m_uniforms[_handle.idx] = data; - m_uniformReg.add(_handle, _name, data); + m_uniformReg.add(_handle, _name); } void destroyUniform(UniformHandle _handle) override diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index bc53c7533..a96c6ce4f 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -1677,7 +1677,7 @@ namespace bgfx { namespace d3d12 void* data = BX_ALLOC(g_allocator, size); bx::memSet(data, 0, size); m_uniforms[_handle.idx] = data; - m_uniformReg.add(_handle, _name, data); + m_uniformReg.add(_handle, _name); } void destroyUniform(UniformHandle _handle) override diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index 77a5ae2d3..6ec431339 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -1169,7 +1169,7 @@ namespace bgfx { namespace d3d9 void* data = BX_ALLOC(g_allocator, size); bx::memSet(data, 0, size); m_uniforms[_handle.idx] = data; - m_uniformReg.add(_handle, _name, data); + m_uniformReg.add(_handle, _name); } void destroyUniform(UniformHandle _handle) override diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 8a2f11642..0e40330cd 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -2906,7 +2906,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) ); void* data = BX_ALLOC(g_allocator, size); bx::memSet(data, 0, size); m_uniforms[_handle.idx] = data; - m_uniformReg.add(_handle, _name, m_uniforms[_handle.idx]); + m_uniformReg.add(_handle, _name); } void destroyUniform(UniformHandle _handle) override diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm index 856d8d29f..4b1ffb3aa 100644 --- a/src/renderer_mtl.mm +++ b/src/renderer_mtl.mm @@ -936,7 +936,7 @@ namespace bgfx { namespace mtl void* data = BX_ALLOC(g_allocator, size); bx::memSet(data, 0, size); m_uniforms[_handle.idx] = data; - m_uniformReg.add(_handle, _name, data); + m_uniformReg.add(_handle, _name); } void destroyUniform(UniformHandle _handle) override diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index 28e3991dd..cd054c349 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -2107,7 +2107,7 @@ VK_IMPORT_DEVICE void* data = BX_ALLOC(g_allocator, size); bx::memSet(data, 0, size); m_uniforms[_handle.idx] = data; - m_uniformReg.add(_handle, _name, data); + m_uniformReg.add(_handle, _name); } void destroyUniform(UniformHandle _handle) override