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

(shaders) Log a warning when using the shader fallback type 

Only allow using Cg shaders when HAVE_CG is set
This commit is contained in:
r5 2017-09-18 04:43:08 +01:00
parent fdccf4a6b0
commit f5988b2323
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/video_shader_parse.c
View File

@ -1081,7 +1081,13 @@ enum rarch_shader_type video_shader_parse_type(const char *path,
enum rarch_shader_type fallback) enum rarch_shader_type fallback)
{ {
enum rarch_shader_type shader_type = RARCH_SHADER_NONE; enum rarch_shader_type shader_type = RARCH_SHADER_NONE;
enum gfx_ctx_api api = video_context_driver_get_api(); enum gfx_ctx_api api = video_context_driver_get_api();
#ifdef HAVE_CG
bool cg_supported = true;
#else
bool cg_supported = false;
#endif
if (!path) if (!path)
return fallback; return fallback;
@ -1109,22 +1115,22 @@ enum rarch_shader_type video_shader_parse_type(const char *path,
switch (api) switch (api)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
if (shader_type == RARCH_SHADER_GLSL || shader_type == RARCH_SHADER_CG)
return shader_type;
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
if (shader_type == RARCH_SHADER_GLSL) if (shader_type == RARCH_SHADER_GLSL
|| (cg_supported && shader_type == RARCH_SHADER_CG))
return shader_type; return shader_type;
case GFX_CTX_DIRECT3D9_API: case GFX_CTX_DIRECT3D9_API:
if (shader_type == RARCH_SHADER_CG) if (cg_supported && shader_type == RARCH_SHADER_CG)
return shader_type; return shader_type;
case GFX_CTX_VULKAN_API: case GFX_CTX_VULKAN_API:
if (shader_type == RARCH_SHADER_SLANG) if (shader_type == RARCH_SHADER_SLANG)
return fallback; return fallback;
case GFX_CTX_NONE:
case GFX_CTX_GDI_API: case GFX_CTX_GDI_API:
case GFX_CTX_OPENVG_API: case GFX_CTX_OPENVG_API:
case GFX_CTX_DIRECT3D8_API: case GFX_CTX_DIRECT3D8_API:
case GFX_CTX_NONE:
default: default:
RARCH_WARN("Current video context is incompatible with file: %s", path);
return fallback; return fallback;
} }
} }