mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-07-21 12:13:04 +02:00
parent af2b2b07f2
commit b33eb9bacf
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.common
View File

@ -335,6 +335,10 @@ ifeq ($(HAVE_IMAGEVIEWER), 1)
OBJ += cores/libretro-imageviewer/image_core.o OBJ += cores/libretro-imageviewer/image_core.o
endif endif
ifeq ($(HAVE_D3D9), 1)
HAVE_HLSL = 1
endif
ifeq ($(HAVE_CG), 1) ifeq ($(HAVE_CG), 1)
HAVE_SHADERS_COMMON = 1 HAVE_SHADERS_COMMON = 1
endif endif
@ -373,7 +377,7 @@ ifeq ($(HAVE_QT), 1)
ui/drivers/qt/thumbnaildownload.o \ ui/drivers/qt/thumbnaildownload.o \
ui/drivers/qt/thumbnailpackdownload.o \ ui/drivers/qt/thumbnailpackdownload.o \
ui/drivers/qt/playlistthumbnaildownload.o ui/drivers/qt/playlistthumbnaildownload.o
ifeq ($(HAVE_SHADERS_COMMON),1) ifeq ($(HAVE_SHADERS_COMMON), 1)
OBJ += ui/drivers/qt/shaderparamsdialog.o OBJ += ui/drivers/qt/shaderparamsdialog.o
endif endif
ifeq ($(HAVE_MENU), 1) ifeq ($(HAVE_MENU), 1)
@ -791,7 +795,7 @@ ifeq ($(HAVE_LAKKA_SWITCH), 1)
endif endif
# Does not depend on HAVE_MENU # Does not depend on HAVE_MENU
ifeq ($(HAVE_SHADERS_COMMON),1) ifeq ($(HAVE_SHADERS_COMMON), 1)
OBJ += menu/menu_shader.o OBJ += menu/menu_shader.o
endif endif
@ -1349,7 +1353,6 @@ ifeq ($(HAVE_D3D9), 1)
LIBS += -lcgD3D9 LIBS += -lcgD3D9
OBJ += gfx/drivers_renderchain/d3d9_cg_renderchain.o OBJ += gfx/drivers_renderchain/d3d9_cg_renderchain.o
endif endif
HAVE_HLSL=1
endif endif
ifeq ($(HAVE_D3D10), 1) ifeq ($(HAVE_D3D10), 1)

19
gfx/drivers/d3d9.c
View File

@ -31,6 +31,10 @@
#include <d3d9.h> #include <d3d9.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "../../defines/d3d_defines.h" #include "../../defines/d3d_defines.h"
#include "../common/d3d_common.h" #include "../common/d3d_common.h"
#include "../common/d3d9_common.h" #include "../common/d3d9_common.h"
@ -1231,17 +1235,18 @@ static bool d3d9_init_internal(d3d9_video_t *d3d,
return false; return false;
{ {
const char *shader_preset;
enum rarch_shader_type type;
d3d9_fake_context.get_flags = d3d9_get_flags; d3d9_fake_context.get_flags = d3d9_get_flags;
video_context_driver_set(&d3d9_fake_context); video_context_driver_set(&d3d9_fake_context);
#if defined(HAVE_CG) || defined(HAVE_HLSL)
shader_preset = retroarch_get_shader_preset(); {
type = video_shader_parse_type(shader_preset); const char *shader_preset = retroarch_get_shader_preset();
enum rarch_shader_type type = video_shader_parse_type(shader_preset);
d3d9_set_shader(d3d, type, shader_preset); d3d9_set_shader(d3d, type, shader_preset);
} }
#endif
}
d3d_input_driver(settings->arrays.input_joypad_driver, d3d_input_driver(settings->arrays.input_joypad_driver,
settings->arrays.input_joypad_driver, input, input_data); settings->arrays.input_joypad_driver, input, input_data);
@ -1752,6 +1757,7 @@ end:
static bool d3d9_set_shader(void *data, static bool d3d9_set_shader(void *data,
enum rarch_shader_type type, const char *path) enum rarch_shader_type type, const char *path)
{ {
#if defined(HAVE_CG) || defined(HAVE_HLSL)
d3d9_video_t *d3d = (d3d9_video_t*)data; d3d9_video_t *d3d = (d3d9_video_t*)data;
if (!d3d) if (!d3d)
@ -1790,6 +1796,9 @@ static bool d3d9_set_shader(void *data,
} }
return true; return true;
#else
return false;
#endif
} }
static void d3d9_set_menu_texture_frame(void *data, static void d3d9_set_menu_texture_frame(void *data,