diff options
author | Mika Salmela <mika.salmela@digia.com> | 2013-09-17 11:48:54 +0300 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2013-09-17 12:04:49 +0300 |
commit | ab8343a2df664545575b5233b74ea0329647c7df (patch) | |
tree | be72d823cbfb9fa22d1d2c9ff90229252e02d74e /src/datavisualization/utils/shaderhelper.cpp | |
parent | dbc876fa0f9c5c87d0ee250efa4d7a211bde3ddf (diff) |
Misc bug fixes
- Enabled zooming on Surface C++ api
- User modified gradient takes effect
- Scene pointer is updated to selection pointer
- Font changing is listened on selection pointer and label's are generated
using selected font
- Selection label format copied from scatter. Looks to be very handy.
- Check for OpenGL 1.5 version and block coarse surface if below
- Added some theme handling. Not sure if the bug is fully fixed. Probably
requires shadow fixes to be fully similar to others.
- HAHAA. Now even single rows and columns supported. Even one value will
produce surface
Task-number: QTRD-2279
Task-number: QTRD-2265
Task-number: QTRD-2261
Task-number: QTRD-2269
Task-number: QTRD-2268
Task-number: QTRD-2272
Change-Id: Id34d843b2898e4cf1e4dde10ce23e0eaab4738a7
Signed-off-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/utils/shaderhelper.cpp')
-rw-r--r-- | src/datavisualization/utils/shaderhelper.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp index 508bc90a..7df1736c 100644 --- a/src/datavisualization/utils/shaderhelper.cpp +++ b/src/datavisualization/utils/shaderhelper.cpp @@ -86,6 +86,18 @@ void ShaderHelper::initialize() m_initialized = true; } +bool ShaderHelper::testCompile() +{ + if (m_program) + delete m_program; + m_program = new QOpenGLShaderProgram(m_caller); + if (!m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, m_vertexShaderFile)) + return false; + if (!m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, m_fragmentShaderFile)) + return false; + return true; +} + void ShaderHelper::bind() { m_program->bind(); |