Fixed all the vid_api checks in the QT code.
This commit is contained in:
@@ -835,7 +835,7 @@ main(int argc, char *argv[])
|
||||
|
||||
/* Set the PAUSE mode depending on the renderer. */
|
||||
#ifdef USE_VNC
|
||||
if (vid_api == 5)
|
||||
if (vid_api == 3)
|
||||
plat_pause(1);
|
||||
else
|
||||
#endif
|
||||
|
||||
@@ -429,7 +429,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
}
|
||||
|
||||
#ifndef USE_VNC
|
||||
if (vid_api == 5)
|
||||
if (vid_api == 3)
|
||||
vid_api = 0;
|
||||
ui->actionVNC->setVisible(false);
|
||||
#endif
|
||||
@@ -450,7 +450,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
if (!vulkanAvailable)
|
||||
#endif
|
||||
{
|
||||
if (vid_api == 4)
|
||||
if (vid_api == 2)
|
||||
vid_api = 0;
|
||||
ui->actionVulkan->setVisible(false);
|
||||
}
|
||||
@@ -465,7 +465,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
connect(actGroup, &QActionGroup::triggered, [this](QAction *action) {
|
||||
vid_api = action->property("vid_api").toInt();
|
||||
#ifdef USE_VNC
|
||||
if (vnc_enabled && vid_api != 5) {
|
||||
if (vnc_enabled && vid_api != 3) {
|
||||
startblit();
|
||||
vnc_enabled = 0;
|
||||
vnc_close();
|
||||
|
||||
@@ -397,28 +397,6 @@
|
||||
<number>0</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHardware_Renderer_OpenGL">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Qt (&OpenGL)</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>1</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHardware_Renderer_OpenGL_ES">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Qt (OpenGL &ES)</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>2</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHide_status_bar">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
@@ -749,7 +727,7 @@
|
||||
<string>Open&GL (3.0 Core)</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>3</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionPreferences">
|
||||
@@ -841,7 +819,7 @@
|
||||
<string>&Vulkan</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>4</number>
|
||||
<number>2</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionMCA_devices">
|
||||
@@ -865,7 +843,7 @@
|
||||
<string>VNC</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>5</number>
|
||||
<number>3</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionOpen_screenshots_folder">
|
||||
|
||||
Reference in New Issue
Block a user