summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-21 04:20:49 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-21 04:21:41 +0200
commitac0989d5eaad3f8ab52b0288e345f30527dc45a4 (patch)
tree846df1df671a2ee0ab5838ea71492689273997da /chart2
parent00272efc1c71bdbd7fc0126f411765f482eaa2fb (diff)
avoid manual OpenGL extension checking
Change-Id: I75faa82fc2eef7f3bfd3546d64f47dee6a0b7d08
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/view/main/GL3DRenderer.cxx41
1 files changed, 2 insertions, 39 deletions
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 06a1163f2cc1..090685be89e9 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -200,34 +200,7 @@ OpenGL3DRenderer::ShaderResources::~ShaderResources()
void OpenGL3DRenderer::CheckGLSLVersion()
{
- char version[256] = {0};
- strcpy(version, (char *)glGetString(GL_SHADING_LANGUAGE_VERSION));
- char *p = version;
- int iVersion = 0;
- //get the first point
- while ((*p != '\0') && (*p != '.'))
- {
- iVersion = iVersion * 10 + ((*p) - 0x30);
- p++;
- }
- if (iVersion < 3)
- {
- maResources.m_b330Support = false;
- return;
- }
- if (iVersion > 3)
- {
- maResources.m_b330Support = true;
- return;
- }
- p++;
- iVersion = *p - 0x30;
- if (iVersion >= 3)
- {
- maResources.m_b330Support = true;
- return;
- }
- maResources.m_b330Support = false;
+ maResources.m_b330Support = GLEW_VERSION_3_3 == 1;
}
void OpenGL3DRenderer::ShaderResources::LoadShaders()
@@ -252,17 +225,7 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
m_3DBatchNormalID = glGetAttribLocation(m_3DBatchProID, "vertexNormalModelspace");
m_3DBatchColorID = glGetAttribLocation(m_3DBatchProID, "barColor");
//check whether the texture array is support
- GLint numExtensions = 0;
- glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
- for( GLint i = 0; i < numExtensions; ++i )
- {
- OUString currExt = ::rtl::OUString::createFromAscii((char*)glGetStringi(GL_EXTENSIONS, i));
- if (currExt == "GL_EXT_texture_array")
- {
- mbTexBatchSupport = true;
- break;
- }
- }
+ mbTexBatchSupport = GLEW_EXT_texture_array == 1;
if (mbTexBatchSupport)
{
m_BatchTextProID = OpenGLHelper::LoadShaders("textVertexShaderBatch", "textFragmentShaderBatch");