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

Use std::nullopt when possible

Browse source
This commit is contained in:
ReinUsesLisp 2021-04-11 02:04:17 -03:00
parent 51d541f1a1
commit dc47faf89f
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
include/sirit/sirit.h
View file

@ -108,11 +108,11 @@ public:
/// Adds a local variable to the code /// Adds a local variable to the code
Id AddLocalVariable(Id result_type, spv::StorageClass storage_class, Id AddLocalVariable(Id result_type, spv::StorageClass storage_class,
std::optional<Id> initializer = {}); std::optional<Id> initializer = std::nullopt);
/// Adds a global variable /// Adds a global variable
Id AddGlobalVariable(Id result_type, spv::StorageClass storage_class, Id AddGlobalVariable(Id result_type, spv::StorageClass storage_class,
std::optional<Id> initializer = {}); std::optional<Id> initializer = std::nullopt);
// Types // Types
@ -137,7 +137,7 @@ public:
/// Returns type image. /// Returns type image.
Id TypeImage(Id sampled_type, spv::Dim dim, int depth, bool arrayed, bool ms, int sampled, Id TypeImage(Id sampled_type, spv::Dim dim, int depth, bool arrayed, bool ms, int sampled,
spv::ImageFormat image_format, spv::ImageFormat image_format,
std::optional<spv::AccessQualifier> access_qualifier = {}); std::optional<spv::AccessQualifier> access_qualifier = std::nullopt);
/// Returns type sampler. /// Returns type sampler.
Id TypeSampler(); Id TypeSampler();
@ -328,10 +328,12 @@ public:
Id OpImageTexelPointer(Id result_type, Id image, Id coordinate, Id sample); Id OpImageTexelPointer(Id result_type, Id image, Id coordinate, Id sample);
/// Load through a pointer. /// Load through a pointer.
Id OpLoad(Id result_type, Id pointer, std::optional<spv::MemoryAccessMask> memory_access = {}); Id OpLoad(Id result_type, Id pointer,
std::optional<spv::MemoryAccessMask> memory_access = std::nullopt);
/// Store through a pointer. /// Store through a pointer.
Id OpStore(Id pointer, Id object, std::optional<spv::MemoryAccessMask> memory_access = {}); Id OpStore(Id pointer, Id object,
std::optional<spv::MemoryAccessMask> memory_access = std::nullopt);
/// Create a pointer into a composite object that can be used with OpLoad and OpStore. /// Create a pointer into a composite object that can be used with OpLoad and OpStore.
Id OpAccessChain(Id result_type, Id base, std::span<const Id> indexes = {}); Id OpAccessChain(Id result_type, Id base, std::span<const Id> indexes = {});
@ -821,7 +823,7 @@ public:
/// Sample an image with an implicit level of detail. /// Sample an image with an implicit level of detail.
Id OpImageSampleImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id OpImageSampleImplicitLod(Id result_type, Id sampled_image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands = {}, std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Sample an image with an implicit level of detail. /// Sample an image with an implicit level of detail.
@ -848,8 +850,9 @@ public:
} }
/// Sample an image doing depth-comparison with an implicit level of detail. /// Sample an image doing depth-comparison with an implicit level of detail.
Id OpImageSampleDrefImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref, Id OpImageSampleDrefImplicitLod(
std::optional<spv::ImageOperandsMask> image_operands = {}, Id result_type, Id sampled_image, Id coordinate, Id dref,
std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Sample an image doing depth-comparison with an implicit level of detail. /// Sample an image doing depth-comparison with an implicit level of detail.
@ -876,8 +879,9 @@ public:
} }
/// Sample an image with with a project coordinate and an implicit level of detail. /// Sample an image with with a project coordinate and an implicit level of detail.
Id OpImageSampleProjImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id OpImageSampleProjImplicitLod(
std::optional<spv::ImageOperandsMask> image_operands = {}, Id result_type, Id sampled_image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Sample an image with with a project coordinate and an implicit level of detail. /// Sample an image with with a project coordinate and an implicit level of detail.
@ -905,8 +909,9 @@ public:
/// Sample an image with a project coordinate, doing depth-comparison, with an implicit level of /// Sample an image with a project coordinate, doing depth-comparison, with an implicit level of
/// detail. /// detail.
Id OpImageSampleProjDrefImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref, Id OpImageSampleProjDrefImplicitLod(
std::optional<spv::ImageOperandsMask> image_operands = {}, Id result_type, Id sampled_image, Id coordinate, Id dref,
std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Sample an image with a project coordinate, doing depth-comparison, with an implicit level of /// Sample an image with a project coordinate, doing depth-comparison, with an implicit level of
@ -937,7 +942,7 @@ public:
/// Fetch a single texel from an image whose Sampled operand is 1. /// Fetch a single texel from an image whose Sampled operand is 1.
Id OpImageFetch(Id result_type, Id sampled_image, Id coordinate, Id OpImageFetch(Id result_type, Id sampled_image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands = {}, std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Fetch a single texel from an image whose Sampled operand is 1. /// Fetch a single texel from an image whose Sampled operand is 1.
@ -951,7 +956,7 @@ public:
/// Gathers the requested component from four texels. /// Gathers the requested component from four texels.
Id OpImageGather(Id result_type, Id sampled_image, Id coordinate, Id component, Id OpImageGather(Id result_type, Id sampled_image, Id coordinate, Id component,
std::optional<spv::ImageOperandsMask> image_operands = {}, std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Gathers the requested component from four texels. /// Gathers the requested component from four texels.
@ -965,7 +970,7 @@ public:
/// Gathers the requested depth-comparison from four texels. /// Gathers the requested depth-comparison from four texels.
Id OpImageDrefGather(Id result_type, Id sampled_image, Id coordinate, Id dref, Id OpImageDrefGather(Id result_type, Id sampled_image, Id coordinate, Id dref,
std::optional<spv::ImageOperandsMask> image_operands = {}, std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Gathers the requested depth-comparison from four texels. /// Gathers the requested depth-comparison from four texels.
@ -979,7 +984,7 @@ public:
/// Read a texel from an image without a sampler. /// Read a texel from an image without a sampler.
Id OpImageRead(Id result_type, Id sampled_image, Id coordinate, Id OpImageRead(Id result_type, Id sampled_image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands = {}, std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Read a texel from an image without a sampler. /// Read a texel from an image without a sampler.
@ -993,7 +998,7 @@ public:
/// Write a texel to an image without a sampler. /// Write a texel to an image without a sampler.
Id OpImageWrite(Id image, Id coordinate, Id texel, Id OpImageWrite(Id image, Id coordinate, Id texel,
std::optional<spv::ImageOperandsMask> image_operands = {}, std::optional<spv::ImageOperandsMask> image_operands = std::nullopt,
std::span<const Id> operands = {}); std::span<const Id> operands = {});
/// Write a texel to an image without a sampler. /// Write a texel to an image without a sampler.