summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils/texturehelper_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-10-28 12:48:17 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-10-29 09:35:29 +0200
commitbf716cfdf0afecccdb1f2eabb2e6a172c620fbff (patch)
treedd5a8e5d1360defd47599282639e10b3cf3cc90c /src/datavisualization/utils/texturehelper_p.h
parent56d9ec81afc59b1cf6aaae7675ff460a6bc664a8 (diff)
Support for dynamic opengl builds.
Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/utils/texturehelper_p.h')
-rw-r--r--src/datavisualization/utils/texturehelper_p.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index 03080b2a..6c0aa3de 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -48,21 +48,17 @@ class TextureHelper : protected QOpenGLFunctions
// Ownership of created texture is transferred to caller
GLuint create2DTexture(const QImage &image, bool useTrilinearFiltering = false,
bool convert = true, bool smoothScale = true, bool clampY = false);
-#if !defined(QT_OPENGL_ES_2)
GLuint create3DTexture(const QVector<uchar> *data, int width, int height, int depth,
QImage::Format dataFormat);
-#endif
GLuint createCubeMapTexture(const QImage &image, bool useTrilinearFiltering = false);
// Returns selection texture and inserts generated framebuffers to framebuffer parameters
GLuint createSelectionTexture(const QSize &size, GLuint &frameBuffer, GLuint &depthBuffer);
GLuint createCursorPositionTexture(const QSize &size, GLuint &frameBuffer);
GLuint createUniformTexture(const QColor &color);
GLuint createGradientTexture(const QLinearGradient &gradient);
-#if !defined(QT_OPENGL_ES_2)
GLuint createDepthTexture(const QSize &size, GLuint textureSize);
// Returns depth texture and inserts generated framebuffer to parameter
GLuint createDepthTextureFrameBuffer(const QSize &size, GLuint &frameBuffer, GLuint textureSize);
-#endif
void deleteTexture(GLuint *texture);
private:
@@ -71,7 +67,7 @@ class TextureHelper : protected QOpenGLFunctions
QRgb qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture_format);
#if !defined(QT_OPENGL_ES_2)
- QOpenGLFunctions_2_1 *m_openGlFunctions_2_1;
+ QOpenGLFunctions_2_1 *m_openGlFunctions_2_1; // Not owned
#endif
friend class Bars3DRenderer;
friend class Surface3DRenderer;