From ed51d4293dd919a03edca11ec48c607bbfa31076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Sun, 6 Mar 2016 23:54:52 +0100 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index aae3cc2d31cd..47fe8feeb762 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; }