Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove float3 specialization

Browse Source
This commit is contained in:
Mathias Agopian
2019-06-11 14:43:17 -07:00
committed by Mathias Agopian
parent d90d30d10b
commit 8cb38344ae
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
filament/src/UniformBuffer.h
View File

@@ -128,10 +128,8 @@ public:
constexpr size_t stride = (sizeof(T) + 0xF) & ~0xF;
T* UTILS_RESTRICT p = static_cast<T*>(invalidateUniforms(offset, stride * count));
for (size_t i = 0; i < count; i++) {
*p++ = begin[i];
if (sizeof(T) & 0xF) {
p = utils::pointermath::align(p, 0x10);
}
*p = begin[i];
p = utils::pointermath::add(p, stride);
}
}
@@ -192,19 +190,6 @@ private:
mutable bool mSomethingDirty = false;
};
// specialization for float3 (which has a different alignment)
template<>
inline void
UniformBuffer::setUniformArray(size_t offset, math::float3 const* begin, size_t count) noexcept {
math::float4* p = static_cast<math::float4*>(invalidateUniforms(offset,
sizeof(math::float4) * count));
math::float3 const* const end = begin + count;
while (begin != end) {
p->xyz = *begin++;
++p;
}
}
// specialization for mat3f (which has a different alignment, see std140 layout rules)
template<>
inline void UniformBuffer::setUniform(void* addr, size_t offset, const math::mat3f& v) noexcept {