ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix display-related Qt6 build errors

This commit is contained in:
Vicki Pfau 2023-08-18 20:12:18 -07:00
parent f637b5b1e8
commit f5a6906ef8
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform/qt/Display.cpp
View File

@ -18,9 +18,9 @@
using namespace QGBA; using namespace QGBA;
#if defined(BUILD_GL) || defined(BUILD_GLES2) || defined(BUILD_GLES3) || defined(USE_EPOXY) #if defined(BUILD_GL) || defined(BUILD_GLES2) || defined(BUILD_GLES3) || defined(USE_EPOXY)
QGBA::Display::Driver Display::s_driver = QGBA::Display::Driver::OPENGL; QGBA::Display::Driver QGBA::Display::s_driver = QGBA::Display::Driver::OPENGL;
#else #else
QGBA::Display::Driver Display::s_driver = QGBA::Display::Driver::QT; QGBA::Display::Driver QGBA::Display::s_driver = QGBA::Display::Driver::QT;
#endif #endif
QGBA::Display* QGBA::Display::create(QWidget* parent) { QGBA::Display* QGBA::Display::create(QWidget* parent) {

12
src/platform/qt/DisplayGL.cpp
View File

@ -9,14 +9,8 @@
#include <QApplication> #include <QApplication>
#include <QMutexLocker> #include <QMutexLocker>
#include <QOpenGLExtraFunctions>
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
#ifdef QT_OPENGL_ES_2
#include <QOpenGLFunctions_ES2>
using QOpenGLFunctions_Baseline = QOpenGLFunctions_ES2;
#else
#include <QOpenGLFunctions_3_2_Core>
using QOpenGLFunctions_Baseline = QOpenGLFunctions_3_2_Core;
#endif
#include <QOpenGLPaintDevice> #include <QOpenGLPaintDevice>
#include <QResizeEvent> #include <QResizeEvent>
#include <QScreen> #include <QScreen>
@ -122,7 +116,7 @@ bool mGLWidget::finalizeVAO() {
if (!context() || !m_vao) { if (!context() || !m_vao) {
return false; return false;
} }
QOpenGLFunctions_Baseline* fn = context()->versionFunctions<QOpenGLFunctions_Baseline>(); QOpenGLExtraFunctions* fn = context()->extraFunctions();
if (!fn) { if (!fn) {
return false; return false;
} }
@ -150,7 +144,7 @@ void mGLWidget::paintGL() {
m_refresh.start(10); m_refresh.start(10);
return; return;
} }
QOpenGLFunctions_Baseline* fn = context()->versionFunctions<QOpenGLFunctions_Baseline>(); QOpenGLExtraFunctions* fn = context()->extraFunctions();
m_program->bind(); m_program->bind();
m_vao->bind(); m_vao->bind();
fn->glBindTexture(GL_TEXTURE_2D, m_tex); fn->glBindTexture(GL_TEXTURE_2D, m_tex);