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

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

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
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.
* vk_debug - enables Vulkan debug extensions.

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;
add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting);