6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Ensures changes in the framebuffer are passed onward.

Browse Source
This commit is contained in:
Thomas Harte 2020-06-21 17:25:21 -04:00
parent e297d4cced
commit 336dffefe0
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OSBindings/Qt/scantargetwidget.cpp
View File

@ -21,6 +21,14 @@ void ScanTargetWidget::initializeGL() {
void ScanTargetWidget::paintGL() { void ScanTargetWidget::paintGL() {
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
if(isConnected) { if(isConnected) {
// Qt reserves the right to change the framebuffer object due to window resizes or if setParent is called;
// therefore check whether it has changed.
const auto newFramebuffer = defaultFramebufferObject();
if(framebuffer != newFramebuffer) {
framebuffer = newFramebuffer;
scanTarget->set_target_framebuffer(framebuffer);
}
vsyncPredictor.begin_redraw(); vsyncPredictor.begin_redraw();
scanTarget->update(width(), height()); scanTarget->update(width(), height());
scanTarget->draw(width(), height()); scanTarget->draw(width(), height());
@ -41,14 +49,15 @@ void ScanTargetWidget::vsync() {
} }
void ScanTargetWidget::resizeGL(int w, int h) { void ScanTargetWidget::resizeGL(int w, int h) {
glViewport(0,0,w,h); glViewport(0, 0, w, h);
} }
Outputs::Display::OpenGL::ScanTarget *ScanTargetWidget::getScanTarget() { Outputs::Display::OpenGL::ScanTarget *ScanTargetWidget::getScanTarget() {
makeCurrent(); makeCurrent();
if(!scanTarget) { if(!scanTarget) {
isConnected = true; isConnected = true;
scanTarget = std::make_unique<Outputs::Display::OpenGL::ScanTarget>(defaultFramebufferObject()); framebuffer = defaultFramebufferObject();
scanTarget = std::make_unique<Outputs::Display::OpenGL::ScanTarget>(framebuffer);
} }
return scanTarget.get(); return scanTarget.get();
} }

1
OSBindings/Qt/scantargetwidget.h
View File

@ -25,6 +25,7 @@ class ScanTargetWidget : public QOpenGLWidget
std::unique_ptr<Outputs::Display::OpenGL::ScanTarget> scanTarget; std::unique_ptr<Outputs::Display::OpenGL::ScanTarget> scanTarget;
Time::VSyncPredictor vsyncPredictor; Time::VSyncPredictor vsyncPredictor;
bool isConnected = false; bool isConnected = false;
GLuint framebuffer = 0;
private slots: private slots:
void vsync(); void vsync();