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>

diff --git a/src/gallium/state_trackers/clover/Makefile.sources b/src/gallium/state_trackers/clover/Makefile.sources
index bbfb2de6245590e9ffa6190535dd625cd9d25689..a474130322cd1547dcac83d3899f12bc6655e77b 100644 (file)
--- a/src/gallium/state_trackers/clover/Makefile.sources
+++ b/src/gallium/state_trackers/clover/Makefile.sources
@@ -65,4 +65,5 @@ LLVM_SOURCES := \
        llvm/util.hpp
 
 TGSI_SOURCES := \
-       tgsi/compiler.cpp
+       tgsi/compiler.cpp \
+       tgsi/invocation.hpp

diff --git a/src/gallium/state_trackers/clover/core/compiler.hpp b/src/gallium/state_trackers/clover/core/compiler.hpp
index 207641785ca64631a39794f855a967e2b6428279..0ed81fb35104bb627b9935a3c06ea4871f06e825 100644 (file)
--- a/src/gallium/state_trackers/clover/core/compiler.hpp
+++ b/src/gallium/state_trackers/clover/core/compiler.hpp
@@ -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

diff --git a/src/gallium/state_trackers/clover/core/program.cpp b/src/gallium/state_trackers/clover/core/program.cpp
index 6eebd9c5cda7657b7024988b3ec1ac1d6108aeb2..d8637876cd4f182939160b032315de462c36436a 100644 (file)
--- a/src/gallium/state_trackers/clover/core/program.cpp
+++ b/src/gallium/state_trackers/clover/core/program.cpp
@@ -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),

diff --git a/src/gallium/state_trackers/clover/tgsi/compiler.cpp b/src/gallium/state_trackers/clover/tgsi/compiler.cpp
index dc5ae1a9c76052e0a8c98983faf2cb6e71d0fe7e..d96f7e1046c620c4fdd2072756cda168962fda0c 100644 (file)
--- a/src/gallium/state_trackers/clover/tgsi/compiler.cpp
+++ b/src/gallium/state_trackers/clover/tgsi/compiler.cpp
@@ -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";

diff --git a/src/gallium/state_trackers/clover/tgsi/invocation.hpp b/src/gallium/state_trackers/clover/tgsi/invocation.hpp
new file mode 100644 (file)
index 0000000..0fa20c4
--- /dev/null
+++ b/src/gallium/state_trackers/clover/tgsi/invocation.hpp
@@ -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