ElementRenderer改用独立Context

ArchitectureColoredPainting/src/Editor/GraphicElement.cpp

@@ -46,7 +46,7 @@ PixelPath GroupElement::getPaintObject() const
 PixelPath SimpleElement::getPaintObject(std::vector<Renderer::ElementStyleStrokeDemo> styles) const {
 	PixelPath result;
 	Renderer::ElementStyleStrokeDemo demo(2);
-	auto [img, mov] = renderer->drawElement(painterPath, demo, 1.0, false);
+	auto [img, mov] = renderer->drawElement(painterPath, demo, 1.0);
 	//qDebug() << img << " ------";
 	result.addImage(img, mov);
 	//result.addPath(painterPath);

ArchitectureColoredPainting/src/MainWindow.cpp

@@ -2,6 +2,7 @@
 #include "Renderer/RendererGLWidget.h"
 #include "qslider.h"
 #include <QPushButton>
+#include <QScreen>
 #include "NavigationBarWidget.h"
 #include <FramelessHelper/Core/utils.h>
 #include <FramelessHelper/Widgets/standardtitlebar.h>
@@ -50,15 +51,15 @@ MainWindow::MainWindow(QWidget* parent, const Qt::WindowFlags flags)
 	helper->setSystemButton(m_titleBar->maximizeButton(), Global::SystemButtonType::Maximize);
 	helper->setSystemButton(m_titleBar->closeButton(), Global::SystemButtonType::Close);
 
-	/*connect(helper, &FramelessWidgetsHelper::ready, this, [this, helper]() {
+	//connect(helper, &FramelessWidgetsHelper::ready, this, [this, helper]() {
-		helper->moveWindowToDesktopCenter();
+	//	helper->moveWindowToDesktopCenter();
-		});*/
+	//	});
 
 	setWindowIcon(QIcon(":/images/icon.png"));
 	setWindowTitle("ArchitectureColoredPainting");
 
 	resize(m_central_widget->size());
-	//move(QGuiApplication::primaryScreen()->availableGeometry().center() - rect().center());
+	move(QGuiApplication::primaryScreen()->availableGeometry().center() - rect().center());
 
 }
 

ArchitectureColoredPainting/src/Renderer/Preview/ElementRenderer.cpp

@@ -17,17 +17,6 @@ Renderer::ElementRenderer::ElementRenderer(QOpenGLWidget* glWidget)
 {
 }
 
-void Renderer::ElementRenderer::initialize()
-{
-	initializeOpenGLFunctions();
-	shader = std::make_unique<QOpenGLShaderProgram>();
-	if (!shader->addShaderFromSourceFile(QOpenGLShader::Compute, ":/Shaders/element.comp"))
-		qDebug() << "ERROR: " << shader->log();
-	if (!shader->link())
-		qDebug() << "ERROR: " << shader->log();
-
-}
-
 std::vector<glm::vec2> generatePathBuffer(const QPainterPath& path)
 {
 	std::vector<glm::vec2> pathBuffer;
@@ -130,18 +119,44 @@ QRectF calcBoundingRect(const QPainterPath& path, const std::vector<BaseStyle>&
 	return QRectF(QPointF(leftTop.x, leftTop.y), QPointF(rightBottom.x, rightBottom.y));
 }
 
-std::pair<QImage, QPointF> Renderer::ElementRenderer::drawElement(const QPainterPath& path, const ElementStyle& style, float pixelRatio, bool releaseContext)
+void Renderer::ElementRenderer::initialize()
 {
-	auto baseStyles = style.toBaseStyles();
+	auto mainContext = QOpenGLContext::currentContext();
-	QRectF bound = calcBoundingRect(path, baseStyles);
+	auto mainSurface = mainContext->surface();
+	surface.setFormat(mainContext->format());
+	surface.create();
+	mainContext->doneCurrent();
+
+	thread = std::jthread([&] {
+		QOpenGLContext context;
+		context.setFormat(mainContext->format());
+		context.setShareContext(mainContext);
+		context.create();
+		context.makeCurrent(&surface);
+
+		initializeOpenGLFunctions();
+		shader = std::make_unique<QOpenGLShaderProgram>();
+		if (!shader->addShaderFromSourceFile(QOpenGLShader::Compute, ":/Shaders/element.comp"))
+			qDebug() << "ERROR: " << shader->log();
+		if (!shader->link())
+			qDebug() << "ERROR: " << shader->log();
+
+		initialized = true;
+
+		while (true)
+		{
+			std::unique_lock<std::mutex> lock(drawMutex);
+			draw.wait(lock, [&] {return needDraw; });
+			{
+				needDraw = false;
+				auto baseStyles = style->toBaseStyles();
+				QRectF bound = calcBoundingRect(*path, baseStyles);
 				QPointF leftTop = bound.topLeft();
 				QSize size(ceil(bound.width() * pixelRatio), ceil(bound.height() * pixelRatio));
 
-	auto pathBuffer = generatePathBuffer(path);
+				auto pathBuffer = generatePathBuffer(*path);
 				auto styleBuffer = generateStyleBuffer(baseStyles);
 
-	if (releaseContext) glWidget->makeCurrent();
-
 				GLuint ssbo[2];
 				glCreateBuffers(2, ssbo);
 				glNamedBufferData(ssbo[0], pathBuffer.size() * sizeof(glm::vec2), pathBuffer.data(), GL_STATIC_READ);
@@ -166,6 +181,30 @@ std::pair<QImage, QPointF> Renderer::ElementRenderer::drawElement(const QPainter
 
 				auto image = fbo.toImage(false);
 				glDeleteBuffers(2, ssbo);
-	if (releaseContext) glWidget->doneCurrent();
+				result = { image, leftTop };
-	return { image, leftTop };
+				drawFinished = true;
+			}
+			draw.notify_all();
+		}
+	});
+
+	while (!initialized)
+		std::this_thread::yield();
+
+	mainContext->makeCurrent(mainSurface);
+
+}
+
+std::pair<QImage, QPointF> Renderer::ElementRenderer::drawElement(const QPainterPath& path, const ElementStyle& style, float pixelRatio)
+{
+	std::unique_lock<std::mutex> lock(drawMutex);
+	draw.wait(lock, [&] {return drawFinished; });
+	drawFinished = false;
+	this->path = &path;
+	this->style = &style;
+	this->pixelRatio = pixelRatio;
+	needDraw = true;
+	draw.notify_all();
+	draw.wait(lock, [&] {return drawFinished; });
+	return result;
 }

ArchitectureColoredPainting/src/Renderer/Preview/ElementRenderer.h

@@ -3,6 +3,7 @@
 #include <QOpenGLFunctions_4_5_Core>
 #include <QOPenGLShaderProgram>
 #include "../Painting/ElementStyle.h"
+#include <QOffscreenSurface>
 
 namespace Renderer
 {
@@ -21,14 +22,26 @@ namespace Renderer
 		 * @param path 图元几何数据
 		 * @param style 图元样式
 		 * @param pixelRatio path中的单位坐标对应的像素大小
-		 * @param releaseContext 若在initializeGL, resizeGL或paintGL中调用须传入false
 		 * @return QImage 绘制得到的位图
 		 * @return QPointF 位图原点（左上角）在QPainterPath坐标系下的坐标
 		 */
-		std::pair<QImage, QPointF> drawElement(const QPainterPath& path, const ElementStyle& style, float pixelRatio, bool releaseContext = true);
+		std::pair<QImage, QPointF> drawElement(const QPainterPath& path, const ElementStyle& style, float pixelRatio);
 	protected:
 		QOpenGLWidget* glWidget;
 		std::unique_ptr<QOpenGLShaderProgram> shader;
+		std::jthread thread;
+		QOffscreenSurface surface;
+		QOpenGLContext context;
+		std::atomic<bool> initialized = false;
+		bool drawFinished = true;
+		bool needDraw = false;
+		std::condition_variable draw;
+		std::mutex drawMutex;
+
+		const QPainterPath* path;
+		const ElementStyle* style;
+		float pixelRatio;
+		std::pair<QImage, QPointF> result;
 	};
 
 }

ArchitectureColoredPainting/src/main.cpp

@@ -52,7 +52,7 @@ int main(int argc, char* argv[])
 	//FramelessHelper::Core::setApplicationOSThemeAware();
 	FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur);
 	//FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);
-	FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow);
+	//FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow);
 	MainWindow w;
 	w.show();
 	return a.exec();