mirrors/sirit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Fix declarations hashing"

Browse source 
This reverts commit bb6a3421d2.
This commit is contained in:
ReinUsesLisp 2019-09-09 16:47:58 -03:00
parent bb6a3421d2
commit 58c5406436
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/sirit/sirit.h
View file

@ -920,15 +920,6 @@ public:
Id OpImageQuerySamples(Id result_type, Id image); Id OpImageQuerySamples(Id result_type, Id image);
private: private:
struct HashOp {
std::size_t operator()(const std::unique_ptr<Op>& op) const noexcept;
};
struct EqualOp {
bool operator()(const std::unique_ptr<Op>& lhs, const std::unique_ptr<Op>& rhs) const
noexcept;
};
Id AddCode(std::unique_ptr<Op> op); Id AddCode(std::unique_ptr<Op> op);
Id AddCode(spv::Op opcode, std::optional<std::uint32_t> id = {}); Id AddCode(spv::Op opcode, std::optional<std::uint32_t> id = {});
@ -954,7 +945,7 @@ private:
std::vector<std::unique_ptr<Op>> execution_modes; std::vector<std::unique_ptr<Op>> execution_modes;
std::vector<std::unique_ptr<Op>> debug; std::vector<std::unique_ptr<Op>> debug;
std::vector<std::unique_ptr<Op>> annotations; std::vector<std::unique_ptr<Op>> annotations;
std::unordered_set<std::unique_ptr<Op>, HashOp, EqualOp> declarations; std::unordered_set<std::unique_ptr<Op>> declarations;
std::vector<Id> sorted_declarations; std::vector<Id> sorted_declarations;
std::vector<Id> global_variables; std::vector<Id> global_variables;

9
src/sirit.cpp
View file

@ -20,15 +20,6 @@ static void WriteSet(Stream& stream, const T& set) {
} }
} }
std::size_t Module::HashOp::operator()(const std::unique_ptr<Op>& op) const noexcept {
return op->Hash();
}
bool Module::EqualOp::operator()(const std::unique_ptr<Op>& lhs,
const std::unique_ptr<Op>& rhs) const noexcept {
return *lhs == *rhs;
}
Module::Module(u32 version) : version(version) {} Module::Module(u32 version) : version(version) {}
Module::~Module() = default; Module::~Module() = default;