Use std::make_tuple instead of list initialization

2018-01-29 00:08:28 +08:00
parent ad2665c641
commit f0c03b317e
1 changed files with 2 additions and 2 deletions
--- a/src/graphics/sp/sp_base.cpp
+++ b/src/graphics/sp/sp_base.cpp
@@ -200,8 +200,8 @@ void displaceShaderInit(SPShader* shader)
            glClear(GL_COLOR_BUFFER_BIT);
        }, RP_RESERVED);
    SPShaderManager::addPrefilledTexturesToShader(shader,
-        {{ "displacement_tex", "displace.png", false/*srgb*/, ST_BILINEAR }},
-        RP_RESERVED);
+        {std::make_tuple("displacement_tex", "displace.png", false/*srgb*/,
+        ST_BILINEAR)}, RP_RESERVED);
    shader->addCustomPrefilledTextures(ST_BILINEAR,
        GL_TEXTURE_2D, "mask_tex", []()->GLuint
        {