diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-22 19:06:42 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-22 19:06:42 +0100 |
| commit | d1f79b4c438ebf0822741e103b2cb06bdee4514e (patch) | |
| tree | a4d574d12cd81d5e33886ce7ca961f7dbe872fcf /lib | |
| parent | Rename lots of shader files (diff) | |
| parent | Keep the instance unused vector sorted and binary search it (diff) | |
| download | ilt-d1f79b4c438ebf0822741e103b2cb06bdee4514e.tar.bz2 ilt-d1f79b4c438ebf0822741e103b2cb06bdee4514e.tar.xz ilt-d1f79b4c438ebf0822741e103b2cb06bdee4514e.zip | |
Merge branch 'instancing'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gl_traits.hpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/gl_traits.hpp b/lib/gl_traits.hpp index e2e689d..6ff8905 100644 --- a/lib/gl_traits.hpp +++ b/lib/gl_traits.hpp @@ -11,20 +11,23 @@ struct gl_traits_base { }; struct gl_traits_float : public gl_traits_base { static constexpr auto vertexAttribFunc { - [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) { + [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { glVertexAttribPointer(index, size, type, GL_FALSE, stride, pointer); + return 1; }}; }; struct gl_traits_longfloat : public gl_traits_base { static constexpr auto vertexAttribFunc { - [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) { + [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { glVertexAttribLPointer(index, size, type, stride, pointer); + return 1; }}; }; struct gl_traits_integer : public gl_traits_base { static constexpr auto vertexAttribFunc { - [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) { + [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { glVertexAttribIPointer(index, size, type, stride, pointer); + return 1; }}; }; template<> struct gl_traits<glm::f32> : public gl_traits_float { @@ -63,4 +66,12 @@ template<glm::length_t L, typename T, glm::qualifier Q> struct gl_traits<glm::ve template<glm::length_t C, glm::length_t R, typename T, glm::qualifier Q> struct gl_traits<glm::mat<C, R, T, Q>> : public gl_traits<T> { static constexpr GLint size {C * R}; + static constexpr auto vertexAttribFunc { + [](GLuint index, GLint, GLenum type, GLsizei stride, const void * pointer) -> GLuint { + const auto base = static_cast<const T *>(pointer); + for (GLuint r = 0; r < R; r++) { + glVertexAttribPointer(index + r, C, type, GL_FALSE, stride, base + (r * C)); + } + return R; + }}; }; |