From ecc7bc0cf2c5ca2cfbcfce5c3456becc3aa622d0 Mon Sep 17 00:00:00 2001 From: Themaister Date: Wed, 13 Mar 2019 18:27:44 +0100 Subject: [PATCH] Fix compile error and flag errors on X/Wayland. --- gfx/drivers_context/wayland_ctx.c | 17 +++++++++++++++-- gfx/drivers_context/x_ctx.c | 7 ++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index c41e7e90e2..f4db643539 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -1898,10 +1898,23 @@ static uint32_t gfx_ctx_wl_get_flags(void *data) { case GFX_CTX_OPENGL_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; 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; case GFX_CTX_NONE: default: diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c index d405c77039..61c3d60095 100644 --- a/gfx/drivers_context/x_ctx.c +++ b/gfx/drivers_context/x_ctx.c @@ -1170,7 +1170,12 @@ static uint32_t gfx_ctx_x_get_flags(void *data) BIT32_SET(flags, GFX_CTX_FLAGS_MULTISAMPLING); } 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 { #ifdef HAVE_CG