mirror of
https://git.suyu.dev/suyu/sirit.git
synced 2024-12-22 20:22:02 +00:00
CMakeLists: Apply compilation flags to the sirit target
Previously this wasn't utilizing any of the compiler flags, meaning it wasn't applying any of the specified warnings. Since applying the warnings to the target, this uncovered a few warning cases, such as shadowing class variables on MSVC, etc, which have been fixed.
This commit is contained in:
parent
1869de6d75
commit
47d85b81a7
6 changed files with 12 additions and 9 deletions
|
@ -46,7 +46,7 @@ public:
|
||||||
void AddCapability(spv::Capability capability);
|
void AddCapability(spv::Capability capability);
|
||||||
|
|
||||||
/// Sets module memory model.
|
/// Sets module memory model.
|
||||||
void SetMemoryModel(spv::AddressingModel addressing_model, spv::MemoryModel memory_model);
|
void SetMemoryModel(spv::AddressingModel addressing_model_, spv::MemoryModel memory_model_);
|
||||||
|
|
||||||
/// Adds an entry point.
|
/// Adds an entry point.
|
||||||
void AddEntryPoint(spv::ExecutionModel execution_model, Id entry_point, std::string name,
|
void AddEntryPoint(spv::ExecutionModel execution_model, Id entry_point, std::string name,
|
||||||
|
|
|
@ -27,6 +27,9 @@ add_library(sirit
|
||||||
instructions/extension.cpp
|
instructions/extension.cpp
|
||||||
instructions/image.cpp
|
instructions/image.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
target_compile_options(sirit PRIVATE ${SIRIT_CXX_FLAGS})
|
||||||
|
|
||||||
target_include_directories(sirit
|
target_include_directories(sirit
|
||||||
PUBLIC ../include
|
PUBLIC ../include
|
||||||
PRIVATE . ${SPIRV-Headers_SOURCE_DIR}/include
|
PRIVATE . ${SPIRV-Headers_SOURCE_DIR}/include
|
||||||
|
|
|
@ -67,8 +67,8 @@ void Op::Sink(Operand* operand) {
|
||||||
operand_store.push_back(std::unique_ptr<Operand>(operand));
|
operand_store.push_back(std::unique_ptr<Operand>(operand));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Op::Sink(const std::vector<Operand*>& operands) {
|
void Op::Sink(const std::vector<Operand*>& operands_) {
|
||||||
for (auto* operand : operands) {
|
for (auto* operand : operands_) {
|
||||||
Sink(operand);
|
Sink(operand);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
2
src/op.h
2
src/op.h
|
@ -28,7 +28,7 @@ public:
|
||||||
|
|
||||||
void Sink(Operand* operand);
|
void Sink(Operand* operand);
|
||||||
|
|
||||||
void Sink(const std::vector<Operand*>& operands);
|
void Sink(const std::vector<Operand*>& operands_);
|
||||||
|
|
||||||
void Add(const Literal& literal);
|
void Add(const Literal& literal);
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ Operand::Operand() = default;
|
||||||
|
|
||||||
Operand::~Operand() = default;
|
Operand::~Operand() = default;
|
||||||
|
|
||||||
void Operand::Fetch(Stream& stream) const {
|
void Operand::Fetch([[maybe_unused]] Stream& stream) const {
|
||||||
assert(!"Fetching unimplemented operand");
|
assert(!"Fetching unimplemented operand");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ u16 Operand::GetWordCount() const {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Operand::operator==(const Operand& other) const {
|
bool Operand::operator==([[maybe_unused]] const Operand& other) const {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -74,9 +74,9 @@ void Module::AddCapability(spv::Capability capability) {
|
||||||
capabilities.insert(capability);
|
capabilities.insert(capability);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Module::SetMemoryModel(spv::AddressingModel addressing_model, spv::MemoryModel memory_model) {
|
void Module::SetMemoryModel(spv::AddressingModel addressing_model_, spv::MemoryModel memory_model_) {
|
||||||
this->addressing_model = addressing_model;
|
this->addressing_model = addressing_model_;
|
||||||
this->memory_model = memory_model;
|
this->memory_model = memory_model_;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Module::AddEntryPoint(spv::ExecutionModel execution_model, Id entry_point,
|
void Module::AddEntryPoint(spv::ExecutionModel execution_model, Id entry_point,
|
||||||
|
|
Loading…
Reference in a new issue