KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clover/tgsi: Move compiler entry point declaration into tgsi directory and namespace. 

Reviewed-by: Serge Martin <edb+mesa@sigluy.net>
Tested-by: Jan Vesely <jan.vesely@rutgers.edu>
This commit is contained in:
Francisco Jerez 2016-05-17 16:03:07 +02:00
parent fb3eeb1314
commit ba613636e8
5 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/state_trackers/clover/Makefile.sources
View File

@ -65,4 +65,5 @@ LLVM_SOURCES := \
llvm/util.hpp
TGSI_SOURCES := \
tgsi/compiler.cpp
tgsi/compiler.cpp \
tgsi/invocation.hpp

3
src/gallium/state_trackers/clover/core/compiler.hpp
View File

@ -36,9 +36,6 @@ namespace clover {
const std::string &target,
const std::string &opts,
std::string &r_log);
module compile_program_tgsi(const std::string &source,
std::string &r_log);
}
#endif

3
src/gallium/state_trackers/clover/core/program.cpp
View File

@ -21,6 +21,7 @@
//
#include "core/program.hpp"
#include "tgsi/invocation.hpp"
using namespace clover;
@ -56,7 +57,7 @@ program::build(const ref_vector<device> &devs, const char *opts,
try {
auto module = (dev.ir_format() == PIPE_SHADER_IR_TGSI ?
compile_program_tgsi(_source, log) :
tgsi::compile_program(_source, log) :
compile_program_llvm(_source, headers,
dev.ir_format(),
dev.ir_target(), build_opts(dev),

5
src/gallium/state_trackers/clover/tgsi/compiler.cpp
View File

@ -22,7 +22,8 @@
#include <sstream>
#include "core/compiler.hpp"
#include "tgsi/invocation.hpp"
#include "core/error.hpp"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_text.h"
@ -95,7 +96,7 @@ namespace {
}
module
clover::compile_program_tgsi(const std::string &source, std::string &r_log) {
clover::tgsi::compile_program(const std::string &source, std::string &r_log) {
const size_t body_pos = source.find("COMP\n");
if (body_pos == std::string::npos) {
r_log = "invalid source";

35
src/gallium/state_trackers/clover/tgsi/invocation.hpp Normal file
View File

@ -0,0 +1,35 @@
//
// Copyright 2016 Francisco Jerez
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
//
#ifndef CLOVER_TGSI_INVOCATION_HPP
#define CLOVER_TGSI_INVOCATION_HPP
#include "core/module.hpp"
namespace clover {
namespace tgsi {
module compile_program(const std::string &source,
std::string &r_log);
}
}
#endif