Shaders: a crutch for MSVC's neverending fails.

Hope this is enough?
5 years ago · 4aa5217947
6 changed files with 60 additions and 30 deletions
--- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
@ -259,7 +259,8 @@ DistanceFieldVectorGLTest::DistanceFieldVectorGLTest() {
        #endif
        });

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<DistanceFieldVectorGLTest>({
        &DistanceFieldVectorGLTest::renderDefaults2D,
        #ifndef MAGNUM_TARGET_GLES2
        &DistanceFieldVectorGLTest::renderDefaults2D<DistanceFieldVectorGL2D::Flag::UniformBuffers>,
@ -272,7 +273,8 @@ DistanceFieldVectorGLTest::DistanceFieldVectorGLTest() {
        &DistanceFieldVectorGLTest::renderSetup,
        &DistanceFieldVectorGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<DistanceFieldVectorGLTest>({
        &DistanceFieldVectorGLTest::render2D,
        #ifndef MAGNUM_TARGET_GLES2
        &DistanceFieldVectorGLTest::render2D<DistanceFieldVectorGL2D::Flag::UniformBuffers>,
--- a/src/Magnum/Shaders/Test/FlatGLTest.cpp
+++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp
@ -336,7 +336,8 @@ FlatGLTest::FlatGLTest() {
        #endif
    });

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<FlatGLTest>({
        &FlatGLTest::renderDefaults2D,
        #ifndef MAGNUM_TARGET_GLES2
        &FlatGLTest::renderDefaults2D<FlatGL2D::Flag::UniformBuffers>,
@ -365,7 +366,8 @@ FlatGLTest::FlatGLTest() {
        &FlatGLTest::renderSetup,
        &FlatGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<FlatGLTest>({
        &FlatGLTest::renderTextured2D,
        #ifndef MAGNUM_TARGET_GLES2
        &FlatGLTest::renderTextured2D<FlatGL2D::Flag::UniformBuffers>,
@ -379,7 +381,8 @@ FlatGLTest::FlatGLTest() {
        &FlatGLTest::renderSetup,
        &FlatGLTest::renderTeardown);

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<FlatGLTest>({
        &FlatGLTest::renderVertexColor2D<Color3>,
        #ifndef MAGNUM_TARGET_GLES2
        &FlatGLTest::renderVertexColor2D<Color3, FlatGL2D::Flag::UniformBuffers>,
@ -400,7 +403,8 @@ FlatGLTest::FlatGLTest() {
        &FlatGLTest::renderSetup,
        &FlatGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<FlatGLTest>({
        &FlatGLTest::renderAlpha2D,
        #ifndef MAGNUM_TARGET_GLES2
        &FlatGLTest::renderAlpha2D<FlatGL2D::Flag::UniformBuffers>,
@ -415,7 +419,8 @@ FlatGLTest::FlatGLTest() {
        &FlatGLTest::renderAlphaTeardown);

    #ifndef MAGNUM_TARGET_GLES2
-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<FlatGLTest>({
        &FlatGLTest::renderObjectId2D,
        &FlatGLTest::renderObjectId2D<FlatGL2D::Flag::UniformBuffers>,
        &FlatGLTest::renderObjectId3D,
@ -425,7 +430,8 @@ FlatGLTest::FlatGLTest() {
        &FlatGLTest::renderObjectIdTeardown);
    #endif

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<FlatGLTest>({
        &FlatGLTest::renderInstanced2D,
        #ifndef MAGNUM_TARGET_GLES2
        &FlatGLTest::renderInstanced2D<FlatGL2D::Flag::UniformBuffers>,
--- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
+++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
@ -675,7 +675,8 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
        });

    #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<MeshVisualizerGLTest>({
        &MeshVisualizerGLTest::renderDefaultsWireframe2D,
        #ifndef MAGNUM_TARGET_GLES2
        &MeshVisualizerGLTest::renderDefaultsWireframe2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
@ -690,7 +691,8 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
    #endif

    #ifndef MAGNUM_TARGET_GLES2
-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<MeshVisualizerGLTest>({
        &MeshVisualizerGLTest::renderDefaultsObjectId2D,
        #ifndef MAGNUM_TARGET_GLES2
        &MeshVisualizerGLTest::renderDefaultsObjectId2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
@ -706,7 +708,8 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
    #endif

    #ifndef MAGNUM_TARGET_GLES2
-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<MeshVisualizerGLTest>({
        &MeshVisualizerGLTest::renderDefaultsVertexId2D,
        #ifndef MAGNUM_TARGET_GLES2
        &MeshVisualizerGLTest::renderDefaultsVertexId2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
@ -734,7 +737,8 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
        &MeshVisualizerGLTest::renderTeardown);
    #endif

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<MeshVisualizerGLTest>({
        &MeshVisualizerGLTest::renderWireframe2D,
        #ifndef MAGNUM_TARGET_GLES2
        &MeshVisualizerGLTest::renderWireframe2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
@ -744,7 +748,8 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
        &MeshVisualizerGLTest::renderSetup,
        &MeshVisualizerGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<MeshVisualizerGLTest>({
        &MeshVisualizerGLTest::renderWireframe3D,
        #ifndef MAGNUM_TARGET_GLES2
        &MeshVisualizerGLTest::renderWireframe3D<MeshVisualizerGL3D::Flag::UniformBuffers>,
@ -755,7 +760,8 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
        &MeshVisualizerGLTest::renderTeardown);

    #ifndef MAGNUM_TARGET_GLES2
-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<MeshVisualizerGLTest>({
        &MeshVisualizerGLTest::renderObjectVertexPrimitiveId2D,
        #ifndef MAGNUM_TARGET_GLES2
        &MeshVisualizerGLTest::renderObjectVertexPrimitiveId2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
@ -775,7 +781,8 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
        &MeshVisualizerGLTest::renderSetup,
        &MeshVisualizerGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<MeshVisualizerGLTest>({
        &MeshVisualizerGLTest::renderTangentBitangentNormal,
        #ifndef MAGNUM_TARGET_GLES2
        &MeshVisualizerGLTest::renderTangentBitangentNormal<MeshVisualizerGL3D::Flag::UniformBuffers>,
--- a/src/Magnum/Shaders/Test/PhongGLTest.cpp
+++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp
@ -620,7 +620,8 @@ PhongGLTest::PhongGLTest() {
        #endif
    });

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<PhongGLTest>({
        &PhongGLTest::renderDefaults,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderDefaults<PhongGL::Flag::UniformBuffers>
@ -629,7 +630,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderSetup,
        &PhongGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderColored,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderColored<PhongGL::Flag::UniformBuffers>
@ -639,7 +641,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderSetup,
        &PhongGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderSinglePixelTextured,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderSinglePixelTextured<PhongGL::Flag::UniformBuffers>
@ -649,7 +652,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderSetup,
        &PhongGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderTextured,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderTextured<PhongGL::Flag::UniformBuffers>
@ -659,7 +663,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderSetup,
        &PhongGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderTexturedNormal,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderTexturedNormal<PhongGL::Flag::UniformBuffers>
@ -669,7 +674,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderSetup,
        &PhongGLTest::renderTeardown);

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<PhongGLTest>({
        &PhongGLTest::renderVertexColor<Color3>,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderVertexColor<Color3, PhongGL::Flag::UniformBuffers>,
@ -682,7 +688,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderSetup,
        &PhongGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderShininess,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderShininess<PhongGL::Flag::UniformBuffers>,
@ -692,7 +699,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderSetup,
        &PhongGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderAlpha,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderAlpha<PhongGL::Flag::UniformBuffers>
@ -703,7 +711,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderAlphaTeardown);

    #ifndef MAGNUM_TARGET_GLES2
-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderObjectId,
        &PhongGLTest::renderObjectId<PhongGL::Flag::UniformBuffers>},
        Containers::arraySize(RenderObjectIdData),
@ -711,7 +720,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderObjectIdTeardown);
    #endif

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderLights,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderLights<PhongGL::Flag::UniformBuffers>,
@ -726,7 +736,8 @@ PhongGLTest::PhongGLTest() {
        &PhongGLTest::renderSetup,
        &PhongGLTest::renderTeardown);

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<PhongGLTest>({
        &PhongGLTest::renderZeroLights,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderZeroLights<PhongGL::Flag::UniformBuffers>
@ -741,7 +752,8 @@ PhongGLTest::PhongGLTest() {
        #endif
    );

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<PhongGLTest>({
        &PhongGLTest::renderInstanced,
        #ifndef MAGNUM_TARGET_GLES2
        &PhongGLTest::renderInstanced<PhongGL::Flag::UniformBuffers>,
--- a/src/Magnum/Shaders/Test/VectorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp
@ -237,7 +237,8 @@ VectorGLTest::VectorGLTest() {
        #endif
        });

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<VectorGLTest>({
        &VectorGLTest::renderDefaults2D,
        #ifndef MAGNUM_TARGET_GLES2
        &VectorGLTest::renderDefaults2D<VectorGL2D::Flag::UniformBuffers>,
@ -250,7 +251,8 @@ VectorGLTest::VectorGLTest() {
        &VectorGLTest::renderSetup,
        &VectorGLTest::renderTeardown);

-    addInstancedTests({
+    /* MSVC needs explicit type due to default template args */
+    addInstancedTests<VectorGLTest>({
        &VectorGLTest::render2D,
        #ifndef MAGNUM_TARGET_GLES2
        &VectorGLTest::render2D<VectorGL2D::Flag::UniformBuffers>,
--- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
@ -188,7 +188,8 @@ VertexColorGLTest::VertexColorGLTest() {
        #endif
        });

-    addTests({
+    /* MSVC needs explicit type due to default template args */
+    addTests<VertexColorGLTest>({
        &VertexColorGLTest::renderDefaults2D<Color3>,
        #ifndef MAGNUM_TARGET_GLES2
        &VertexColorGLTest::renderDefaults2D<Color3, VertexColorGL2D::Flag::UniformBuffers>,