@@ -21,6 +21,7 @@ common(

     PACKAGES

         OpenGL

         GLEW

+        glm

     FETCHCONTENT

         https://git.rcrnstn.net/rcrnstn/cxx-str

         https://git.rcrnstn.net/rcrnstn/gltest

@@ -31,4 +32,5 @@ common(

         cxx-str

     DEPENDENCIES_TESTS

         gltest

+        glm

 )

@@ -14,8 +14,10 @@ Overview of usage:

 ```cpp

 #include <GL/glew.h>

+#include <glm/glm.hpp>

 #include <glshader.hpp>

+#include <glshader_glm.hpp>

 // Global data.

@@ -29,6 +31,7 @@ int main()

 {

     // Local data.

     auto light_count = 3;

+    auto color = glm::vec4{1, 0, 0, 1};

     // Global settings.

     Shader::root("assets/shaders");

@@ -53,6 +56,7 @@ int main()

     player

         .use()

         .uniform("light_count", light_count)

+        .uniform("color", color)

         .validate();

 }

 ```

@@ -271,6 +275,15 @@ literals) or use an explicit cast to get the `GLfloat` specialization.

 [`delete`]: https://en.cppreference.com/w/cpp/language/function#Deleted_functions

+#### OpenGL Mathematics (GLM)

+

+[OpenGL Mathematics (GLM)][] specializations are provided in the include file

+`glshader_glm.hpp`. OpenGL Mathematics (GLM) uses [OpenGL Shading Language

+(GLSL)][] naming conventions.

+

+[OpenGL Mathematics (GLM)]: https://glm.g-truc.net

+[OpenGL Shading Language (GLSL)]: https://www.khronos.org/opengl/wiki/OpenGL_Shading_Language

+

 #### User-defined uniforms

 Support for e.g. third party mathematics libraries can be added by providing

@@ -287,6 +300,7 @@ Public (interface):

 -   [OpenGL][], system (e.g. [`libgl1-mesa-dev`][]).

 -   [OpenGL Extension Wrangler (GLEW)][], system (e.g. [`libglew-dev`][]).

+-   [OpenGL Mathematics (GLM)][], **optional**, system (e.g. [`libglm-dev`][]).

 Private (build):

@@ -295,12 +309,15 @@ Private (build):

 Private (tests):

 -   [GLFW][], system (e.g. [`libglfw3-dev`][]).

+-   [OpenGL Mathematics (GLM)][], system (e.g. [`libglm-dev`][]).

 -   [`gltest`][], downloaded as part of the CMake configure step.

 [OpenGL Extension Wrangler (GLEW)]: http://glew.sourceforge.net

+[OpenGL Mathematics (GLM)]: https://glm.g-truc.net

 [GLFW]: https://www.glfw.org

 [`libgl1-mesa-dev`]: https://packages.debian.org/search?keywords=libgl1-mesa-dev

 [`libglew-dev`]: https://packages.debian.org/search?keywords=libglew-dev

+[`libglm-dev`]: https://packages.debian.org/search?keywords=libglm-dev

 [`libglfw3-dev`]: https://packages.debian.org/search?keywords=libglfw3-dev

 [`str`]: https://git.rcrnstn.net/rcrnstn/str

 [`gltest`]: https://git.rcrnstn.net/rcrnstn/gltest

@@ -8,9 +8,10 @@

 uniform float blue;

+uniform vec4 color;

 void main()

 {

-    gl_FragColor = vec4(red, green, blue, 1.0);

+    gl_FragColor = vec4(red, green, blue, color.a);

 }

new file mode 100644

@@ -0,0 +1,73 @@

+#ifndef GLSHADER_GLM_HPP_

+#define GLSHADER_GLM_HPP_

+

+

+#include <GL/glew.h>

+

+#include <glm/glm.hpp>

+#include <glm/gtc/type_ptr.hpp>

+

+#include <glshader.hpp>

+

+

+#define GLSHADER_UNIFORM_GLM_N_(N, GLM_TYPE, SUFFIX) \

+    GLSHADER_UNIFORM( \

+        glm::GLM_TYPE##N, \

+        glUniform##N##SUFFIX##v( \

+            location, 1, glm::value_ptr(value) \

+        ); \

+    )

+

+#define GLSHADER_UNIFORM_GLM_N_BOOL_(N) \

+    GLSHADER_UNIFORM( \

+        glm::bvec##N, \

+        GLint int_value[N]; \

+        for (auto i = 0; i < N; ++i) \

+            int_value[i] = value[i]; \

+        glUniform##N##iv( \

+            location, 1, &int_value[0] \

+        ); \

+    )

+

+#define GLSHADER_UNIFORM_GLM_MATRIX_N_(N) \

+    GLSHADER_UNIFORM( \

+        glm::mat##N, \

+        glUniformMatrix##N##fv( \

+            location, 1, GL_FALSE, glm::value_ptr(value) \

+        ); \

+    )

+

+#define GLSHADER_UNIFORM_GLM_MATRIX_N_M_(N, M) \

+    GLSHADER_UNIFORM( \

+        glm::mat##N##x##M, \

+        glUniformMatrix##N##x##M##fv( \

+            location, 1, GL_FALSE, glm::value_ptr(value) \

+        ); \

+    )

+

+GLSHADER_UNIFORM_GLM_N_BOOL_(2)

+GLSHADER_UNIFORM_GLM_N_BOOL_(3)

+GLSHADER_UNIFORM_GLM_N_BOOL_(4)

+GLSHADER_UNIFORM_GLM_N_(2, ivec, i)

+GLSHADER_UNIFORM_GLM_N_(3, ivec, i)

+GLSHADER_UNIFORM_GLM_N_(4, ivec, i)

+GLSHADER_UNIFORM_GLM_N_(2, uvec, ui)

+GLSHADER_UNIFORM_GLM_N_(3, uvec, ui)

+GLSHADER_UNIFORM_GLM_N_(4, uvec, ui)

+GLSHADER_UNIFORM_GLM_N_(2, vec, f)

+GLSHADER_UNIFORM_GLM_N_(3, vec, f)

+GLSHADER_UNIFORM_GLM_N_(4, vec, f)

+

+GLSHADER_UNIFORM_GLM_MATRIX_N_(2)

+GLSHADER_UNIFORM_GLM_MATRIX_N_(3)

+GLSHADER_UNIFORM_GLM_MATRIX_N_(4)

+

+GLSHADER_UNIFORM_GLM_MATRIX_N_M_(2, 3)

+GLSHADER_UNIFORM_GLM_MATRIX_N_M_(2, 4)

+GLSHADER_UNIFORM_GLM_MATRIX_N_M_(3, 2)

+GLSHADER_UNIFORM_GLM_MATRIX_N_M_(3, 4)

+GLSHADER_UNIFORM_GLM_MATRIX_N_M_(4, 2)

+GLSHADER_UNIFORM_GLM_MATRIX_N_M_(4, 3)

+

+

+#endif // GLSHADER_GLM_HPP_

@@ -1,8 +1,10 @@

 #include <string>

 #include <GL/glew.h>

+#include <glm/glm.hpp>

 #include <glshader.hpp>

+#include <glshader_glm.hpp>

 #include <gltest.hpp>

@@ -161,6 +163,9 @@ GLTEST(2, 0, 640, 480, glshader)

         "got error GL_INVALID_OPERATION (wrong type?)."

     )

+    // Uniform OpenGL Mathematics (GLM).

+    glm::vec4 color{1.0F};

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

@@ -169,6 +174,7 @@ GLTEST(2, 0, 640, 480, glshader)

     all

         .use()

         .uniform("blue", blue)

+        .uniform("color", color)

         .validate();

     constexpr auto size = 0.5F;