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

Add more ifdefs covering HAVE_THREADS and HAVE_AUDIOMIXER

This commit is contained in:
twinaphex 2019-07-20 16:09:39 +02:00
parent efb98a8a01
commit a0060182e3
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers/d3d9.c
View File

@ -1943,6 +1943,7 @@ static void d3d9_video_texture_load_d3d(
*id = (uintptr_t)tex; *id = (uintptr_t)tex;
} }
#ifdef HAVE_THREADS
static int d3d9_video_texture_load_wrap_d3d(void *data) static int d3d9_video_texture_load_wrap_d3d(void *data)
{ {
uintptr_t id = 0; uintptr_t id = 0;
@ -1952,6 +1953,7 @@ static int d3d9_video_texture_load_wrap_d3d(void *data)
d3d9_video_texture_load_d3d(info, &id); d3d9_video_texture_load_d3d(info, &id);
return id; return id;
} }
#endif
static uintptr_t d3d9_load_texture(void *video_data, void *data, static uintptr_t d3d9_load_texture(void *video_data, void *data,
bool threaded, enum texture_filter_type filter_type) bool threaded, enum texture_filter_type filter_type)
@ -1963,9 +1965,11 @@ static uintptr_t d3d9_load_texture(void *video_data, void *data,
info.data = data; info.data = data;
info.type = filter_type; info.type = filter_type;
#ifdef HAVE_THREADS
if (threaded) if (threaded)
return video_thread_texture_load(&info, return video_thread_texture_load(&info,
d3d9_video_texture_load_wrap_d3d); d3d9_video_texture_load_wrap_d3d);
#endif
d3d9_video_texture_load_d3d(&info, &id); d3d9_video_texture_load_d3d(&info, &id);
return id; return id;

6
retroarch.c
View File

@ -73,7 +73,9 @@
#include <compat/getopt.h> #include <compat/getopt.h>
#include <audio/conversion/float_to_s16.h> #include <audio/conversion/float_to_s16.h>
#include <audio/conversion/s16_to_float.h> #include <audio/conversion/s16_to_float.h>
#ifdef HAVE_AUDIOMIXER
#include <audio/audio_mixer.h> #include <audio/audio_mixer.h>
#endif
#include <audio/dsp_filter.h> #include <audio/dsp_filter.h>
#include <compat/posix_string.h> #include <compat/posix_string.h>
#include <streams/file_stream.h> #include <streams/file_stream.h>
@ -84,7 +86,9 @@
#include <queues/message_queue.h> #include <queues/message_queue.h>
#include <queues/task_queue.h> #include <queues/task_queue.h>
#include <lists/dir_list.h> #include <lists/dir_list.h>
#ifdef HAVE_NETWORKING
#include <net/net_http.h> #include <net/net_http.h>
#endif
#include "config.def.h" #include "config.def.h"
#include "config.def.keybinds.h" #include "config.def.keybinds.h"
@ -190,7 +194,9 @@
#include "runahead/mem_util.h" #include "runahead/mem_util.h"
#endif #endif
#ifdef HAVE_THREADS
#include "audio/audio_thread_wrapper.h" #include "audio/audio_thread_wrapper.h"
#endif
/* DRIVERS */ /* DRIVERS */