OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clover: clCompileProgram CL_INVALID_COMPILER_OPTIONS

Browse Source 
clCompileProgram should return CL_INVALID_COMPILER_OPTIONS
instead of CL_INVALID_BUILD_OPTIONS

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
EdB
2014-11-07 10:30:40 +01:00
committed by Tom Stellard
parent 29c7cf2b2b
commit 745b1f5503
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/state_trackers/clover/api/program.cpp
View File

@@ -182,6 +182,8 @@ clBuildProgram(cl_program d_prog, cl_uint num_devs,
prog.build(devs, opts); prog.build(devs, opts);
return CL_SUCCESS; return CL_SUCCESS;
} catch (error &e) { } catch (error &e) {
if (e.get() == CL_INVALID_COMPILER_OPTIONS)
return CL_INVALID_BUILD_OPTIONS;
if (e.get() == CL_COMPILE_PROGRAM_FAILURE) if (e.get() == CL_COMPILE_PROGRAM_FAILURE)
return CL_BUILD_PROGRAM_FAILURE; return CL_BUILD_PROGRAM_FAILURE;
return e.get(); return e.get();

2
src/gallium/state_trackers/clover/llvm/invocation.cpp
View File

@@ -177,7 +177,7 @@ namespace {
opts_carray.data() + opts_carray.size(), opts_carray.data() + opts_carray.size(),
Diags); Diags);
if (!Success) { if (!Success) {
throw error(CL_INVALID_BUILD_OPTIONS); throw error(CL_INVALID_COMPILER_OPTIONS);
} }
c.getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly; c.getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly;
c.getHeaderSearchOpts().UseBuiltinIncludes = true; c.getHeaderSearchOpts().UseBuiltinIncludes = true;