From c0022b66033788abe218fa95db92f3803013abfc Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 4 Mar 2025 12:45:29 -0500 Subject: [PATCH] intel: use common CL args this contains two behaviour changes: * NDEBUG no longer set in debug builds (so asserts work in debug, but are still stripped out in release as expected). * macro map set properly for assertions to be reported with proper paths. together this makes assertions do the right thing on Intel and brings us in alignment with asahi+panfrost Signed-off-by: Alyssa Rosenzweig Acked-by: Lionel Landwerlin Part-of: --- src/intel/shaders/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/shaders/meson.build b/src/intel/shaders/meson.build index 01ac3fd67cb..fbd1accb7e8 100644 --- a/src/intel/shaders/meson.build +++ b/src/intel/shaders/meson.build @@ -44,7 +44,6 @@ foreach gen : intel_shaders_gens command : [ prog_mesa_clc, intel_shader_files, '-o', '@OUTPUT@', '--depfile', '@DEPFILE@', '--', - '-DNDEBUG=1', '-DGFX_VERx10=@0@'.format(gen[0]), '-I' + join_paths(meson.current_source_dir(), '.'), '-I' + join_paths(dir_source_root, 'src/compiler/libcl'), @@ -52,6 +51,7 @@ foreach gen : intel_shaders_gens '-I' + join_paths(dir_source_root, 'src/intel'), '-I' + join_paths(meson.project_build_root(), 'src/intel'), '-I' + join_paths(dir_source_root, 'src/intel/genxml'), + cl_args, ], depends : [gen_cl_xml_pack, intel_dev_wa_src], depfile : 'intel_gfx@0@_shaders.spv.d'.format(gen[0]),