diff options
| author | Francisco Jerez <[email protected]> | 2016-05-17 16:03:17 +0200 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2016-07-11 20:34:35 -0700 |
| commit | 9c7cda27929364804b34424bf4568d767490316d (patch) | |
| tree | 4f278b1c1c42ca5d77e17a57035b78f39705b7b9 /src/gallium | |
| parent | c2e37fe1f95916c7669fe84118acd2e3683ae077 (diff) | |
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 <[email protected]>
Tested-by: Jan Vesely <[email protected]>
Diffstat (limited to 'src/gallium')
4 files changed, 3 insertions, 37 deletions
diff --git a/src/gallium/state_trackers/clover/Makefile.sources b/src/gallium/state_trackers/clover/Makefile.sources index a474130322c..e9828b107b5 100644 --- 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 index 572a9f43762..00000000000 --- 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 95dfd8edca7..76f16d2f9f1 100644 --- 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 9e90c509f25..5b3530c3829 100644 --- 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 { |