summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-08-16 05:39:31 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-09-02 01:08:46 +0200
commit55226553174cf064833ac319ae3be5e72f055c87 (patch)
treee9f46d93c39e0d1619ec289f2d91bbac90779efd /canvas
parent30cf6528ccc7e0a443800208cef636c7947a355a (diff)
fix shader names, the .glsl is attached in OpenGLHelper::LoadShader
Change-Id: I267c1fefa5330359f3aea0d57d38a153232b655f
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index c7a7eb673a9d..58a59ea1fe1c 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -110,22 +110,22 @@ namespace oglcanvas
initContext();
mnLinearMultiColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader.glsl", "linearMultiColorGradientFragmentShader.glsl");
+ OpenGLHelper::LoadShaders("dummyVertexShader", "linearMultiColorGradientFragmentShader");
mnLinearTwoColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader.glsl", "linearTwoColorGradientFragmentShader.glsl");
+ OpenGLHelper::LoadShaders("dummyVertexShader", "linearTwoColorGradientFragmentShader");
mnRadialMultiColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader.glsl", "radialMultiColorGradientFragmentShader.glsl");
+ OpenGLHelper::LoadShaders("dummyVertexShader", "radialMultiColorGradientFragmentShader");
mnRadialTwoColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader.glsl", "radialTwoColorGradientFragmentShader.glsl");
+ OpenGLHelper::LoadShaders("dummyVertexShader", "radialTwoColorGradientFragmentShader");
mnRectangularMultiColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader.glsl", "rectangularMultiColorGradientFragmentShader.glsl");
+ OpenGLHelper::LoadShaders("dummyVertexShader", "rectangularMultiColorGradientFragmentShader");
mnRectangularTwoColorGradientProgram =
- OpenGLHelper::LoadShaders("dummyVertexShader.glsl", "rectangularTwoColorGradientFragmentShader.glsl");
+ OpenGLHelper::LoadShaders("dummyVertexShader", "rectangularTwoColorGradientFragmentShader");
maContext.makeCurrent();