Fix for buffer crash.

Andrzej Kapolka committed 11 years ago

Commit 52641bd1 parent 27255fb2 files · +73 −69Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 2 files). Show all

Unified · Split

             glRotatef(glm::degrees(glm::angle(batch.rotation)), axis.x, axis.y, axis.z);
             glScalef(batch.scale.x, batch.scale.y, batch.scale.z);
-            batch.vertexBuffer->bind();
+            glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBufferID);
-            batch.indexBuffer->bind();
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, batch.indexBufferID);
             HeightfieldPoint* point = 0;
             glVertexPointer(3, GL_FLOAT, sizeof(HeightfieldPoint), &point->vertex);
             glActiveTexture(GL_TEXTURE0);
             glBindTexture(GL_TEXTURE_2D, 0);
-            batch.vertexBuffer->release();
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
-            batch.indexBuffer->release();
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
             glPopMatrix();
         }
                 glRotatef(glm::degrees(glm::angle(batch.rotation)), axis.x, axis.y, axis.z);
                 glScalef(batch.scale.x, batch.scale.y, batch.scale.z);
-                batch.vertexBuffer->bind();
+                glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBufferID);
-                batch.indexBuffer->bind();
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, batch.indexBufferID);
                 HeightfieldPoint* point = 0;
                 glVertexPointer(3, GL_FLOAT, sizeof(HeightfieldPoint), &point->vertex);
                 glActiveTexture(GL_TEXTURE0);
                 glBindTexture(GL_TEXTURE_2D, 0);
-                batch.vertexBuffer->release();
+                glBindBuffer(GL_ARRAY_BUFFER, 0);
-                batch.indexBuffer->release();
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
                 glPopMatrix();
             }
             glRotatef(glm::degrees(glm::angle(batch.rotation)), axis.x, axis.y, axis.z);
             glScalef(batch.scale.x, batch.scale.y, batch.scale.z);
-            batch.vertexBuffer->bind();
+            glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBufferID);
-            batch.indexBuffer->bind();
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, batch.indexBufferID);
             VoxelPoint* point = 0;
             glVertexPointer(3, GL_FLOAT, sizeof(VoxelPoint), &point->vertex);
             glDrawRangeElements(GL_QUADS, 0, batch.vertexCount - 1, batch.indexCount, GL_UNSIGNED_INT, 0);
-            batch.vertexBuffer->release();
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
-            batch.indexBuffer->release();
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
             glPopMatrix();
         }
                 glRotatef(glm::degrees(glm::angle(batch.rotation)), axis.x, axis.y, axis.z);
                 glScalef(batch.scale.x, batch.scale.y, batch.scale.z);
-                batch.vertexBuffer->bind();
+                glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBufferID);
-                batch.indexBuffer->bind();
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, batch.indexBufferID);
                 VoxelPoint* point = 0;
                 glVertexPointer(3, GL_FLOAT, sizeof(VoxelPoint), &point->vertex);
                 glActiveTexture(GL_TEXTURE0);
-                batch.vertexBuffer->release();
+                glBindBuffer(GL_ARRAY_BUFFER, 0);
-                batch.indexBuffer->release();
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
                 glPopMatrix();
             }
             glRotatef(glm::degrees(glm::angle(batch.rotation)), axis.x, axis.y, axis.z);
             glScalef(batch.scale.x, batch.scale.y, batch.scale.z);
-            batch.vertexBuffer->bind();
+            glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBufferID);
             glVertexPointer(3, GL_FLOAT, 0, 0);
             glDrawArrays(GL_LINES, 0, batch.vertexCount);
-            batch.vertexBuffer->release();
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
             glPopMatrix();
         }
     glDeleteTextures(1, (const GLuint*)&materialTextureID);
 }
+void MetavoxelSystem::deleteBuffers(int vertexBufferID, int indexBufferID, int hermiteBufferID) const {
+    glDeleteBuffers(1, (const GLuint*)&vertexBufferID);
+    glDeleteBuffers(1, (const GLuint*)&indexBufferID);
+    glDeleteBuffers(1, (const GLuint*)&hermiteBufferID);
+}
 class SpannerRenderVisitor : public SpannerVisitor {
 public:
             glRotatef(glm::degrees(glm::angle(batch.rotation)), axis.x, axis.y, axis.z);
             glScalef(batch.scale.x, batch.scale.y, batch.scale.z);
-            batch.vertexBuffer->bind();
+            glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBufferID);
-            batch.indexBuffer->bind();
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, batch.indexBufferID);
             HeightfieldPoint* point = 0;
             glVertexPointer(3, GL_FLOAT, sizeof(HeightfieldPoint), &point->vertex);
             glBindTexture(GL_TEXTURE_2D, 0);
-            batch.vertexBuffer->release();
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
-            batch.indexBuffer->release();
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
             glPopMatrix();
         }
             glRotatef(glm::degrees(glm::angle(batch.rotation)), axis.x, axis.y, axis.z);
             glScalef(batch.scale.x, batch.scale.y, batch.scale.z);
-            batch.vertexBuffer->bind();
+            glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBufferID);
-            batch.indexBuffer->bind();
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, batch.indexBufferID);
             VoxelPoint* point = 0;
             glVertexPointer(3, GL_FLOAT, sizeof(VoxelPoint), &point->vertex);
             glDrawRangeElements(GL_QUADS, 0, batch.vertexCount - 1, batch.indexCount, GL_UNSIGNED_INT, 0);
-            batch.vertexBuffer->release();
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
-            batch.indexBuffer->release();
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
             glPopMatrix();
         }
     _vertexCount(vertices.size()),
     _indexCount(indices.size()),
     _hermiteCount(hermite.size()),
-    _indexBuffer(QOpenGLBuffer::IndexBuffer),
+    _vertexBufferID(0),
+    _indexBufferID(0),
+    _hermiteBufferID(0),
     _materials(materials) {
 }
+VoxelBuffer::~VoxelBuffer() {
+    QMetaObject::invokeMethod(Application::getInstance()->getMetavoxels(), "deleteBuffers", Q_ARG(int, _vertexBufferID),
+        Q_ARG(int, _indexBufferID), Q_ARG(int, _hermiteBufferID));
+}
 bool VoxelBuffer::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
         float boundsDistance, float& distance) const {
     float highest = _size - 1.0f;
 }
 void VoxelBuffer::render(const glm::vec3& translation, const glm::quat& rotation, const glm::vec3& scale, bool cursor) {
-    if (!_vertexBuffer.isCreated()) {
+    if (_vertexBufferID == 0) {
-        _vertexBuffer.create();
+        glGenBuffers(1, &_vertexBufferID);
-        _vertexBuffer.bind();
+        glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID);
-        _vertexBuffer.allocate(_vertices.constData(), _vertices.size() * sizeof(VoxelPoint));
+        glBufferData(GL_ARRAY_BUFFER, _vertices.size() * sizeof(VoxelPoint), _vertices.constData(), GL_STATIC_DRAW);
-        _vertexBuffer.release();
+        glBindBuffer(GL_ARRAY_BUFFER, 0);
-        _indexBuffer.create();
+        glGenBuffers(1, &_indexBufferID);
-        _indexBuffer.bind();
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBufferID);
-        _indexBuffer.allocate(_indices.constData(), _indices.size() * sizeof(int));
+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, _indices.size() * sizeof(int), _indices.constData(), GL_STATIC_DRAW);
-        _indexBuffer.release();
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
         if (!_materials.isEmpty()) {
             _networkTextures.resize(_materials.size());
     baseBatch.translation = translation;
     baseBatch.rotation = rotation;
     baseBatch.scale = scale;
-    baseBatch.vertexBuffer = &_vertexBuffer;
+    baseBatch.vertexBufferID = _vertexBufferID;
-    baseBatch.indexBuffer = &_indexBuffer;
+    baseBatch.indexBufferID = _indexBufferID;
     baseBatch.vertexCount = _vertexCount;
     baseBatch.indexCount = _indexCount;
     Application::getInstance()->getMetavoxels()->addVoxelBaseBatch(baseBatch);
         splatBatch.translation = translation;
         splatBatch.rotation = rotation;
         splatBatch.scale = scale;
-        splatBatch.vertexBuffer = &_vertexBuffer;
+        splatBatch.vertexBufferID = _vertexBufferID;
-        splatBatch.indexBuffer = &_indexBuffer;
+        splatBatch.indexBufferID = _indexBufferID;
         splatBatch.vertexCount = _vertexCount;
         splatBatch.indexCount = _indexCount;
         splatBatch.splatTextureOffset = glm::vec3(
     }
     if (_hermiteCount > 0) {
-        if (!_hermiteBuffer.isCreated()) {
+        if (_hermiteBufferID == 0) {
-            _hermiteBuffer.create();
+            glGenBuffers(1, &_hermiteBufferID);
-            _hermiteBuffer.bind();
+            glBindBuffer(GL_ARRAY_BUFFER, _hermiteBufferID);
-            _hermiteBuffer.allocate(_hermite.constData(), _hermite.size() * sizeof(glm::vec3));
+            glBufferData(GL_ARRAY_BUFFER, _hermite.size() * sizeof(glm::vec3), _hermite.constData(), GL_STATIC_DRAW);
-            _hermiteBuffer.release();
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
             _hermite.clear();
         }
         HermiteBatch hermiteBatch;
         hermiteBatch.translation = translation;
         hermiteBatch.rotation = rotation;
         hermiteBatch.scale = scale;
-        hermiteBatch.vertexBuffer = &_hermiteBuffer;
+        hermiteBatch.vertexBufferID = _hermiteBufferID;
         hermiteBatch.vertexCount = _hermiteCount;
         Application::getInstance()->getMetavoxels()->addHermiteBatch(hermiteBatch);
     }
                     const int NO_CORNERS = 0;
                     const int ALL_CORNERS = UPPER_LEFT_CORNER | UPPER_RIGHT_CORNER | LOWER_LEFT_CORNER | LOWER_RIGHT_CORNER;
                     int corners = NO_CORNERS;
-                    int stitchMinimumY = INT_MAX, stitchMaximumY = -1;
                     if (heightfieldHeight != 0.0f) {
                         corners |= UPPER_LEFT_CORNER;
-                        stitchMinimumY = qMin(stitchMinimumY, (int)heightfieldHeight);
-                        stitchMaximumY = qMax(stitchMaximumY, (int)heightfieldHeight);
                     }
                     if (nextHeightfieldHeightX != 0.0f && x != stackWidth) {
                         corners |= UPPER_RIGHT_CORNER;
-                        stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightX);
-                        stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightX);
                     }
                     if (nextHeightfieldHeightZ != 0.0f && z != stackHeight) {
                         corners |= LOWER_LEFT_CORNER;
-                        stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightZ);
-                        stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightZ);
                     }
                     if (nextHeightfieldHeightXZ != 0.0f && x != stackWidth && z != stackHeight) {
                         corners |= LOWER_RIGHT_CORNER;
-                        stitchMinimumY = qMin(stitchMinimumY, (int)nextHeightfieldHeightXZ);
-                        stitchMaximumY = qMax(stitchMaximumY, (int)nextHeightfieldHeightXZ);
                     }
                     bool stitchable = x != 0 && z != 0 && !(corners == NO_CORNERS || corners == ALL_CORNERS);
-                    bool stitched = false;
                     VoxelPoint cornerPoints[4];
                     int clampedX = qMax(x - 1, 0), clampedZ = qMax(z - 1, 0);
                     if (stitchable) {
                                 vertices.append(point);
                             }
-                            if (stitchable && !stitched && y >= stitchMinimumY && y <= stitchMaximumY) {
+                            if (stitchable) {
                                 int nextIndex = vertices.size();
                                 const NormalIndex& previousIndexX = lastIndicesX.getClosest(y);
                                 const NormalIndex& previousIndexZ = lastIndicesZ[x].getClosest(y);
                                         break;
                                     }
                                 }
-                                stitched = true;
                             }
                         }
     }
     HeightfieldBaseLayerBatch baseBatch;
-    baseBatch.vertexBuffer = &bufferPair.first;
+    baseBatch.vertexBufferID = bufferPair.first.bufferId();
-    baseBatch.indexBuffer = &bufferPair.second;
+    baseBatch.indexBufferID = bufferPair.second.bufferId();
     baseBatch.translation = translation;
     baseBatch.rotation = rotation;
     baseBatch.scale = scale;
     if (!(cursor || _networkTextures.isEmpty())) {
         HeightfieldSplatBatch splatBatch;
-        splatBatch.vertexBuffer = &bufferPair.first;
+        splatBatch.vertexBufferID = bufferPair.first.bufferId();
-        splatBatch.indexBuffer = &bufferPair.second;
+        splatBatch.indexBufferID = bufferPair.second.bufferId();
         splatBatch.translation = translation;
         splatBatch.rotation = rotation;
         splatBatch.scale = scale;

Fix for buffer crash.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code