Remove Op* prefix for constants

This commit is contained in:
ReinUsesLisp 2018-11-03 21:32:37 -03:00
parent 1cd11815db
commit 5830eca337
2 changed files with 18 additions and 18 deletions

View file

@ -132,24 +132,24 @@ class Module {
// Constant
/// Returns a true scalar constant.
Id OpConstantTrue(Id result_type);
Id ConstantTrue(Id result_type);
/// Returns a false scalar constant.
Id OpConstantFalse(Id result_type);
Id ConstantFalse(Id result_type);
/// Returns a numeric scalar constant.
Id OpConstant(Id result_type, const Literal& literal);
Id Constant(Id result_type, const Literal& literal);
/// Returns a numeric scalar constant.
Id OpConstantComposite(Id result_type, const std::vector<Id>& constituents);
Id ConstantComposite(Id result_type, const std::vector<Id>& constituents);
/// Returns a sampler constant.
Id OpConstantSampler(Id result_type,
spv::SamplerAddressingMode addressing_mode,
bool normalized, spv::SamplerFilterMode filter_mode);
Id ConstantSampler(Id result_type,
spv::SamplerAddressingMode addressing_mode,
bool normalized, spv::SamplerFilterMode filter_mode);
/// Returns a null constant value.
Id OpConstantNull(Id result_type);
Id ConstantNull(Id result_type);
// Function

View file

@ -10,34 +10,34 @@
namespace Sirit {
Id Module::OpConstantTrue(Id result_type) {
Id Module::ConstantTrue(Id result_type) {
return AddDeclaration(
std::make_unique<Op>(spv::Op::OpConstantTrue, bound, result_type));
}
Id Module::OpConstantFalse(Id result_type) {
Id Module::ConstantFalse(Id result_type) {
return AddDeclaration(
std::make_unique<Op>(spv::Op::OpConstantFalse, bound, result_type));
}
Id Module::OpConstant(Id result_type, const Literal& literal) {
Id Module::Constant(Id result_type, const Literal& literal) {
auto op{std::make_unique<Op>(spv::Op::OpConstant, bound, result_type)};
op->Add(literal);
return AddDeclaration(std::move(op));
}
Id Module::OpConstantComposite(Id result_type,
const std::vector<Id>& constituents) {
Id Module::ConstantComposite(Id result_type,
const std::vector<Id>& constituents) {
auto op{
std::make_unique<Op>(spv::Op::OpConstantComposite, bound, result_type)};
op->Add(constituents);
return AddDeclaration(std::move(op));
}
Id Module::OpConstantSampler(Id result_type,
spv::SamplerAddressingMode addressing_mode,
bool normalized,
spv::SamplerFilterMode filter_mode) {
Id Module::ConstantSampler(Id result_type,
spv::SamplerAddressingMode addressing_mode,
bool normalized,
spv::SamplerFilterMode filter_mode) {
AddCapability(spv::Capability::LiteralSampler);
AddCapability(spv::Capability::Kernel);
auto op{
@ -48,7 +48,7 @@ Id Module::OpConstantSampler(Id result_type,
return AddDeclaration(std::move(op));
}
Id Module::OpConstantNull(Id result_type) {
Id Module::ConstantNull(Id result_type) {
return AddDeclaration(
std::make_unique<Op>(spv::Op::OpConstantNull, bound, result_type));
}