Commit f1f7299b authored by Philip Trettner's avatar Philip Trettner

Merge branch 'develop' of https://www.graphics.rwth-aachen.de:9000/Glow/glow into develop

parents 82899572 81502c09
......@@ -104,6 +104,6 @@ template <class Range>
char make_array_view(...);
template <class Range>
inline constexpr bool can_make_array_view = sizeof(make_array_view<Range>(std::declval<Range>())) > 1;
constexpr bool can_make_array_view = sizeof(make_array_view<Range>(std::declval<Range>())) > 1;
}
}
......@@ -33,7 +33,7 @@ namespace glow::detail
template <class T>
struct uniform
{
static inline constexpr bool is_supported = false;
static constexpr bool is_supported = false;
template <class U = T>
uniform(UsedProgram&, U&&)
......@@ -67,7 +67,7 @@ private:
struct uniform_base
{
static inline constexpr bool is_supported = true;
static constexpr bool is_supported = true;
GLint location = -1;
uniform_base(GLint loc) : location(loc) {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment