reimplemented tsa for threaded gl

This commit is contained in:
itsmattkc
2019-01-15 22:50:47 +11:00
parent 08968706b0
commit 3e2cf73f6e
+18 -3
View File
@@ -179,6 +179,7 @@ void ViewerWidget::fullscreen_menu_action(QAction *action) {
QScreen* selected_screen = QGuiApplication::screens().at(action->data().toInt()); QScreen* selected_screen = QGuiApplication::screens().at(action->data().toInt());
window->showFullScreen(); window->showFullScreen();
window->setGeometry(selected_screen->geometry()); window->setGeometry(selected_screen->geometry());
window->update();
// window->show(); // window->show();
} }
} }
@@ -438,19 +439,27 @@ void ViewerWidget::drawTitleSafeArea() {
} }
void ViewerWidget::paintGL() { void ViewerWidget::paintGL() {
if (renderer->mutex.tryLock(10)) { // if (renderer->mutex.tryLock(10)) {
renderer->mutex.lock();
makeCurrent(); makeCurrent();
// clear to solid black
glClearColor(0.0, 0.0, 0.0, 1.0); glClearColor(0.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, renderer->texColorBuffer); // set screen coords to widget size
glLoadIdentity(); glLoadIdentity();
glOrtho(0, 1, 1, 0, -1, 1); glOrtho(0, 1, 1, 0, -1, 1);
// draw texture from render thread
glBindTexture(GL_TEXTURE_2D, renderer->texColorBuffer);
glBegin(GL_QUADS); glBegin(GL_QUADS);
glVertex2f(0, 0); glVertex2f(0, 0);
@@ -466,6 +475,12 @@ void ViewerWidget::paintGL() {
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
// draw title/action safe area
if (config.show_title_safe_area && !rendering) {
drawTitleSafeArea();
}
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
if (window != nullptr && window->isVisible()) { if (window != nullptr && window->isVisible()) {
@@ -478,7 +493,7 @@ void ViewerWidget::paintGL() {
doneCurrent(); doneCurrent();
renderer->start_render(context(), viewer->seq); renderer->start_render(context(), viewer->seq);
} }
} // }
// retry_timer.stop(); // retry_timer.stop();