@@ -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<bx::HashMurmur2A>(_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;
@@ -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
@@ -1677,7 +1677,7 @@ namespace bgfx { namespace d3d12
@@ -1169,7 +1169,7 @@ namespace bgfx { namespace d3d9
@@ -2906,7 +2906,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
- m_uniformReg.add(_handle, _name, m_uniforms[_handle.idx]);
@@ -936,7 +936,7 @@ namespace bgfx { namespace mtl
@@ -2107,7 +2107,7 @@ VK_IMPORT_DEVICE