HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2874:b2259e94e953

Merge remote-tracking branch 'origin/5.6.0' into 5.6...

Frederik Gladhorn -

r2874:b2259e94e953

parent child

Context file:

r2874:b2259e94e953

Collapse all files

src/chartsqml2/declarativechart.cpp +3 -1

                 if (!node) {
                     node =  new DeclarativeChartNode(window());
+                    if (node->glRenderNode()) {
                         connect(window(), &QQuickWindow::beforeRendering,
                                 node->glRenderNode(), &DeclarativeRenderNode::render);
                     }
+                }
                 const QRectF &bRect = boundingRect();
                 // Update GL data
-                if (m_glXYDataManager->dataMap().size() || m_glXYDataManager->mapDirty()) {
+                if (node->glRenderNode() && (m_glXYDataManager->dataMap().size() || m_glXYDataManager->mapDirty())) {
                     const QRectF &plotArea = m_chart->plotArea();
                     const QSizeF &chartAreaSize = m_chart->size();

src/chartsqml2/declarativechartnode.cpp +9 -9

                 m_textureSize(1, 1),
                 m_glRenderNode(0)
             {
-                initializeOpenGLFunctions();
                 // Our texture node must have a texture, so use a default one pixel texture
-                GLuint defaultTexture = 0;
+                QImage dummyImage(QSize(1, 1), QImage::Format_ARGB32);
-                glGenTextures(1, &defaultTexture);
+                uchar *imageData = dummyImage.bits();
-                glBindTexture(GL_TEXTURE_2D, defaultTexture);
+                imageData[0] = 0;
-                uchar buf[4] = { 0, 0, 0, 0 };
+                imageData[1] = 0;
-                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &buf);
+                imageData[2] = 0;
+                imageData[3] = 0;
                 QQuickWindow::CreateTextureOptions defaultTextureOptions = QQuickWindow::CreateTextureOptions(
                         QQuickWindow::TextureHasAlphaChannel | QQuickWindow::TextureOwnsGLTexture);
-                m_texture = m_window->createTextureFromId(defaultTexture, QSize(1, 1), defaultTextureOptions);
+                m_texture = m_window->createTextureFromImage(dummyImage, defaultTextureOptions);
                 setTexture(m_texture);
                 setFiltering(QSGTexture::Linear);
+                if (QOpenGLContext::currentContext()) {
                     // Create child node for rendering GL graphics
                     m_glRenderNode = new DeclarativeRenderNode(m_window);
                     m_glRenderNode->setFlag(OwnedByParent);
                     appendChildNode(m_glRenderNode);
                     m_glRenderNode->setRect(0, 0, 0, 0); // Hide child node by default
                 }
+            }
             DeclarativeChartNode::~DeclarativeChartNode()
             {

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages