diff --git a/src/asahi/libagx/meson.build b/src/asahi/libagx/meson.build index abd76b3a3ad..d30b529fe89 100644 --- a/src/asahi/libagx/meson.build +++ b/src/asahi/libagx/meson.build @@ -22,7 +22,6 @@ libagx_spv = custom_target( command : [ prog_mesa_clc, '-o', '@OUTPUT@', '--depfile', '@DEPFILE@', libagx_shader_files, '--', - '-cl-std=cl2.0', '-D__OPENCL_VERSION__=200', '-I' + join_paths(meson.current_source_dir(), '.'), '-I' + join_paths(meson.current_source_dir(), '../../'), '-I' + join_paths(meson.current_source_dir(), 'shaders'), diff --git a/src/compiler/clc/mesa_clc.c b/src/compiler/clc/mesa_clc.c index 5d7b828ec39..fec0448d84e 100644 --- a/src/compiler/clc/mesa_clc.c +++ b/src/compiler/clc/mesa_clc.c @@ -107,6 +107,12 @@ main(int argc, char **argv) util_dynarray_append(option ? &clang_args : &input_files, char *, arg); } + /* Set the OpenCL standard to CL 2.0, this enables everything at a frontend + * level. See comment below about driver support. + */ + util_dynarray_append(&clang_args, char *, "-cl-std=cl2.0"); + util_dynarray_append(&clang_args, char *, "-D__OPENCL_VERSION__=200"); + if (util_dynarray_num_elements(&input_files, char *) == 0) { fprintf(stderr, "No input file(s).\n"); print_usage(argv[0], stderr); diff --git a/src/intel/shaders/meson.build b/src/intel/shaders/meson.build index 125ee7101b9..9ac99b87071 100644 --- a/src/intel/shaders/meson.build +++ b/src/intel/shaders/meson.build @@ -43,7 +43,6 @@ foreach gen : intel_shaders_gens command : [ prog_mesa_clc, intel_shader_files, '-o', '@OUTPUT@', '--', - '-cl-std=cl2.0', '-D__OPENCL_VERSION__=200', '-DNDEBUG=1', '-DGFX_VERx10=@0@'.format(gen[0]), '-I' + join_paths(meson.current_source_dir(), '.'),