diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-03-18 09:49:55 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-03-24 09:26:16 +0200 |
| commit | 41ebe7cc1281c5d4c3535154e10edad838e49270 (patch) | |
| tree | 02f49ab5def84683e236c8a98605fd480e713dc3 /src/datavisualization/engine/scatter3drenderer_p.h | |
| parent | 6058ad34c490f505c4acffc30719c8abca165984 (diff) | |
Use GL_LINES for ES2 grid lines
Task-number: QTRD-2527
Change-Id: I08b9c740f6dfaf8107601cfc1e7e53db13bf8268
Note: Not to be merged until 1.0 is released
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/scatter3drenderer_p.h')
| -rw-r--r-- | src/datavisualization/engine/scatter3drenderer_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index 5591a362..b82ff4ae 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -68,7 +68,9 @@ private: ShaderHelper *m_backgroundShader; ShaderHelper *m_labelShader; ObjectHelper *m_backgroundObj; +#if !(defined QT_OPENGL_ES_2) ObjectHelper *m_gridLineObj; +#endif ObjectHelper *m_labelObj; GLuint m_bgrTexture; GLuint m_depthTexture; @@ -121,13 +123,13 @@ private: void drawScene(GLuint defaultFboHandle); void loadBackgroundMesh(); - void loadGridLineMesh(); void loadLabelMesh(); void initSelectionShader(); void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader); void initLabelShaders(const QString &vertexShader, const QString &fragmentShader); void initSelectionBuffer(); #if !defined(QT_OPENGL_ES_2) + void loadGridLineMesh(); void initDepthShader(); void updateDepthBuffer(); #else |