commit d32234e627bd50f6bf2eed5584e128e6f615aa26 parent 0a6fe56204ed5d87f021623c1fab0e5f6bdca9c8 Author: Michael Savage <mikejsavage@gmail.com> Date: Thu Aug 31 22:55:07 +0300 MSVC warnings Diffstat:
renderer.h | | | 8 | ++++---- |
diff --git a/renderer.h b/renderer.h @@ -251,22 +251,22 @@ VB renderer_new_ib( const array< T > data, BufferUsage usage = BUFFERUSAGE_STATI */ template< typename T > -constexpr size_t renderer_ubo_alignment() { +constexpr u32 renderer_ubo_alignment() { return min( align4( sizeof( T ) ), 4 * sizeof( float ) ); } template<> -constexpr size_t renderer_ubo_alignment< v3 >() { +constexpr u32 renderer_ubo_alignment< v3 >() { return 4 * sizeof( float ); } template< typename T > -constexpr size_t renderer_ub_alignment() { +constexpr u32 renderer_ub_alignment() { return renderer_ubo_alignment< T >(); } template< typename S, typename T, typename... Rest > -constexpr size_t renderer_ub_alignment() { +constexpr u32 renderer_ub_alignment() { return max( renderer_ub_alignment< T, Rest... >(), renderer_ubo_alignment< S >() ); }