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

Fix compile error and flag errors on X/Wayland.

Browse Source
This commit is contained in:
Themaister 2019-03-13 18:27:44 +01:00
parent 77c8688d6a
commit ecc7bc0cf2
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/drivers_context/wayland_ctx.c
View File

@ -1898,10 +1898,23 @@ static uint32_t gfx_ctx_wl_get_flags(void *data)
{ {
case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_API:
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_GLSL); if (string_is_equal(video_driver_get_ident(), "glcore"))
{
#ifdef HAVE_SLANG
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_SLANG);
#endif
}
else if (string_is_equal(video_driver_get_ident(), "gl"))
{
#ifdef HAVE_GLSL
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_GLSL);
#endif
}
break; break;
case GFX_CTX_VULKAN_API: case GFX_CTX_VULKAN_API:
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_VULKAN); #ifdef HAVE_SLANG
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_SLANG);
#endif
break; break;
case GFX_CTX_NONE: case GFX_CTX_NONE:
default: default:

7
gfx/drivers_context/x_ctx.c
View File

@ -1170,7 +1170,12 @@ static uint32_t gfx_ctx_x_get_flags(void *data)
BIT32_SET(flags, GFX_CTX_FLAGS_MULTISAMPLING); BIT32_SET(flags, GFX_CTX_FLAGS_MULTISAMPLING);
} }
if (string_is_equal(video_driver_get_ident(), "gl1")) { } if (string_is_equal(video_driver_get_ident(), "gl1")) { }
else if (string_is_equal(video_driver_get_ident(), "glcore")) { } else if (string_is_equal(video_driver_get_ident(), "glcore"))
{
#ifdef HAVE_SLANG
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_SLANG);
#endif
}
else else
{ {
#ifdef HAVE_CG #ifdef HAVE_CG