Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Buildfix

Browse source
This commit is contained in:
twinaphex 2021-03-24 02:39:57 +01:00
parent d9fa5585a0
commit ed0c9ef1dc
3 changed files with 10 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ui/drivers/qt/shaderparamsdialog.h
View file

@ -4,14 +4,12 @@
#include <QDialog>
#include <QPointer>
#include <retro_common_api.h>
#ifndef CXX_BUILD
extern "C" {
#endif
#ifdef HAVE_CONFIG_H
#include "../../../config.def.h"
#endif
#include "../../../gfx/video_shader_parse.h"
#ifndef CXX_BUILD
@ -34,8 +32,6 @@ public:
struct video_shader_pass *pass;
};
#ifdef HAVE_MENU
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
class ShaderParamsDialog : public QDialog
{
Q_OBJECT
@ -96,7 +92,5 @@ protected:
void resizeEvent(QResizeEvent *event);
void paintEvent(QPaintEvent *event);
};
#endif
#endif
#endif

10
ui/drivers/ui_qt.cpp
View file

@ -2019,16 +2019,18 @@ void MainWindow::onGotStatusMessage(
}
}
#if defined(HAVE_MENU)
void MainWindow::deferReloadShaderParams()
{
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
emit gotReloadShaderParams();
#endif
#endif
}
void MainWindow::onShaderParamsClicked()
{
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
if (!m_shaderParamsDialog)
return;
@ -2037,16 +2039,18 @@ void MainWindow::onShaderParamsClicked()
onGotReloadShaderParams();
#endif
#endif
}
void MainWindow::onGotReloadShaderParams()
{
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
if (m_shaderParamsDialog && m_shaderParamsDialog->isVisible())
m_shaderParamsDialog->reload();
#endif
}
#endif
}
void MainWindow::onCoreOptionsClicked()
{
@ -4641,8 +4645,10 @@ static void* ui_companion_qt_init(void)
QObject::connect(viewClosedDocksMenu, SIGNAL(aboutToShow()), mainwindow, SLOT(onViewClosedDocksAboutToShow()));
viewMenu->addAction(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_CORE_OPTIONS), mainwindow, SLOT(onCoreOptionsClicked()));
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
viewMenu->addAction(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS), mainwindow, SLOT(onShaderParamsClicked()));
#endif
#endif
viewMenu->addSeparator();

24
ui/drivers/ui_qt.h
View file

@ -102,11 +102,7 @@ class MainWindow;
class ThumbnailWidget;
class ThumbnailLabel;
class GridView;
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
class ShaderParamsDialog;
#endif
#endif
class CoreOptionsDialog;
class CoreInfoDialog;
class PlaylistEntryDialog;
@ -416,11 +412,7 @@ signals:
void gotLogMessage(const QString &msg);
void gotStatusMessage(QString msg, unsigned priority, unsigned duration, bool flush);
void gotReloadPlaylists();
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
void gotReloadShaderParams();
#endif
#endif
void gotReloadCoreOptions();
void showErrorMessageDeferred(QString msg);
void showInfoMessageDeferred(QString msg);
@ -455,11 +447,7 @@ public slots:
void reloadPlaylists();
void deferReloadPlaylists();
void onGotReloadPlaylists();
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
void onGotReloadShaderParams();
#endif
#endif
void onGotReloadCoreOptions();
void showWelcomeScreen();
void onIconViewClicked();
@ -473,11 +461,7 @@ public slots:
void showAbout();
void showDocs();
void onThumbnailPackExtractFinished(bool success);
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
void deferReloadShaderParams();
#endif
#endif
void downloadThumbnail(QString system, QString title, QUrl url = QUrl());
void downloadAllThumbnails(QString system, QUrl url = QUrl());
void downloadPlaylistThumbnails(QString playlistPath);
@ -509,11 +493,7 @@ private slots:
void onStopClicked();
void onZoomValueChanged(int value);
void onPlaylistFilesDropped(QStringList files);
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
void onShaderParamsClicked();
#endif
#endif
void onCoreOptionsClicked();
void onShowErrorMessage(QString msg);
void onShowInfoMessage(QString msg);
@ -626,11 +606,7 @@ private:
int m_allPlaylistsGridMaxCount;
PlaylistEntryDialog *m_playlistEntryDialog;
QElapsedTimer m_statusMessageElapsedTimer;
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
QPointer<ShaderParamsDialog> m_shaderParamsDialog;
#endif
#endif
QPointer<CoreOptionsDialog> m_coreOptionsDialog;
QNetworkAccessManager *m_networkManager;