From 9644652e37d13430e318332652288b05866a432f Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Fri, 21 Nov 2014 15:27:51 +0200 Subject: Once more crash fix on texture adding. B2Qt device called uvs creation before array creation. Change-Id: Ia0cac175a3e0769f2571a0eadc7c764ae4092cc2 Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/surfaceobject.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/datavisualization/utils/surfaceobject.cpp') diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index b3aa7126..c3c4c161 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -299,6 +299,9 @@ QVector3D SurfaceObject::createSmoothNormalUpperLineItem(int x, int y) void SurfaceObject::smoothUVs(const QSurfaceDataArray &dataArray, const QSurfaceDataArray &modelArray) { + if (dataArray.size() == 0 || modelArray.size() == 0) + return; + int columns = dataArray.at(0)->size(); int rows = dataArray.size(); float xRangeNormalizer = dataArray.at(0)->at(columns - 1).x() - dataArray.at(0)->at(0).x(); @@ -601,6 +604,9 @@ void SurfaceObject::setUpData(const QSurfaceDataArray &dataArray, const QRect &s void SurfaceObject::coarseUVs(const QSurfaceDataArray &dataArray, const QSurfaceDataArray &modelArray) { + if (dataArray.size() == 0 || modelArray.size() == 0) + return; + int columns = dataArray.at(0)->size(); int rows = dataArray.size(); float xRangeNormalizer = dataArray.at(0)->at(columns - 1).x() - dataArray.at(0)->at(0).x(); @@ -632,12 +638,14 @@ void SurfaceObject::coarseUVs(const QSurfaceDataArray &dataArray, } } - glBindBuffer(GL_ARRAY_BUFFER, m_uvTextureBuffer); - glBufferData(GL_ARRAY_BUFFER, uvs.size() * sizeof(QVector2D), - &uvs.at(0), GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); + if (uvs.size() > 0) { + glBindBuffer(GL_ARRAY_BUFFER, m_uvTextureBuffer); + glBufferData(GL_ARRAY_BUFFER, uvs.size() * sizeof(QVector2D), + &uvs.at(0), GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); - m_returnTextureBuffer = true; + m_returnTextureBuffer = true; + } } void SurfaceObject::updateCoarseRow(const QSurfaceDataArray &dataArray, int rowIndex, bool polar) -- cgit v1.2.3