spirv: Use ConstOffset instead of Offset when possible
This commit is contained in:
parent
be431f5ed0
commit
dbbd4b5496
|
@ -97,6 +97,23 @@ public:
|
||||||
|
|
||||||
[[nodiscard]] Id Def(const IR::Value& value);
|
[[nodiscard]] Id Def(const IR::Value& value);
|
||||||
|
|
||||||
|
Id Const(u32 value) {
|
||||||
|
return Constant(U32[1], value);
|
||||||
|
}
|
||||||
|
|
||||||
|
Id Const(u32 element_1, u32 element_2) {
|
||||||
|
return ConstantComposite(U32[2], Const(element_1), Const(element_2));
|
||||||
|
}
|
||||||
|
|
||||||
|
Id Const(u32 element_1, u32 element_2, u32 element_3) {
|
||||||
|
return ConstantComposite(U32[3], Const(element_1), Const(element_2), Const(element_3));
|
||||||
|
}
|
||||||
|
|
||||||
|
Id Const(u32 element_1, u32 element_2, u32 element_3, u32 element_4) {
|
||||||
|
return ConstantComposite(U32[2], Const(element_1), Const(element_2), Const(element_3),
|
||||||
|
Const(element_4));
|
||||||
|
}
|
||||||
|
|
||||||
const Profile& profile;
|
const Profile& profile;
|
||||||
Stage stage{};
|
Stage stage{};
|
||||||
|
|
||||||
|
|
|
@ -490,13 +490,13 @@ Id EmitBoundImageGradient(EmitContext&);
|
||||||
Id EmitBoundImageRead(EmitContext&);
|
Id EmitBoundImageRead(EmitContext&);
|
||||||
Id EmitBoundImageWrite(EmitContext&);
|
Id EmitBoundImageWrite(EmitContext&);
|
||||||
Id EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
Id bias_lc, Id offset);
|
Id bias_lc, const IR::Value& offset);
|
||||||
Id EmitImageSampleExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageSampleExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
Id lod_lc, Id offset);
|
Id lod_lc, const IR::Value& offset);
|
||||||
Id EmitImageSampleDrefImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
Id EmitImageSampleDrefImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
||||||
Id coords, Id dref, Id bias_lc, Id offset);
|
Id coords, Id dref, Id bias_lc, const IR::Value& offset);
|
||||||
Id EmitImageSampleDrefExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
Id EmitImageSampleDrefExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
||||||
Id coords, Id dref, Id lod_lc, Id offset);
|
Id coords, Id dref, Id lod_lc, const IR::Value& offset);
|
||||||
Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
const IR::Value& offset, const IR::Value& offset2);
|
const IR::Value& offset, const IR::Value& offset2);
|
||||||
Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
|
|
|
@ -12,7 +12,7 @@ namespace {
|
||||||
class ImageOperands {
|
class ImageOperands {
|
||||||
public:
|
public:
|
||||||
explicit ImageOperands(EmitContext& ctx, bool has_bias, bool has_lod, bool has_lod_clamp,
|
explicit ImageOperands(EmitContext& ctx, bool has_bias, bool has_lod, bool has_lod_clamp,
|
||||||
Id lod, Id offset) {
|
Id lod, const IR::Value& offset) {
|
||||||
if (has_bias) {
|
if (has_bias) {
|
||||||
const Id bias{has_lod_clamp ? ctx.OpCompositeExtract(ctx.F32[1], lod, 0) : lod};
|
const Id bias{has_lod_clamp ? ctx.OpCompositeExtract(ctx.F32[1], lod, 0) : lod};
|
||||||
Add(spv::ImageOperandsMask::Bias, bias);
|
Add(spv::ImageOperandsMask::Bias, bias);
|
||||||
|
@ -21,9 +21,7 @@ public:
|
||||||
const Id lod_value{has_lod_clamp ? ctx.OpCompositeExtract(ctx.F32[1], lod, 0) : lod};
|
const Id lod_value{has_lod_clamp ? ctx.OpCompositeExtract(ctx.F32[1], lod, 0) : lod};
|
||||||
Add(spv::ImageOperandsMask::Lod, lod_value);
|
Add(spv::ImageOperandsMask::Lod, lod_value);
|
||||||
}
|
}
|
||||||
if (Sirit::ValidId(offset)) {
|
AddOffset(ctx, offset);
|
||||||
Add(spv::ImageOperandsMask::Offset, offset);
|
|
||||||
}
|
|
||||||
if (has_lod_clamp) {
|
if (has_lod_clamp) {
|
||||||
const Id lod_clamp{has_bias ? ctx.OpCompositeExtract(ctx.F32[1], lod, 1) : lod};
|
const Id lod_clamp{has_bias ? ctx.OpCompositeExtract(ctx.F32[1], lod, 1) : lod};
|
||||||
Add(spv::ImageOperandsMask::MinLod, lod_clamp);
|
Add(spv::ImageOperandsMask::MinLod, lod_clamp);
|
||||||
|
@ -96,6 +94,46 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::span<const Id> Span() const noexcept {
|
||||||
|
return std::span{operands.data(), operands.size()};
|
||||||
|
}
|
||||||
|
|
||||||
|
spv::ImageOperandsMask Mask() const noexcept {
|
||||||
|
return mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
void AddOffset(EmitContext& ctx, const IR::Value& offset) {
|
||||||
|
if (offset.IsEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (offset.IsImmediate()) {
|
||||||
|
Add(spv::ImageOperandsMask::ConstOffset, ctx.Constant(ctx.U32[1], offset.U32()));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
IR::Inst* const inst{offset.InstRecursive()};
|
||||||
|
if (inst->AreAllArgsImmediates()) {
|
||||||
|
switch (inst->GetOpcode()) {
|
||||||
|
case IR::Opcode::CompositeConstructU32x2:
|
||||||
|
Add(spv::ImageOperandsMask::ConstOffset,
|
||||||
|
ctx.Const(inst->Arg(0).U32(), inst->Arg(1).U32()));
|
||||||
|
return;
|
||||||
|
case IR::Opcode::CompositeConstructU32x3:
|
||||||
|
Add(spv::ImageOperandsMask::ConstOffset,
|
||||||
|
ctx.Const(inst->Arg(0).U32(), inst->Arg(1).U32(), inst->Arg(2).U32()));
|
||||||
|
return;
|
||||||
|
case IR::Opcode::CompositeConstructU32x4:
|
||||||
|
Add(spv::ImageOperandsMask::ConstOffset,
|
||||||
|
ctx.Const(inst->Arg(0).U32(), inst->Arg(1).U32(), inst->Arg(2).U32(),
|
||||||
|
inst->Arg(3).U32()));
|
||||||
|
return;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Add(spv::ImageOperandsMask::Offset, ctx.Def(offset));
|
||||||
|
}
|
||||||
|
|
||||||
void Add(spv::ImageOperandsMask new_mask, Id value) {
|
void Add(spv::ImageOperandsMask new_mask, Id value) {
|
||||||
mask = static_cast<spv::ImageOperandsMask>(static_cast<unsigned>(mask) |
|
mask = static_cast<spv::ImageOperandsMask>(static_cast<unsigned>(mask) |
|
||||||
static_cast<unsigned>(new_mask));
|
static_cast<unsigned>(new_mask));
|
||||||
|
@ -109,15 +147,6 @@ public:
|
||||||
operands.push_back(value_2);
|
operands.push_back(value_2);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::span<const Id> Span() const noexcept {
|
|
||||||
return std::span{operands.data(), operands.size()};
|
|
||||||
}
|
|
||||||
|
|
||||||
spv::ImageOperandsMask Mask() const noexcept {
|
|
||||||
return mask;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
boost::container::static_vector<Id, 4> operands;
|
boost::container::static_vector<Id, 4> operands;
|
||||||
spv::ImageOperandsMask mask{};
|
spv::ImageOperandsMask mask{};
|
||||||
};
|
};
|
||||||
|
@ -279,7 +308,7 @@ Id EmitBoundImageWrite(EmitContext&) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Id EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
Id bias_lc, Id offset) {
|
Id bias_lc, const IR::Value& offset) {
|
||||||
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
||||||
const ImageOperands operands(ctx, info.has_bias != 0, false, info.has_lod_clamp != 0, bias_lc,
|
const ImageOperands operands(ctx, info.has_bias != 0, false, info.has_lod_clamp != 0, bias_lc,
|
||||||
offset);
|
offset);
|
||||||
|
@ -289,7 +318,7 @@ Id EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value&
|
||||||
}
|
}
|
||||||
|
|
||||||
Id EmitImageSampleExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageSampleExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
Id lod_lc, Id offset) {
|
Id lod_lc, const IR::Value& offset) {
|
||||||
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
||||||
const ImageOperands operands(ctx, false, true, info.has_lod_clamp != 0, lod_lc, offset);
|
const ImageOperands operands(ctx, false, true, info.has_lod_clamp != 0, lod_lc, offset);
|
||||||
return Emit(&EmitContext::OpImageSparseSampleExplicitLod,
|
return Emit(&EmitContext::OpImageSparseSampleExplicitLod,
|
||||||
|
@ -298,7 +327,7 @@ Id EmitImageSampleExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value&
|
||||||
}
|
}
|
||||||
|
|
||||||
Id EmitImageSampleDrefImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
Id EmitImageSampleDrefImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
||||||
Id coords, Id dref, Id bias_lc, Id offset) {
|
Id coords, Id dref, Id bias_lc, const IR::Value& offset) {
|
||||||
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
||||||
const ImageOperands operands(ctx, info.has_bias != 0, false, info.has_lod_clamp != 0, bias_lc,
|
const ImageOperands operands(ctx, info.has_bias != 0, false, info.has_lod_clamp != 0, bias_lc,
|
||||||
offset);
|
offset);
|
||||||
|
@ -308,7 +337,7 @@ Id EmitImageSampleDrefImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Va
|
||||||
}
|
}
|
||||||
|
|
||||||
Id EmitImageSampleDrefExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
Id EmitImageSampleDrefExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
||||||
Id coords, Id dref, Id lod_lc, Id offset) {
|
Id coords, Id dref, Id lod_lc, const IR::Value& offset) {
|
||||||
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
||||||
const ImageOperands operands(ctx, false, true, info.has_lod_clamp != 0, lod_lc, offset);
|
const ImageOperands operands(ctx, false, true, info.has_lod_clamp != 0, lod_lc, offset);
|
||||||
return Emit(&EmitContext::OpImageSparseSampleDrefExplicitLod,
|
return Emit(&EmitContext::OpImageSparseSampleDrefExplicitLod,
|
||||||
|
|
Loading…
Reference in a new issue