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

clover: remove compat::string

Browse Source 
Acked-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
EdB
2015-04-24 12:59:55 +02:00
committed by Tom Stellard
parent 1b4a1d0049
commit 5ca9b23319
7 changed files with 26 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,7 +136,7 @@ namespace {
const std::string &name, const std::string &triple,
const std::string &processor, const std::string &opts,
clang::LangAS::Map& address_spaces, unsigned &optimization_level,
compat::string &r_log) {
std::string &r_log) {
clang::CompilerInstance c;
clang::EmitLLVMOnlyAction act(&llvm_ctx);
@@ -470,7 +470,7 @@ namespace {
emit_code(LLVMTargetMachineRef tm, LLVMModuleRef mod,
LLVMCodeGenFileType file_type,
LLVMMemoryBufferRef *out_buffer,
compat::string &r_log) {
std::string &r_log) {
LLVMBool err;
char *err_message = NULL;
@@ -491,7 +491,7 @@ namespace {
std::vector<char>
compile_native(const llvm::Module *mod, const std::string &triple,
const std::string &processor, unsigned dump_asm,
compat::string &r_log) {
std::string &r_log) {
std::string log;
LLVMTargetRef target;
@@ -545,7 +545,7 @@ namespace {
std::map<std::string, unsigned>
get_kernel_offsets(std::vector<char> &code,
const std::vector<llvm::Function *> &kernels,
compat::string &r_log) {
std::string &r_log) {
// One of the libelf implementations
// (http://www.mr511.de/software/english.htm) requires calling
@@ -611,7 +611,7 @@ namespace {
const llvm::Module *mod,
const std::vector<llvm::Function *> &kernels,
const clang::LangAS::Map &address_spaces,
compat::string &r_log) {
std::string &r_log) {
std::map<std::string, unsigned> kernel_offsets =
get_kernel_offsets(code, kernels, r_log);
@@ -641,12 +641,12 @@ namespace {
void
diagnostic_handler(const llvm::DiagnosticInfo &di, void *data) {
if (di.getSeverity() == llvm::DS_Error) {
std::string message = *(compat::string*)data;
std::string message = *(std::string*)data;
llvm::raw_string_ostream stream(message);
llvm::DiagnosticPrinterRawOStream dp(stream);
di.print(dp);
stream.flush();
*(compat::string*)data = message;
*(std::string*)data = message;
throw build_error();
}
@@ -686,12 +686,12 @@ namespace {
} // End anonymous namespace
module
clover::compile_program_llvm(const compat::string &source,
clover::compile_program_llvm(const std::string &source,
const header_map &headers,
enum pipe_shader_ir ir,
const compat::string &target,
const compat::string &opts,
compat::string &r_log) {
const std::string &target,
const std::string &opts,
std::string &r_log) {
init_targets();