[PATCH vkd3d 4/5] vkd3d-compiler: Default to monochrome output when NO_COLOUR/NO_COLOR is set.

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
 README                         | 5 +++++
 programs/vkd3d-compiler/main.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 3c70ede8..ed53f202 100644
--- a/README
+++ b/README
@@ -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.
 
diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c
index 40e27ed5..ac01d59a 100644
--- a/programs/vkd3d-compiler/main.c
+++ b/programs/vkd3d-compiler/main.c
@@ -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);
 
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=96810

Your paranoid android.


=== debiant2 (build log) ===

error: patch failed: README:45
Task: Patch failed to apply

=== debiant2 (build log) ===

error: patch failed: README:45
Task: Patch failed to apply