Merge pull request #6189 from cucholix/patch-2

Allow auto loading of slangp presets on GX2
This commit is contained in:
Andrés 2018-01-27 16:07:39 -05:00 committed by GitHub
commit f51560cb0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2265,7 +2265,8 @@ static bool check_shader_compatibility(enum file_path_enum enum_idx)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (string_is_equal(settings->arrays.video_driver, "vulkan")) if (string_is_equal(settings->arrays.video_driver, "vulkan")) ||
string_is_equal(settings->arrays.video_driver, "gx2"))
{ {
if (enum_idx != FILE_PATH_SLANGP_EXTENSION) if (enum_idx != FILE_PATH_SLANGP_EXTENSION)
return false; return false;