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

Qt: Attempt to fix build on OpenGL ES platforms

This commit is contained in:
Vicki Pfau 2022-02-28 22:59:47 -08:00
parent 467c620abc
commit db9d0434e7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,13 @@
#include <QApplication> #include <QApplication>
#include <QMutexLocker> #include <QMutexLocker>
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
#ifdef QT_OPENGL_ES_2
#include <QOpenGLFunctions_ES2>
using QOpenGLFunctions_Baseline = QOpenGLFunctions_ES2;
#else
#include <QOpenGLFunctions_3_2_Core> #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>
@ -77,7 +83,7 @@ void mGLWidget::initializeGL() {
} }
void mGLWidget::finalizeVAO() { void mGLWidget::finalizeVAO() {
QOpenGLFunctions_3_2_Core* fn = context()->versionFunctions<QOpenGLFunctions_3_2_Core>(); QOpenGLFunctions_Baseline* fn = context()->versionFunctions<QOpenGLFunctions_Baseline>();
fn->glGetError(); // Clear the error fn->glGetError(); // Clear the error
m_vao.bind(); m_vao.bind();
fn->glBindBuffer(GL_ARRAY_BUFFER, m_vbo); fn->glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
@ -93,7 +99,7 @@ void mGLWidget::paintGL() {
if (!m_vaoDone) { if (!m_vaoDone) {
finalizeVAO(); finalizeVAO();
} }
QOpenGLFunctions_3_2_Core* fn = context()->versionFunctions<QOpenGLFunctions_3_2_Core>(); QOpenGLFunctions_Baseline* fn = context()->versionFunctions<QOpenGLFunctions_Baseline>();
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);
@ -455,7 +461,7 @@ void PainterGL::create() {
painter->makeCurrent(); painter->makeCurrent();
if (painter->m_widget && painter->supportsShaders()) { if (painter->m_widget && painter->supportsShaders()) {
QOpenGLFunctions_3_2_Core* fn = painter->m_gl->versionFunctions<QOpenGLFunctions_3_2_Core>(); QOpenGLFunctions_Baseline* fn = painter->m_gl->versionFunctions<QOpenGLFunctions_Baseline>();
fn->glFinish(); fn->glFinish();
mGLES2Context* gl2Backend = reinterpret_cast<mGLES2Context*>(painter->m_backend); mGLES2Context* gl2Backend = reinterpret_cast<mGLES2Context*>(painter->m_backend);
painter->m_widget->setTex(painter->m_finalTex[painter->m_finalTexIdx]); painter->m_widget->setTex(painter->m_finalTex[painter->m_finalTexIdx]);