From 78b5b347b80c326d172d2b4920ccbfe30929c0f5 Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Mon, 1 Mar 2021 14:44:50 +0000
Subject: [PATCH] build: Disable TRACE calls in release builds

Signed-off-by: Joshua Ashton <joshua@froggi.es>
---
 meson.build       | 14 ++++++++++++++
 meson_options.txt |  1 +
 2 files changed, 15 insertions(+)

diff --git a/meson.build b/meson.build
index 82c86d12..9de2d622 100644
--- a/meson.build
+++ b/meson.build
@@ -10,12 +10,16 @@ vkd3d_clang    = vkd3d_compiler.get_id() == 'clang'
 vkd3d_c_std    = 'c11'
 vkd3d_platform = target_machine.system()
 
+vkd3d_buildtype = get_option('buildtype')
+vkd3d_debug     = vkd3d_buildtype == 'debug' or vkd3d_buildtype == 'debugoptimized'
+
 enable_tests             = get_option('enable_tests')
 enable_extras            = get_option('enable_extras')
 enable_d3d12             = get_option('enable_d3d12')
 enable_profiling         = get_option('enable_profiling')
 enable_renderdoc         = get_option('enable_renderdoc')
 enable_descriptor_qa     = get_option('enable_descriptor_qa')
+enable_trace             = get_option('enable_trace')
 
 if enable_d3d12 == 'auto'
   enable_d3d12 = vkd3d_platform == 'windows'
@@ -23,6 +27,12 @@ else
   enable_d3d12 = enable_d3d12 == 'true'
 endif
 
+if enable_trace == 'auto'
+  enable_trace = vkd3d_debug
+else
+  enable_trace = enable_trace == 'true'
+endif
+
 if vkd3d_platform != 'windows' and enable_d3d12
   error('Standalone D3D12 is only supported on Windows.')
 endif
@@ -50,6 +60,10 @@ if enable_descriptor_qa
   add_project_arguments('-DVKD3D_ENABLE_DESCRIPTOR_QA', language : 'c')
 endif
 
+if not enable_trace
+  add_project_arguments('-DVKD3D_NO_TRACE_MESSAGES', language : 'c')
+endif
+
 vkd3d_external_includes = [ './subprojects/Vulkan-Headers/include', './subprojects/SPIRV-Headers/include' ]
 vkd3d_public_includes   = [ './include' ] + vkd3d_external_includes
 vkd3d_private_includes  = [ './include/private' ] + vkd3d_public_includes
diff --git a/meson_options.txt b/meson_options.txt
index 44f0633b..3f4f6eff 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,3 +4,4 @@ option('enable_d3d12',            type : 'combo',   value : 'auto', choices : ['
 option('enable_profiling',        type : 'boolean', value : false)
 option('enable_renderdoc',        type : 'boolean', value : false)
 option('enable_descriptor_qa',    type : 'boolean', value : false)
+option('enable_trace',            type : 'combo',   value : 'auto', choices : ['false', 'true', 'auto'])