commit ed51d4293dd919a03edca11ec48c607bbfa31076
author Tomaž Vajngerl <tomaz.vajngerl@collabora.com> Sun Mar 06 23:54:52 2016 +0100
committer Tomaž Vajngerl <tomaz.vajngerl@collabora.com> Mon Mar 07 00:20:59 2016 +0100
tree eefc3d0a51826fc6749c487b51a1b5abad713bd3
parent 729572957402e43d055482b51080034109b16ec6

opengl: fix loading shader with preamble that uses #version

The preamble was inserted into a false position so the shader
could was constructed incorrectly and would fail to compile.

Change-Id: I4c51adde9014a326bbe38a5d2d17dd0047e33195

vcl/source/opengl/OpenGLHelper.cxx

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index aae3cc2..47fe8fe 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -157,8 +157,8 @@ static void addPreamble(OString& rShaderSource, const OString& rPreamble)
        if (nVersionStrEndPos == -1)
            nVersionStrEndPos = nVersionStrStartPos + 8;

        OString aVersionLine = rShaderSource.copy(0, nVersionStrEndPos - nVersionStrStartPos);
        OString aShaderBody = rShaderSource.copy(nVersionStrEndPos - nVersionStrStartPos);
        OString aVersionLine = rShaderSource.copy(0, nVersionStrEndPos);
        OString aShaderBody = rShaderSource.copy(nVersionStrEndPos + 1);

        rShaderSource = aVersionLine + "\n" + rPreamble + "\n" + aShaderBody;
    }