wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-compiler: Default to monochrome output when NO_COLOUR/NO_COLOR is set.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-08-31 01:16:26 +02:00 committed by Alexandre Julliard
parent cc05e9c391
commit 0de7a2eeb5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -45,6 +45,11 @@ removed in the future versions of vkd3d.
Some of debug variables are lists of elements. Elements must be separated by Some of debug variables are lists of elements. Elements must be separated by
commas or semicolons. commas or semicolons.
* NO_COLOR - this is an alias of NO_COLOUR.
* NO_COLOUR - when set, vkd3d-compiler will default to monochrome output,
even when the output supports colour.
* VKD3D_CONFIG - a list of options that change the behavior of libvkd3d. * VKD3D_CONFIG - a list of options that change the behavior of libvkd3d.
* vk_debug - enables Vulkan debug extensions. * vk_debug - enables Vulkan debug extensions.

2
programs/vkd3d-compiler/main.c
View File

@ -674,7 +674,7 @@ int main(int argc, char **argv)
} }
} }
if (!options.explicit_colour && has_colour(output)) if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output))
options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR;
add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting);