clover/core: Remove compiler.hpp.

header_map was the only definition left in compiler.hpp, move it into
program.hpp which is its only user in clover/core.

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 a474130322cd1547dcac83d3899f12bc6655e77b..e9828b107b520997014c86b71dcae904f582d505 100644 (file)
--- a/src/gallium/state_trackers/clover/Makefile.sources
+++ b/src/gallium/state_trackers/clover/Makefile.sources
@@ -13,7 +13,6 @@ CPP_SOURCES := \
        api/sampler.cpp \
        api/transfer.cpp \
        api/util.hpp \
-       core/compiler.hpp \
        core/context.cpp \
        core/context.hpp \
        core/device.cpp \

diff --git a/src/gallium/state_trackers/clover/core/compiler.hpp b/src/gallium/state_trackers/clover/core/compiler.hpp
deleted file mode 100644 (file)
index 572a9f4..0000000
--- a/src/gallium/state_trackers/clover/core/compiler.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright 2012 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_CORE_COMPILER_HPP
-#define CLOVER_CORE_COMPILER_HPP
-
-#include "core/error.hpp"
-#include "core/module.hpp"
-#include "pipe/p_defines.h"
-
-namespace clover {
-   typedef std::vector<std::pair<std::string, std::string> > header_map;
-}
-
-#endif

diff --git a/src/gallium/state_trackers/clover/core/program.hpp b/src/gallium/state_trackers/clover/core/program.hpp
index 95dfd8edca7eb993abe365c735fc23374a0a5c26..76f16d2f9f1d1d5fb2783bdb8457213ba0e8c5f6 100644 (file)
--- a/src/gallium/state_trackers/clover/core/program.hpp
+++ b/src/gallium/state_trackers/clover/core/program.hpp
@@ -28,9 +28,10 @@
 #include "core/object.hpp"
 #include "core/context.hpp"
 #include "core/module.hpp"
-#include "core/compiler.hpp"
 
 namespace clover {
+   typedef std::vector<std::pair<std::string, std::string>> header_map;
+
    class program : public ref_counter, public _cl_program {
    private:
       typedef adaptor_range<

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.hpp b/src/gallium/state_trackers/clover/llvm/invocation.hpp
index 9e90c509f25f60cb81658909ee6ae64ab9326c8d..5b3530c382938f0010ae94b61c5dd75d7addf3a7 100644 (file)
--- a/src/gallium/state_trackers/clover/llvm/invocation.hpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.hpp
@@ -23,9 +23,9 @@
 #ifndef CLOVER_LLVM_INVOCATION_HPP
 #define CLOVER_LLVM_INVOCATION_HPP
 
-#include "core/compiler.hpp"
 #include "core/error.hpp"
 #include "core/module.hpp"
+#include "core/program.hpp"
 #include "pipe/p_defines.h"
 
 namespace clover {