From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 28 Jun 2016 06:46:26 +0000 (-0700)
Subject: clover/llvm: Fold compile_native() call into build_module_native().
X-Git-Tag: android-x86-6.0-r2~2901
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0601fe74389b23ae1094e730a5681aed3af84629;p=android-x86%2Fexternal-mesa.git

clover/llvm: Fold compile_native() call into build_module_native().

Reviewed-by: Serge Martin <edb+mesa@sigluy.net>
Tested-by: Jan Vesely <jan.vesely@rutgers.edu>
---

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 242c096107f..754e477bd29 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -673,10 +673,10 @@ namespace {
    }
 
    module
-   build_module_native(std::vector<char> &code,
-                       llvm::Module *mod,
+   build_module_native(llvm::Module *mod, const target &target,
                        const clang::CompilerInstance &c,
                        std::string &r_log) {
+      const auto code = compile_native(mod, target, r_log);
       return build_module_common(*mod, code,
                                  get_symbol_offsets(code, r_log), c);
    }
@@ -721,11 +721,9 @@ clover::compile_program_llvm(const std::string &source,
       case PIPE_SHADER_IR_LLVM:
          m = build_module_llvm(&*mod, *c);
          break;
-      case PIPE_SHADER_IR_NATIVE: {
-         std::vector<char> code = compile_native(&*mod, target, r_log);
-         m = build_module_native(code, &*mod, *c, r_log);
+      case PIPE_SHADER_IR_NATIVE:
+         m = build_module_native(&*mod, target, *c, r_log);
          break;
-      }
    }
 
    return m;