From 3c498eb505ebfbcc844901dca71fc3a6112bac31 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 16 Apr 2015 20:59:55 +0200 Subject: [PATCH] Add HAVE_GLSL/HAVE_HLSL to config.features.h --- config.features.h | 12 ++++++++++++ menu/menu_entries_cbs_deferred_push.c | 12 +++++++++++- retroarch.c | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/config.features.h b/config.features.h index 5c27f4dd90..d7888fbd45 100644 --- a/config.features.h +++ b/config.features.h @@ -146,6 +146,18 @@ static const bool _cg_supp = true; static const bool _cg_supp = false; #endif +#ifdef HAVE_GLSL +static const bool _glsl_supp = true; +#else +static const bool _glsl_supp = false; +#endif + +#ifdef HAVE_HLSL +static const bool _hlsl_supp = true; +#else +static const bool _hlsl_supp = false; +#endif + #ifdef HAVE_LIBXML2 static const bool _libxml2_supp = true; #else diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c index 5611e0d837..d995a821bf 100644 --- a/menu/menu_entries_cbs_deferred_push.c +++ b/menu/menu_entries_cbs_deferred_push.c @@ -522,7 +522,17 @@ static int deferred_push_system_information(void *data, void *userdata, MENU_SETTINGS_CORE_INFO_NONE, 0); snprintf(feat_str, sizeof(feat_str), - "Cg library support: %s", _cg_supp ? "true" : "false"); + "Cg support: %s", _cg_supp ? "true" : "false"); + menu_list_push(list, feat_str, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + + snprintf(feat_str, sizeof(feat_str), + "GLSL support: %s", _glsl_supp ? "true" : "false"); + menu_list_push(list, feat_str, "", + MENU_SETTINGS_CORE_INFO_NONE, 0); + + snprintf(feat_str, sizeof(feat_str), + "HLSL support: %s", _hlsl_supp ? "true" : "false"); menu_list_push(list, feat_str, "", MENU_SETTINGS_CORE_INFO_NONE, 0); diff --git a/retroarch.c b/retroarch.c index e9893a3f75..d9f12aded3 100644 --- a/retroarch.c +++ b/retroarch.c @@ -115,6 +115,8 @@ static void print_features(void) _PSUPP(al, "OpenAL", "audio driver"); _PSUPP(dylib, "External", "External filter and plugin support"); _PSUPP(cg, "Cg", "Cg pixel shaders"); + _PSUPP(glsl, "GLSL", "GLSL pixel shaders"); + _PSUPP(glsl, "HLSL", "HLSL pixel shaders"); _PSUPP(libxml2, "libxml2", "libxml2 XML parsing"); _PSUPP(sdl_image, "SDL_image", "SDL_image image loading"); _PSUPP(fbo, "FBO", "OpenGL render-to-texture (multi-pass shaders)");