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

fix things

This commit is contained in:
Arisotura 2020-05-28 22:37:37 +02:00
parent b7946c1384
commit 590ab2ac2b
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/qt_sdl/CMakeLists.txt
View File

@ -7,7 +7,10 @@ SET(SOURCES_QT_SDL
InputConfigDialog.cpp InputConfigDialog.cpp
VideoSettingsDialog.cpp VideoSettingsDialog.cpp
AudioSettingsDialog.cpp AudioSettingsDialog.cpp
WifiSettingsDialog.cpp
Input.cpp Input.cpp
LAN_PCap.cpp
LAN_Socket.cpp
OSD.cpp OSD.cpp
OSD_shaders.h OSD_shaders.h
font.h font.h
@ -40,6 +43,7 @@ pkg_check_modules(SDL2 REQUIRED sdl2)
add_executable(melonDS ${SOURCES_QT_SDL}) add_executable(melonDS ${SOURCES_QT_SDL})
target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS}) target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS})
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..") target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..")
target_link_libraries(melonDS core ${SDL2_LIBRARIES}) target_link_libraries(melonDS core ${SDL2_LIBRARIES})

21
src/frontend/qt_sdl/main.cpp
View File

@ -38,6 +38,7 @@
#include "InputConfigDialog.h" #include "InputConfigDialog.h"
#include "VideoSettingsDialog.h" #include "VideoSettingsDialog.h"
#include "AudioSettingsDialog.h" #include "AudioSettingsDialog.h"
#include "WifiSettingsDialog.h"
#include "types.h" #include "types.h"
#include "version.h" #include "version.h"
@ -298,9 +299,10 @@ void EmuThread::initOpenGL()
oglContext->moveToThread(this); oglContext->moveToThread(this);
} }
void deinitOpenGL() void EmuThread::deinitOpenGL()
{ {
// TODO!! delete oglContext;
delete oglSurface;
} }
void* oglGetProcAddress(const char* proc) void* oglGetProcAddress(const char* proc)
@ -545,16 +547,11 @@ void EmuThread::run()
NDS::DeInit(); NDS::DeInit();
//Platform::LAN_DeInit(); //Platform::LAN_DeInit();
/*if (Screen_UseGL)
{
OSD::DeInit(true);
GLScreen_DeInit();
}
else
OSD::DeInit(false);*/
if (hasOGL) if (hasOGL)
{
oglContext->doneCurrent(); oglContext->doneCurrent();
deinitOpenGL();
}
} }
void EmuThread::changeWindowTitle(char* title) void EmuThread::changeWindowTitle(char* title)
@ -844,7 +841,6 @@ void ScreenPanelGL::initializeGL()
screenShader->addShaderFromSourceCode(QOpenGLShader::Fragment, kScreenFS); screenShader->addShaderFromSourceCode(QOpenGLShader::Fragment, kScreenFS);
GLuint pid = screenShader->programId(); GLuint pid = screenShader->programId();
printf("program: %d\n", pid);
glBindAttribLocation(pid, 0, "vPosition"); glBindAttribLocation(pid, 0, "vPosition");
glBindAttribLocation(pid, 1, "vTexcoord"); glBindAttribLocation(pid, 1, "vTexcoord");
glBindFragDataLocation(pid, 0, "oColor"); glBindFragDataLocation(pid, 0, "oColor");
@ -1675,7 +1671,7 @@ void MainWindow::onAudioSettingsFinished(int res)
void MainWindow::onOpenWifiSettings() void MainWindow::onOpenWifiSettings()
{ {
// WifiSettingsDialog::openDlg(this);
} }
void MainWindow::onChangeSavestateSRAMReloc(bool checked) void MainWindow::onChangeSavestateSRAMReloc(bool checked)
@ -1822,6 +1818,7 @@ void MainWindow::onUpdateVideoSettings(bool glchange)
{ {
emuThread->emuPause(); emuThread->emuPause();
if (hasOGL) emuThread->deinitOpenGL();
delete panel; delete panel;
createScreenPanel(); createScreenPanel();
connect(emuThread, SIGNAL(windowUpdate()), panel, SLOT(update())); connect(emuThread, SIGNAL(windowUpdate()), panel, SLOT(update()));