Read pixels directly in RenderedTarget::updateHullPoints()

Author: adazem009

src/renderedtarget.cpp

@@ -397,19 +397,10 @@ void RenderedTarget::updateHullPoints(QOpenGLFramebufferObject *fbo)
     m_hullPoints.clear();
     m_hullPoints.reserve(width * height);
 
-    // Blit multisampled FBO to a custom FBO
-    QOpenGLFramebufferObject customFbo(fbo->size());
-    glBindFramebuffer(GL_READ_FRAMEBUFFER_EXT, fbo->handle());
-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, customFbo.handle());
-    glBlitFramebuffer(0, 0, width, height, 0, 0, width, height, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-    glBindFramebuffer(GL_FRAMEBUFFER_EXT, customFbo.handle());
-
     // Read pixels from framebuffer
     size_t size = width * height * 4;
     GLubyte *pixelData = new GLubyte[size];
     glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixelData);
-    glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
-    fbo->bind();
 
     // Flip vertically
     int rowSize = width * 4;

test/renderedtarget/renderedtarget_test.cpp

@@ -325,19 +325,6 @@ TEST_F(RenderedTargetTest, HullPoints)
     target.updateHullPoints(&fbo);
     ASSERT_EQ(target.hullPoints(), std::vector<QPointF>({ { 1, 1 }, { 2, 1 }, { 3, 1 }, { 1, 2 }, { 3, 2 }, { 1, 3 }, { 2, 3 }, { 3, 3 } }));
 
-    // Begin painting (multisampled)
-    format.setSamples(16);
-    QOpenGLFramebufferObject fboMultiSampled(4, 6, format);
-    fboMultiSampled.bind();
-    painter.beginFrame(fboMultiSampled.width(), fboMultiSampled.height());
-
-    // Paint (multisampled)
-    painter.drawImage(image, 0, 0);
-    painter.endFrame();
-
-    // Test hull points (this is undefined with multisampling, so we just check if there are any hull points)
-    ASSERT_FALSE(target.hullPoints().empty());
-
     // Release
     fbo.release();
     context.doneCurrent();