kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Use paintGL instead of paintEvent

Browse source 
Hopefully making GL code less crashy by using the respective initialization code
This commit is contained in:
Ilya Fedin 2023-03-05 15:23:26 +04:00 • committed by John Preston
parent 03f8127875
commit f3744c4ba3
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ui/gl/gl_surface.cpp
View file

@ -12,7 +12,6 @@
#include <QtGui/QtEvents> #include <QtGui/QtEvents>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <QtGui/QPaintEngine>
#include <QOpenGLWidget> #include <QOpenGLWidget>
namespace Ui::GL { namespace Ui::GL {
@ -31,7 +30,7 @@ public:
private: private:
void initializeGL() override; void initializeGL() override;
void resizeGL(int w, int h) override; void resizeGL(int w, int h) override;
void paintEvent(QPaintEvent *e) override; void paintGL() override;
void callDeInit(); void callDeInit();
const std::unique_ptr<Renderer> _renderer; const std::unique_ptr<Renderer> _renderer;
@ -55,6 +54,7 @@ SurfaceOpenGL::SurfaceOpenGL(
std::unique_ptr<Renderer> renderer) std::unique_ptr<Renderer> renderer)
: RpWidgetBase<QOpenGLWidget, SurfaceTraits>(parent) : RpWidgetBase<QOpenGLWidget, SurfaceTraits>(parent)
, _renderer(std::move(renderer)) { , _renderer(std::move(renderer)) {
setUpdateBehavior(QOpenGLWidget::PartialUpdate);
} }
SurfaceOpenGL::~SurfaceOpenGL() { SurfaceOpenGL::~SurfaceOpenGL() {
@ -79,30 +79,17 @@ void SurfaceOpenGL::resizeGL(int w, int h) {
_renderer->resize(this, *context()->functions(), w, h); _renderer->resize(this, *context()->functions(), w, h);
} }
void SurfaceOpenGL::paintEvent(QPaintEvent *e) { void SurfaceOpenGL::paintGL() {
if (!updatesEnabled() || size().isEmpty() || !isValid()) { if (!updatesEnabled() || size().isEmpty() || !isValid()) {
return; return;
} }
auto redirectOffset = QPoint();
const auto rpd = redirected(&redirectOffset);
const auto device = rpd ? rpd : static_cast<QPaintDevice*>(this);
const auto engine = device->paintEngine();
if (!engine) {
return;
}
engine->begin(device);
if (!isValid()) { // The call above could lose the context.
return;
}
const auto f = context()->functions(); const auto f = context()->functions();
if (const auto bg = _renderer->clearColor()) { if (const auto bg = _renderer->clearColor()) {
f->glClearColor(bg->redF(), bg->greenF(), bg->blueF(), bg->alphaF()); f->glClearColor(bg->redF(), bg->greenF(), bg->blueF(), bg->alphaF());
f->glClear(GL_COLOR_BUFFER_BIT); f->glClear(GL_COLOR_BUFFER_BIT);
} }
f->glDisable(GL_BLEND); f->glDisable(GL_BLEND);
f->glViewport(0, 0, device->width(), device->height());
_renderer->paint(this, *f); _renderer->paint(this, *f);
engine->end();
} }
void SurfaceOpenGL::callDeInit() { void SurfaceOpenGL::callDeInit() {