mirrors-yuzu-emu/sirit
1
0
Fork 0
mirror of https://github.com/yuzu-emu/sirit synced 2024-11-22 17:23:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for sparse texture instructions

Browse source
This commit is contained in:
ReinUsesLisp 2021-03-08 18:31:00 -03:00
parent f6a7130486
commit 4b1ff612c4
2 changed files with 195 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

202
include/sirit/sirit.h
View file

@ -69,9 +69,9 @@ public:
// TODO: Change std::is_convertible_v to std::convertible_to when compilers // TODO: Change std::is_convertible_v to std::convertible_to when compilers
// support it; same elsewhere. // support it; same elsewhere.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) void AddEntryPoint(
void AddEntryPoint(spv::ExecutionModel execution_model, Id entry_point, std::string_view name, spv::ExecutionModel execution_model, Id entry_point, std::string_view name,
Ts&&... interfaces) { Ts&&... interfaces) {
AddEntryPoint(execution_model, std::move(entry_point), name, AddEntryPoint(execution_model, std::move(entry_point), name,
std::span<const Id>({interfaces...})); std::span<const Id>({interfaces...}));
} }
@ -82,8 +82,8 @@ public:
/// Declare an execution mode for an entry point. /// Declare an execution mode for an entry point.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Literal>) requires(...&& std::is_convertible_v<Ts, Literal>) void AddExecutionMode(
void AddExecutionMode(Id entry_point, spv::ExecutionMode mode, Ts&&... literals) { Id entry_point, spv::ExecutionMode mode, Ts&&... literals) {
AddExecutionMode(entry_point, mode, std::span<const Literal>({literals...})); AddExecutionMode(entry_point, mode, std::span<const Literal>({literals...}));
} }
@ -161,8 +161,7 @@ public:
/// Returns type struct. /// Returns type struct.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id TypeStruct(Ts&&... members) {
Id TypeStruct(Ts&&... members) {
return TypeStruct(std::span<const Id>({members...})); return TypeStruct(std::span<const Id>({members...}));
} }
@ -177,8 +176,8 @@ public:
/// Returns type function. /// Returns type function.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id TypeFunction(Id return_type, Ts&&... arguments) { TypeFunction(Id return_type, Ts&&... arguments) {
return TypeFunction(return_type, std::span<const Id>({arguments...})); return TypeFunction(return_type, std::span<const Id>({arguments...}));
} }
@ -213,8 +212,8 @@ public:
/// Returns a numeric scalar constant. /// Returns a numeric scalar constant.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id ConstantComposite(Id result_type, Ts&&... constituents) { ConstantComposite(Id result_type, Ts&&... constituents) {
return ConstantComposite(result_type, std::span<const Id>({constituents...})); return ConstantComposite(result_type, std::span<const Id>({constituents...}));
} }
@ -238,8 +237,8 @@ public:
/// Call a function. /// Call a function.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpFunctionCall(Id result_type, Id function, Ts&&... arguments) { OpFunctionCall(Id result_type, Id function, Ts&&... arguments) {
return OpFunctionCall(result_type, function, std::span<const Id>({arguments...})); return OpFunctionCall(result_type, function, std::span<const Id>({arguments...}));
} }
@ -257,9 +256,9 @@ public:
/// Declare a structured loop. /// Declare a structured loop.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpLoopMerge(Id merge_block, Id continue_target, spv::LoopControlMask loop_control, OpLoopMerge(Id merge_block, Id continue_target, spv::LoopControlMask loop_control,
Ts&&... literals) { Ts&&... literals) {
return OpLoopMerge(merge_block, continue_target, loop_control, return OpLoopMerge(merge_block, continue_target, loop_control,
std::span<const Id>({literals...})); std::span<const Id>({literals...}));
} }
@ -329,8 +328,8 @@ public:
/// 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.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpAccessChain(Id result_type, Id base, Ts&&... indexes) { OpAccessChain(Id result_type, Id base, Ts&&... indexes) {
return OpAccessChain(result_type, base, std::span<const Id>({indexes...})); return OpAccessChain(result_type, base, std::span<const Id>({indexes...}));
} }
@ -346,8 +345,8 @@ public:
/// Make a copy of a composite object, while modifying one part of it. /// Make a copy of a composite object, while modifying one part of it.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Literal>) requires(...&& std::is_convertible_v<Ts, Literal>) Id
Id OpCompositeInsert(Id result_type, Id object, Id composite, Ts&&... indexes) { OpCompositeInsert(Id result_type, Id object, Id composite, Ts&&... indexes) {
const Literal stack_indexes[] = {std::forward<Ts>(indexes)...}; const Literal stack_indexes[] = {std::forward<Ts>(indexes)...};
return OpCompositeInsert(result_type, object, composite, return OpCompositeInsert(result_type, object, composite,
std::span<const Literal>{stack_indexes}); std::span<const Literal>{stack_indexes});
@ -358,8 +357,8 @@ public:
/// Extract a part of a composite object. /// Extract a part of a composite object.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Literal>) requires(...&& std::is_convertible_v<Ts, Literal>) Id
Id OpCompositeExtract(Id result_type, Id composite, Ts&&... indexes) { OpCompositeExtract(Id result_type, Id composite, Ts&&... indexes) {
const Literal stack_indexes[] = {std::forward<Ts>(indexes)...}; const Literal stack_indexes[] = {std::forward<Ts>(indexes)...};
return OpCompositeExtract(result_type, composite, std::span<const Literal>{stack_indexes}); return OpCompositeExtract(result_type, composite, std::span<const Literal>{stack_indexes});
} }
@ -369,8 +368,8 @@ public:
/// Construct a new composite object from a set of constituent objects that will fully form it. /// Construct a new composite object from a set of constituent objects that will fully form it.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpCompositeConstruct(Id result_type, Ts&&... ids) { OpCompositeConstruct(Id result_type, Ts&&... ids) {
return OpCompositeConstruct(result_type, std::span<const Id>({ids...})); return OpCompositeConstruct(result_type, std::span<const Id>({ids...}));
} }
@ -381,16 +380,15 @@ public:
/// Add a decoration to target. /// Add a decoration to target.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Literal>) requires(...&& std::is_convertible_v<Ts, Literal>) Id
Id Decorate(Id target, spv::Decoration decoration, Ts&&... literals) { Decorate(Id target, spv::Decoration decoration, Ts&&... literals) {
const Literal stack_literals[] = {std::forward<Ts>(literals)...}; const Literal stack_literals[] = {std::forward<Ts>(literals)...};
return Decorate(target, decoration, std::span<const Literal>{stack_literals}); return Decorate(target, decoration, std::span<const Literal>{stack_literals});
} }
/// Add a decoration to target. /// Add a decoration to target.
template <typename T> template <typename T>
requires std::is_enum_v<T> requires std::is_enum_v<T> Id Decorate(Id target, spv::Decoration decoration, T literal) {
Id Decorate(Id target, spv::Decoration decoration, T literal) {
return Decorate(target, decoration, static_cast<std::uint32_t>(literal)); return Decorate(target, decoration, static_cast<std::uint32_t>(literal));
} }
@ -398,9 +396,9 @@ public:
std::span<const Literal> literals = {}); std::span<const Literal> literals = {});
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Literal>) requires(...&& std::is_convertible_v<Ts, Literal>) Id
Id MemberDecorate(Id structure_type, Literal member, spv::Decoration decoration, MemberDecorate(Id structure_type, Literal member, spv::Decoration decoration,
Ts&&... literals) { Ts&&... literals) {
const Literal stack_literals[] = {std::forward<Ts>(literals)...}; const Literal stack_literals[] = {std::forward<Ts>(literals)...};
return MemberDecorate(structure_type, member, decoration, return MemberDecorate(structure_type, member, decoration,
std::span<const Literal>{stack_literals}); std::span<const Literal>{stack_literals});
@ -662,10 +660,9 @@ public:
/// Execute an instruction in an imported set of extended instructions. /// Execute an instruction in an imported set of extended instructions.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpExtInst(Id result_type, Id set, std::uint32_t instruction, Ts&&... operands) { OpExtInst(Id result_type, Id set, std::uint32_t instruction, Ts&&... operands) {
return OpExtInst(result_type, set, instruction, return OpExtInst(result_type, set, instruction, std::span<const Id>({operands...}));
std::span<const Id>({operands...}));
} }
/// Result is x if x >= 0; otherwise result is -x. /// Result is x if x >= 0; otherwise result is -x.
@ -819,9 +816,9 @@ public:
/// Sample an image with an implicit level of detail. /// Sample an image with an implicit level of detail.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageSampleImplicitLod(Id result_type, Id sampled_image, Id coordinate, OpImageSampleImplicitLod(Id result_type, Id sampled_image, Id coordinate,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageSampleImplicitLod(result_type, sampled_image, coordinate, image_operands, return OpImageSampleImplicitLod(result_type, sampled_image, coordinate, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -833,9 +830,9 @@ public:
/// Sample an image using an explicit level of detail. /// Sample an image using an explicit level of detail.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageSampleExplicitLod(Id result_type, Id sampled_image, Id coordinate, OpImageSampleExplicitLod(Id result_type, Id sampled_image, Id coordinate,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageSampleExplicitLod(result_type, sampled_image, coordinate, image_operands, return OpImageSampleExplicitLod(result_type, sampled_image, coordinate, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -847,12 +844,11 @@ 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.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageSampleDrefImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref, OpImageSampleDrefImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageSampleDrefImplicitLod(result_type, sampled_image, coordinate, dref, return OpImageSampleDrefImplicitLod(result_type, sampled_image, coordinate, dref,
image_operands, image_operands, std::span<const Id>({operands...}));
std::span<const Id>({operands...}));
} }
/// Sample an image doing depth-comparison using an explicit level of detail. /// Sample an image doing depth-comparison using an explicit level of detail.
@ -862,12 +858,11 @@ public:
/// Sample an image doing depth-comparison using an explicit level of detail. /// Sample an image doing depth-comparison using an explicit level of detail.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageSampleDrefExplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref, OpImageSampleDrefExplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageSampleDrefExplicitLod(result_type, sampled_image, coordinate, dref, return OpImageSampleDrefExplicitLod(result_type, sampled_image, coordinate, dref,
image_operands, image_operands, 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.
@ -877,9 +872,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.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageSampleProjImplicitLod(Id result_type, Id sampled_image, Id coordinate, OpImageSampleProjImplicitLod(Id result_type, Id sampled_image, Id coordinate,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageSampleProjImplicitLod(result_type, sampled_image, coordinate, image_operands, return OpImageSampleProjImplicitLod(result_type, sampled_image, coordinate, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -891,9 +886,9 @@ public:
/// Sample an image with a project coordinate using an explicit level of detail. /// Sample an image with a project coordinate using an explicit level of detail.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageSampleProjExplicitLod(Id result_type, Id sampled_image, Id coordinate, OpImageSampleProjExplicitLod(Id result_type, Id sampled_image, Id coordinate,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageSampleProjExplicitLod(result_type, sampled_image, coordinate, image_operands, return OpImageSampleProjExplicitLod(result_type, sampled_image, coordinate, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -907,12 +902,11 @@ 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.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageSampleProjDrefImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref, OpImageSampleProjDrefImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageSampleProjDrefImplicitLod(result_type, sampled_image, coordinate, dref, return OpImageSampleProjDrefImplicitLod(result_type, sampled_image, coordinate, dref,
image_operands, image_operands, std::span<const Id>({operands...}));
std::span<const Id>({operands...}));
} }
/// Sample an image with a project coordinate, doing depth-comparison, using an explicit level /// Sample an image with a project coordinate, doing depth-comparison, using an explicit level
@ -924,12 +918,11 @@ public:
/// Sample an image with a project coordinate, doing depth-comparison, using an explicit level /// Sample an image with a project coordinate, doing depth-comparison, using an explicit level
/// of detail. /// of detail.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageSampleProjDrefExplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref, OpImageSampleProjDrefExplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageSampleProjDrefExplicitLod(result_type, sampled_image, coordinate, dref, return OpImageSampleProjDrefExplicitLod(result_type, sampled_image, coordinate, dref,
image_operands, image_operands, 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.
@ -939,9 +932,9 @@ 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.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageFetch(Id result_type, Id sampled_image, Id coordinate, OpImageFetch(Id result_type, Id sampled_image, Id coordinate,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageFetch(result_type, sampled_image, coordinate, image_operands, return OpImageFetch(result_type, sampled_image, coordinate, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -953,9 +946,9 @@ public:
/// Gathers the requested component from four texels. /// Gathers the requested component from four texels.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageGather(Id result_type, Id sampled_image, Id coordinate, Id component, OpImageGather(Id result_type, Id sampled_image, Id coordinate, Id component,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageGather(result_type, sampled_image, coordinate, component, image_operands, return OpImageGather(result_type, sampled_image, coordinate, component, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -967,9 +960,9 @@ public:
/// Gathers the requested depth-comparison from four texels. /// Gathers the requested depth-comparison from four texels.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageDrefGather(Id result_type, Id sampled_image, Id coordinate, Id dref, OpImageDrefGather(Id result_type, Id sampled_image, Id coordinate, Id dref,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageDrefGather(result_type, sampled_image, coordinate, dref, image_operands, return OpImageDrefGather(result_type, sampled_image, coordinate, dref, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -981,9 +974,9 @@ public:
/// Read a texel from an image without a sampler. /// Read a texel from an image without a sampler.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageRead(Id result_type, Id sampled_image, Id coordinate, OpImageRead(Id result_type, Id sampled_image, Id coordinate,
spv::ImageOperandsMask image_operands, Ts&&... operands) { spv::ImageOperandsMask image_operands, Ts&&... operands) {
return OpImageRead(result_type, sampled_image, coordinate, image_operands, return OpImageRead(result_type, sampled_image, coordinate, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -995,9 +988,9 @@ public:
/// Write a texel to an image without a sampler. /// Write a texel to an image without a sampler.
template <typename... Ts> template <typename... Ts>
requires (... && std::is_convertible_v<Ts, Id>) requires(...&& std::is_convertible_v<Ts, Id>) Id
Id OpImageWrite(Id image, Id coordinate, Id texel, spv::ImageOperandsMask image_operands, OpImageWrite(Id image, Id coordinate, Id texel, spv::ImageOperandsMask image_operands,
Ts&&... operands) { Ts&&... operands) {
return OpImageWrite(image, coordinate, texel, image_operands, return OpImageWrite(image, coordinate, texel, image_operands,
std::span<const Id>({operands...})); std::span<const Id>({operands...}));
} }
@ -1021,6 +1014,50 @@ public:
/// Query the number of samples available per texel fetch in a multisample image. /// Query the number of samples available per texel fetch in a multisample image.
Id OpImageQuerySamples(Id result_type, Id image); Id OpImageQuerySamples(Id result_type, Id image);
/// Sample a sparse image with an implicit level of detail.
Id OpImageSparseSampleImplicitLod(Id result_type, Id sampled_image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands);
/// Sample a sparse image using an explicit level of detail.
Id OpImageSparseSampleExplicitLod(Id result_type, Id sampled_image, Id coordinate,
spv::ImageOperandsMask image_operands,
std::span<const Id> operands);
/// Sample a sparse image doing depth-comparison with an implicit level of detail.
Id OpImageSparseSampleDrefImplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands);
/// Sample a sparse image doing depth-comparison using an explicit level of detail.
Id OpImageSparseSampleDrefExplicitLod(Id result_type, Id sampled_image, Id coordinate, Id dref,
spv::ImageOperandsMask image_operands,
std::span<const Id> operands);
/// Fetch a single texel from a sampled sparse image.
Id OpImageSparseFetch(Id result_type, Id image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands);
/// Gathers the requested component from four texels of a sparse image.
Id OpImageSparseGather(Id result_type, Id sampled_image, Id coordinate, Id component,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands);
/// Gathers the requested depth-comparison from four texels of a sparse image.
Id OpImageSparseDrefGather(Id result_type, Id sampled_image, Id coordinate, Id dref,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands);
/// Translates a Resident Code into a Boolean. Result is false if any of the texels were in
/// uncommitted texture memory, and true otherwise.
Id OpImageSparseTexelsResident(Id result_type, Id resident_code);
/// Read a texel from a sparse image without a sampler.
Id OpImageSparseRead(Id result_type, Id image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands);
// Group // Group
/// Computes a bitfield value combining the Predicate value from all invocations in the current /// Computes a bitfield value combining the Predicate value from all invocations in the current
@ -1190,7 +1227,6 @@ private:
std::unique_ptr<Declarations> declarations; std::unique_ptr<Declarations> declarations;
std::unique_ptr<Stream> global_variables; std::unique_ptr<Stream> global_variables;
std::unique_ptr<Stream> code; std::unique_ptr<Stream> code;
}; };
} // namespace Sirit } // namespace Sirit

79
src/instructions/image.cpp
View file

@ -10,6 +10,8 @@
#include "stream.h" #include "stream.h"
#pragma optimize("", off)
namespace Sirit { namespace Sirit {
#define DEFINE_IMAGE_OP(opcode) \ #define DEFINE_IMAGE_OP(opcode) \
@ -24,8 +26,8 @@ namespace Sirit {
#define DEFINE_IMAGE_EXP_OP(opcode) \ #define DEFINE_IMAGE_EXP_OP(opcode) \
Id Module::opcode(Id result_type, Id sampled_image, Id coordinate, \ Id Module::opcode(Id result_type, Id sampled_image, Id coordinate, \
spv::ImageOperandsMask image_operands, std::span<const Id> operands) { \ spv::ImageOperandsMask image_operands, std::span<const Id> operands) { \
code->Reserve(7 + operands.size()); \ code->Reserve(6 + operands.size()); \
return *code << OpId{spv::Op::OpDecorate, result_type} << sampled_image << coordinate \ return *code << OpId{spv::Op::opcode, result_type} << sampled_image << coordinate \
<< image_operands << operands << EndOp{}; \ << image_operands << operands << EndOp{}; \
} }
@ -55,7 +57,7 @@ namespace Sirit {
#define DEFINE_IMAGE_QUERY_BIN_OP(opcode) \ #define DEFINE_IMAGE_QUERY_BIN_OP(opcode) \
Id Module::opcode(Id result_type, Id image, Id extra) { \ Id Module::opcode(Id result_type, Id image, Id extra) { \
code->Reserve(5); \ code->Reserve(5); \
return *code << OpId{spv::Op::OpDecorate, result_type} << image << extra << EndOp{}; \ return *code << OpId{spv::Op::opcode, result_type} << image << extra << EndOp{}; \
} }
DEFINE_IMAGE_OP(OpImageSampleImplicitLod) DEFINE_IMAGE_OP(OpImageSampleImplicitLod)
@ -95,4 +97,75 @@ Id Module::OpImage(Id result_type, Id sampled_image) {
return *code << OpId{spv::Op::OpImage, result_type} << sampled_image << EndOp{}; return *code << OpId{spv::Op::OpImage, result_type} << sampled_image << EndOp{};
} }
Id Module::OpImageSparseSampleImplicitLod(Id result_type, Id sampled_image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands) {
code->Reserve(5 + (image_operands.has_value() ? 1 : 0) + operands.size());
return *code << OpId{spv::Op::OpImageSparseSampleImplicitLod, result_type} << sampled_image
<< coordinate << image_operands << operands << EndOp{};
}
Id Module::OpImageSparseSampleExplicitLod(Id result_type, Id sampled_image, Id coordinate,
spv::ImageOperandsMask image_operands,
std::span<const Id> operands) {
code->Reserve(6 + operands.size());
return *code << OpId{spv::Op::OpImageSparseSampleExplicitLod, result_type} << sampled_image
<< coordinate << image_operands << operands << EndOp{};
}
Id Module::OpImageSparseSampleDrefImplicitLod(Id result_type, Id sampled_image, Id coordinate,
Id dref,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands) {
code->Reserve(6 + (image_operands.has_value() ? 1 : 0) + operands.size());
return *code << OpId{spv::Op::OpImageSparseSampleDrefImplicitLod, result_type} << sampled_image
<< coordinate << dref << image_operands << operands << EndOp{};
}
Id Module::OpImageSparseSampleDrefExplicitLod(Id result_type, Id sampled_image, Id coordinate,
Id dref, spv::ImageOperandsMask image_operands,
std::span<const Id> operands) {
code->Reserve(7 + operands.size());
return *code << OpId{spv::Op::OpImageSparseSampleDrefExplicitLod, result_type} << sampled_image
<< coordinate << dref << image_operands << operands << EndOp{};
}
Id Module::OpImageSparseFetch(Id result_type, Id image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands) {
code->Reserve(5 + (image_operands.has_value() ? 1 : 0) + operands.size());
return *code << OpId{spv::Op::OpImageSparseFetch, result_type} << image << coordinate
<< image_operands << operands << EndOp{};
}
Id Module::OpImageSparseGather(Id result_type, Id sampled_image, Id coordinate, Id component,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands) {
code->Reserve(6 + operands.size());
return *code << OpId{spv::Op::OpImageSparseGather, result_type} << sampled_image << coordinate
<< component << image_operands << operands << EndOp{};
}
Id Module::OpImageSparseDrefGather(Id result_type, Id sampled_image, Id coordinate, Id dref,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands) {
code->Reserve(6 + operands.size());
return *code << OpId{spv::Op::OpImageSparseDrefGather, result_type} << sampled_image
<< coordinate << dref << image_operands << operands << EndOp{};
}
Id Module::OpImageSparseTexelsResident(Id result_type, Id resident_code) {
code->Reserve(4);
return *code << OpId{spv::Op::OpImageSparseTexelsResident, result_type} << resident_code
<< EndOp{};
}
Id Module::OpImageSparseRead(Id result_type, Id image, Id coordinate,
std::optional<spv::ImageOperandsMask> image_operands,
std::span<const Id> operands) {
code->Reserve(5 + (image_operands.has_value() ? 1 : 0) + operands.size());
return *code << OpId{spv::Op::OpImageSparseTexelsResident, result_type} << image << coordinate
<< image_operands << operands << EndOp{};
}
} // namespace Sirit } // namespace Sirit