Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix directx compile, disable loading screen for directx

This commit is contained in:
MysterD 2023-11-25 14:41:49 -08:00
parent 78df9826dc
commit 70c5e3e530
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pc/gfx/gfx_dxgi.cpp
View File

@ -20,6 +20,9 @@
#endif #endif
#include <PR/gbi.h> #include <PR/gbi.h>
#define DECLARE_GFX_DXGI_FUNCTIONS
#include "gfx_dxgi.h"
#include "../configfile.h" #include "../configfile.h"
#include "../pc_main.h" #include "../pc_main.h"
@ -38,9 +41,6 @@ extern "C" {
#define WINCLASS_NAME L"N64GAME" #define WINCLASS_NAME L"N64GAME"
#define DECLARE_GFX_DXGI_FUNCTIONS
#include "gfx_dxgi.h"
#ifdef VERSION_EU #ifdef VERSION_EU
#define FRAME_INTERVAL_US_NUMERATOR 40000 #define FRAME_INTERVAL_US_NUMERATOR 40000
#define FRAME_INTERVAL_US_DENOMINATOR 2 #define FRAME_INTERVAL_US_DENOMINATOR 2

4
src/pc/pc_main.c
View File

@ -343,11 +343,15 @@ int main(int argc, char *argv[]) {
} }
// Start the thread for setting up the game // Start the thread for setting up the game
#ifndef WAPI_DXGI
if (pthread_mutex_init(&gLoadingThreadMutex, NULL) == 0 && pthread_create(&gLoadingThreadId, NULL, main_game_init, (void*) 1) == 0) { if (pthread_mutex_init(&gLoadingThreadMutex, NULL) == 0 && pthread_create(&gLoadingThreadId, NULL, main_game_init, (void*) 1) == 0) {
gIsThreaded = true; gIsThreaded = true;
render_loading_screen(); // Render the loading screen while the game is setup render_loading_screen(); // Render the loading screen while the game is setup
gIsThreaded = false; gIsThreaded = false;
} else { } else {
#else
{
#endif
main_game_init(NULL); // Failsafe incase threading doesn't work main_game_init(NULL); // Failsafe incase threading doesn't work
} }
pthread_mutex_destroy(&gLoadingThreadMutex); pthread_mutex_destroy(&gLoadingThreadMutex);