octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shader/shader_ir: Simplify constructors for OperationNode 

Many of these constructors don't even need to be templated. The only
ones that need to be templated are the ones that actually make use of
the parameter pack.

Even then, since std::vector accepts an initializer list, we can supply
the parameter pack directly to it instead of creating our own copy of
the list, then copying it again into the std::vector.
This commit is contained in:
Lioncash 2019-05-19 04:47:00 -04:00
parent 81e7e63080
commit 212b148923
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/video_core/shader/shader_ir.h
View File

@ -336,32 +336,23 @@ using Meta = std::variant<MetaArithmetic, MetaTexture, Tegra::Shader::HalfType>;
/// Holds any kind of operation that can be done in the IR /// Holds any kind of operation that can be done in the IR
class OperationNode final { class OperationNode final {
public: public:
template <typename... T> explicit OperationNode(OperationCode code) : code{code} {}
explicit constexpr OperationNode(OperationCode code) : code{code}, meta{} {}
explicit OperationNode(OperationCode code, Meta&& meta) : code{code}, meta{std::move(meta)} {}
template <typename... T> template <typename... T>
explicit constexpr OperationNode(OperationCode code, Meta&& meta) explicit OperationNode(OperationCode code, const T*... operands)
: code{code}, meta{std::move(meta)} {}
template <typename... T>
explicit constexpr OperationNode(OperationCode code, const T*... operands)
: OperationNode(code, {}, operands...) {} : OperationNode(code, {}, operands...) {}
template <typename... T> template <typename... T>
explicit constexpr OperationNode(OperationCode code, Meta&& meta, const T*... operands_) explicit OperationNode(OperationCode code, Meta&& meta, const T*... operands_)
: code{code}, meta{std::move(meta)} { : code{code}, meta{std::move(meta)}, operands{operands_...} {}
auto operands_list = {operands_...};
for (auto& operand : operands_list) {
operands.push_back(operand);
}
}
explicit OperationNode(OperationCode code, Meta&& meta, std::vector<Node>&& operands) explicit OperationNode(OperationCode code, Meta&& meta, std::vector<Node>&& operands)
: code{code}, meta{meta}, operands{std::move(operands)} {} : code{code}, meta{meta}, operands{std::move(operands)} {}
explicit OperationNode(OperationCode code, std::vector<Node>&& operands) explicit OperationNode(OperationCode code, std::vector<Node>&& operands)
: code{code}, meta{}, operands{std::move(operands)} {} : code{code}, operands{std::move(operands)} {}
OperationCode GetCode() const { OperationCode GetCode() const {
return code; return code;