Mesa (master): clover: clCompileProgram CL_INVALID_COMPILER_OPTIONS

[Tom Stellard]

Module: Mesa
Branch: master
Commit: 745b1f550339b3adbf272a28b9d0c767a86ff2fb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=745b1f550339b3adbf272a28b9d0c767a86ff2fb

Author: EdB <edb+mesa at sigluy.net>
Date:   Fri Nov  7 10:30:40 2014 +0100

clover: clCompileProgram CL_INVALID_COMPILER_OPTIONS

clCompileProgram should return CL_INVALID_COMPILER_OPTIONS
instead of CL_INVALID_BUILD_OPTIONS

Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/gallium/state_trackers/clover/api/program.cpp     |    2 ++
 src/gallium/state_trackers/clover/llvm/invocation.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/api/program.cpp b/src/gallium/state_trackers/clover/api/program.cpp
index 3a6c054..60184ed 100644
--- a/src/gallium/state_trackers/clover/api/program.cpp
+++ b/src/gallium/state_trackers/clover/api/program.cpp
@@ -182,6 +182,8 @@ clBuildProgram(cl_program d_prog, cl_uint num_devs,
    prog.build(devs, opts);
    return CL_SUCCESS;
 } catch (error &e) {
+   if (e.get() == CL_INVALID_COMPILER_OPTIONS)
+      return CL_INVALID_BUILD_OPTIONS;
    if (e.get() == CL_COMPILE_PROGRAM_FAILURE)
       return CL_BUILD_PROGRAM_FAILURE;
    return e.get();
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index e953822..cda447d 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -177,7 +177,7 @@ namespace {
                                         opts_carray.data() + opts_carray.size(),
                                         Diags);
       if (!Success) {
-         throw error(CL_INVALID_BUILD_OPTIONS);
+         throw error(CL_INVALID_COMPILER_OPTIONS);
       }
       c.getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly;
       c.getHeaderSearchOpts().UseBuiltinIncludes = true;