@@ -208,6 +208,24 @@ GLTEST(2, 0, 640, 480, glshader)

         "uniform block required but not found (did you mean the uniform?)."

     )

+    // Texture.

+    auto texture0 = GLuint{};

+    glGenTextures(1, &texture0);

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/texture.vert"}).use().texture("texture0", texture0, GL_TEXTURE_2D).texture("texture0", texture0, GL_TEXTURE_3D),

+        "Failed to set texture 1; "

+        "expected target GL_TEXTURE_2D but got GL_TEXTURE_3D."

+    )

+    auto texture1 = GLuint{};

+    glGenTextures(1, &texture1);

+    glActiveTexture(GL_TEXTURE0);

+    glBindTexture(GL_TEXTURE_3D, texture1);

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/texture.vert"}).use().texture("texture0", texture1, GL_TEXTURE_2D),

+        "Failed to bind texture 2 to target GL_TEXTURE_2D; "

+        "got error GL_INVALID_OPERATION (wrong target?)."

+    )

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

@@ -1,3 +1,4 @@

+#include <array>

 #include <string>

 #include <GL/glew.h>

@@ -166,6 +167,47 @@ GLTEST(2, 0, 640, 480, glshader)

     // Uniform OpenGL Mathematics (GLM).

     glm::vec4 color{1.0F};

+    // Uniform buffer.

+    struct

+    {

+        std::array<float, 4> value1;

+    } small = {};

+    struct

+    {

+        std::array<float, 4> value1;

+        std::array<float, 4> value2;

+    } big = {};

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_buffer_small.vert"}).use().validate(),

+        "Failed to validate shader program 'tests/uniform_buffer_small.vert'; "

+        "uniform block 'small' not set."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader::uniform_buffer("small", big),

+        "Failed to set uniform buffer 'small'; "

+        "expected size 16 but got 32."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_buffer_small.vert"}).use().uniform("small", big),

+        "Failed to set uniform block 'small' of shader program 'tests/uniform_buffer_small.vert'; "

+        "expected size 16 but got 32."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_buffer_bad_size.vert"}),

+        "Failed to initialize uniform block 'small' of shader program 'tests/uniform_buffer_bad_size.vert'; "

+        "expected size 16 but got 32."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_buffer_small.vert"}).use().uniform("small", 1.0F),

+        "Failed to set uniform 'small' of shader program 'tests/uniform_buffer_small.vert'; "

+        "uniform required but not found (did you mean the uniform block?)."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_blue.frag"}).use().uniform("blue", small),

+        "Failed to set uniform block 'blue' of shader program 'tests/uniform_blue.frag'; "

+        "uniform block required but not found (did you mean the uniform?)."

+    )

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

@@ -175,7 +217,9 @@ GLTEST(2, 0, 640, 480, glshader)

         .use()

         .uniform("blue", blue)

         .uniform("color", color)

+        .uniform("small", small)

         .validate();

+    Shader::uniform_buffer("small", small);

     constexpr auto size = 0.5F;

     glBegin(GL_TRIANGLE_STRIP);

@@ -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;

@@ -137,6 +137,30 @@ GLTEST(2, 0, 640, 480, glshader)

         "Failed to initialize vertex input 'vert_unset' of shader program 'tests/vert_unset.vert'."

     );

+    // Uniform scalars.

+    constexpr auto blue = 0.25F;

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_blue.frag"}).uniform("noncurrent", 1.0F),

+        "Failed to set uniform 'noncurrent' of shader program 'tests/uniform_blue.frag'; "

+        "shader program not current."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_blue.frag"}).use().uniform("nonexistent", 1.0F),

+        "Failed to set uniform 'nonexistent' of shader program 'tests/uniform_blue.frag'; "

+        "uniform required but not found."

+    )

+    Shader({"tests/uniform_blue.frag"}).use().uniform("nonexistent", 1.0F, false);

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_blue.frag"}).use().validate(),

+        "Failed to validate shader program 'tests/uniform_blue.frag'; "

+        "uniform 'blue' not set."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/uniform_blue.frag"}).use().uniform("blue", 1),

+        "Failed to set uniform 'blue' of shader program 'tests/uniform_blue.frag'; "

+        "got error GL_INVALID_OPERATION (wrong type?)."

+    )

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

@@ -144,6 +168,7 @@ GLTEST(2, 0, 640, 480, glshader)

     all

         .use()

+        .uniform("blue", blue)

         .validate();

     constexpr auto size = 0.5F;

@@ -125,6 +125,18 @@ GLTEST(2, 0, 640, 480, glshader)

         "assets/shaders/tests/include_nested_extension.vert:7: #include \"include_nested_extension.h\""

     )

+    // Vertex inputs.

+    constexpr auto vert_position  = 0;

+    constexpr auto vert_tex_coord = 1;

+    Shader::verts({

+        {"vert_position",  vert_position},

+        {"vert_tex_coord", vert_tex_coord},

+    });

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/vert_unset.vert"}),

+        "Failed to initialize vertex input 'vert_unset' of shader program 'tests/vert_unset.vert'."

+    );

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

@@ -31,7 +31,7 @@ GLTEST(2, 0, 640, 480, glshader)

     GLTEST_EXPECT_EXCEPTION(true,

         Shader({"tests/create_bad_compile.vert"}),

         "Failed to compile shader 'tests/create_bad_compile.vert' of shader program 'tests/create_bad_compile.vert':\n"

-        "0:4(5): error: main() must return void\n"

+        "\"assets/shaders/tests/create_bad_compile.vert\":4(5): error: main() must return void\n"

     )

     GLTEST_EXPECT_EXCEPTION(true,

         Shader({"tests/create_bad_link.vert"}),

@@ -78,6 +78,53 @@ GLTEST(2, 0, 640, 480, glshader)

         {"red", std::to_string(red)},

     });

+    // Include.

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/include_malformed_extension.vert"}),

+        "Failed to source shader 'tests/include_malformed_extension.vert' of shader program 'tests/include_malformed_extension.vert'; "

+        "malformed #extension:\n"

+        "assets/shaders/tests/include_malformed_extension.vert:4: #extension extension"

+    )

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/include_malformed.vert"}),

+        "Failed to source shader 'tests/include_malformed.vert' of shader program 'tests/include_malformed.vert'; "

+        "malformed #include:\n"

+        "assets/shaders/tests/include_malformed.vert:7: #include \"bad_include_malformed.h\" malformed.h\""

+    )

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/include_mismatched_quotes.vert"}),

+        "Failed to source shader 'tests/include_mismatched_quotes.vert' of shader program 'tests/include_mismatched_quotes.vert'; "

+        "mismatched #include quotes '\"' and '>':\n"

+        "assets/shaders/tests/include_mismatched_quotes.vert:7: #include \"bad_include_quotes.h>"

+    )

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/include_no_extension.vert"}),

+        "Failed to source shader 'tests/include_no_extension.vert' of shader program 'tests/include_no_extension.vert'; "

+        "#include found but #extension GL_ARB_shading_language_include not enabled:\n"

+        "assets/shaders/tests/include_no_extension.vert:4: #include \"bad_include_noextension.h\""

+    )

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/include_nonexistent.vert"}),

+        "Failed to source shader 'tests/include_nonexistent.vert' of shader program 'tests/include_nonexistent.vert'; "

+        "could not open file 'assets/shaders/tests/bad_include_nonexistent.h':\n"

+        "assets/shaders/tests/include_nonexistent.vert:7: #include \"bad_include_nonexistent.h\":\n"

+        "No such file or directory"

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/include_nested_version.vert"}),

+        "Failed to source shader 'tests/include_nested_version.vert' of shader program 'tests/include_nested_version.vert'; "

+        "found #version in #include:\n"

+        "assets/shaders/tests/include_nested_version.h:1: #version 110\n"

+        "assets/shaders/tests/include_nested_version.vert:7: #include \"include_nested_version.h\""

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/include_nested_extension.vert"}),

+        "Failed to source shader 'tests/include_nested_extension.vert' of shader program 'tests/include_nested_extension.vert'; "

+        "found #extension GL_ARB_shading_language_include in #include:\n"

+        "assets/shaders/tests/include_nested_extension.h:1: #extension GL_ARB_shading_language_include : require\n"

+        "assets/shaders/tests/include_nested_extension.vert:7: #include \"include_nested_extension.h\""

+    )

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

@@ -72,6 +72,12 @@ GLTEST(2, 0, 640, 480, glshader)

         "assets/shaders/tests/version_repeated.vert:2: #version 110"

     )

+    // Defines.

+    constexpr auto red = 1.0F;

+    Shader::defines({

+        {"red", std::to_string(red)},

+    });

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

@@ -53,6 +53,25 @@ GLTEST(2, 0, 640, 480, glshader)

         "shader program not current."

     )

+    // Version.

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/version_none.vert"}),

+        "Failed to source shader 'tests/version_none.vert' of shader program 'tests/version_none.vert'; "

+        "found no #version."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/version_malformed.vert"}),

+        "Failed to source shader 'tests/version_malformed.vert' of shader program 'tests/version_malformed.vert'; "

+        "malformed #version:\n"

+        "assets/shaders/tests/version_malformed.vert:1: #version 1.10"

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/version_repeated.vert"}),

+        "Failed to source shader 'tests/version_repeated.vert' of shader program 'tests/version_repeated.vert'; "

+        "found repeated #version:\n"

+        "assets/shaders/tests/version_repeated.vert:2: #version 110"

+    )

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

@@ -46,12 +46,20 @@ GLTEST(2, 0, 640, 480, glshader)

         "active samplers with a different type refer to the same texture image unit"

     )

+    // Use.

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/use.vert"}).validate(),

+        "Failed to validate shader program 'tests/use.vert'; "

+        "shader program not current."

+    )

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

     });

     all

+        .use()

         .validate();

     constexpr auto size = 0.5F;

@@ -39,11 +39,21 @@ GLTEST(2, 0, 640, 480, glshader)

         "error: vertex shader does not write to `gl_Position'. \n"

     )

+    // Validate.

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/validate_bad_samplers.vert"}).validate(),

+        "Failed to validate shader program 'tests/validate_bad_samplers.vert':\n"

+        "active samplers with a different type refer to the same texture image unit"

+    )

+

     auto all = Shader({

         "tests/all.vert",

         "tests/all.frag",

     });

+    all

+        .validate();

+

     constexpr auto size = 0.5F;

     glBegin(GL_TRIANGLE_STRIP);

     glVertex3f(-size, -size, 0.0F);

@@ -0,0 +1,56 @@

+#include <string>

+

+#include <GL/glew.h>

+

+#include <glshader.hpp>

+#include <gltest.hpp>

+

+

+GLTEST(2, 0, 640, 480, glshader)

+{

+    gltest_root("assets/tests");

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

+

+    // Create.

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/create_noextension"}),

+        "Failed to infer type of shader 'tests/create_noextension' of shader program 'tests/create_noextension'; "

+        "no file extension."

+    )

+    GLTEST_EXPECT_EXCEPTION(false,

+        Shader({"tests/create.unknownextension"}),

+        "Failed to infer type of shader 'tests/create.unknownextension' of shader program 'tests/create.unknownextension'; "

+        "unknown file extension 'unknownextension'."

+    )

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/create_nonexistent.vert"}),

+        "Failed to source shader 'tests/create_nonexistent.vert' of shader program 'tests/create_nonexistent.vert'; "

+        "could not open file 'assets/shaders/tests/create_nonexistent.vert':\n"

+        "No such file or directory"

+    )

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/create_bad_compile.vert"}),

+        "Failed to compile shader 'tests/create_bad_compile.vert' of shader program 'tests/create_bad_compile.vert':\n"

+        "0:4(5): error: main() must return void\n"

+    )

+    GLTEST_EXPECT_EXCEPTION(true,

+        Shader({"tests/create_bad_link.vert"}),

+        "Failed to link shader program 'tests/create_bad_link.vert':\n"

+        "error: vertex shader does not write to `gl_Position'. \n"

+    )

+

+    auto all = Shader({

+        "tests/all.vert",

+        "tests/all.frag",

+    });

+

+    constexpr auto size = 0.5F;

+    glBegin(GL_TRIANGLE_STRIP);

+    glVertex3f(-size, -size, 0.0F);

+    glVertex3f(-size, +size, 0.0F);

+    glVertex3f(+size, -size, 0.0F);

+    glVertex3f(+size, +size, 0.0F);

+    glEnd();

+

+    GLTEST_EXPECT_FRAME("frame.data")

+}

new file mode 100644