diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-15 00:01:54 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-15 00:02:51 +0200 |
| commit | 8378bb3122417885db741dc8b6d770863afb72bd (patch) | |
| tree | 6d5c2e9003e6260429855a622483cdd622b2ab1c /chart2 | |
| parent | 0b48025baf41ab58f7fd174d2cda856e0aa5d5ea (diff) | |
fix OSX check for GL_EXT_texture_array
For some reason the extension is supported in GL but not in GLSL.
Change-Id: I1cad8baea23e80714269454af23fca87ea9e2949
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/main/GL3DRenderer.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index d31e5d18f753..7e823349e01e 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -256,8 +256,10 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders() m_3DBatchVertexID = glGetAttribLocation(m_3DBatchProID, "vertexPositionModelspace"); m_3DBatchNormalID = glGetAttribLocation(m_3DBatchProID, "vertexNormalModelspace"); m_3DBatchColorID = glGetAttribLocation(m_3DBatchProID, "barColor"); +#if !defined MACOSX //check whether the texture array is support mbTexBatchSupport = GLEW_EXT_texture_array == 1; +#endif if (mbTexBatchSupport) { m_BatchTextProID = OpenGLHelper::LoadShaders("textVertexShaderBatch", "textFragmentShaderBatch"); |