From b33eb9bacfaf955eacd594fb92ef6b4db5cf84a0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 21 Jul 2019 12:13:04 +0200 Subject: [PATCH] Cleanups --- Makefile.common | 9 ++++++--- gfx/drivers/d3d9.c | 21 +++++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile.common b/Makefile.common index 1ef18f29a6..068614ab3e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -335,6 +335,10 @@ ifeq ($(HAVE_IMAGEVIEWER), 1) OBJ += cores/libretro-imageviewer/image_core.o endif +ifeq ($(HAVE_D3D9), 1) + HAVE_HLSL = 1 +endif + ifeq ($(HAVE_CG), 1) HAVE_SHADERS_COMMON = 1 endif @@ -373,7 +377,7 @@ ifeq ($(HAVE_QT), 1) ui/drivers/qt/thumbnaildownload.o \ ui/drivers/qt/thumbnailpackdownload.o \ ui/drivers/qt/playlistthumbnaildownload.o - ifeq ($(HAVE_SHADERS_COMMON),1) + ifeq ($(HAVE_SHADERS_COMMON), 1) OBJ += ui/drivers/qt/shaderparamsdialog.o endif ifeq ($(HAVE_MENU), 1) @@ -791,7 +795,7 @@ ifeq ($(HAVE_LAKKA_SWITCH), 1) endif # Does not depend on HAVE_MENU -ifeq ($(HAVE_SHADERS_COMMON),1) +ifeq ($(HAVE_SHADERS_COMMON), 1) OBJ += menu/menu_shader.o endif @@ -1349,7 +1353,6 @@ ifeq ($(HAVE_D3D9), 1) LIBS += -lcgD3D9 OBJ += gfx/drivers_renderchain/d3d9_cg_renderchain.o endif - HAVE_HLSL=1 endif ifeq ($(HAVE_D3D10), 1) diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index b12a610e6a..bb8cef649c 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -31,6 +31,10 @@ #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #include "../../defines/d3d_defines.h" #include "../common/d3d_common.h" #include "../common/d3d9_common.h" @@ -1231,16 +1235,17 @@ static bool d3d9_init_internal(d3d9_video_t *d3d, return false; { - const char *shader_preset; - enum rarch_shader_type type; d3d9_fake_context.get_flags = d3d9_get_flags; video_context_driver_set(&d3d9_fake_context); +#if defined(HAVE_CG) || defined(HAVE_HLSL) + { + const char *shader_preset = retroarch_get_shader_preset(); + enum rarch_shader_type type = video_shader_parse_type(shader_preset); - shader_preset = retroarch_get_shader_preset(); - 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, @@ -1752,6 +1757,7 @@ end: static bool d3d9_set_shader(void *data, enum rarch_shader_type type, const char *path) { +#if defined(HAVE_CG) || defined(HAVE_HLSL) d3d9_video_t *d3d = (d3d9_video_t*)data; if (!d3d) @@ -1790,6 +1796,9 @@ static bool d3d9_set_shader(void *data, } return true; +#else + return false; +#endif } static void d3d9_set_menu_texture_frame(void *data,