From 618de4e7871898f165c028293becd235ce3ccb09 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sat, 16 Oct 2021 00:30:43 -0400
Subject: vulkan: Fix rescaling push constant usage
---
.../backend/spirv/emit_context.cpp | 58 +++++++++++-----------
src/shader_recompiler/backend/spirv/emit_context.h | 3 +-
src/shader_recompiler/backend/spirv/emit_spirv.h | 5 +-
.../backend/spirv/emit_spirv_context_get_set.cpp | 4 +-
4 files changed, 36 insertions(+), 34 deletions(-)
(limited to 'src/shader_recompiler/backend')
diff --git a/src/shader_recompiler/backend/spirv/emit_context.cpp b/src/shader_recompiler/backend/spirv/emit_context.cpp
index 8646fe989f..723455462e 100644
--- a/src/shader_recompiler/backend/spirv/emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_context.cpp
@@ -1006,47 +1006,47 @@ void EmitContext::DefineRescalingInput(const Info& info) {
return;
}
if (profile.unified_descriptor_binding) {
- DefineRescalingInputPushConstant(info);
+ DefineRescalingInputPushConstant();
} else {
DefineRescalingInputUniformConstant();
}
}
-void EmitContext::DefineRescalingInputPushConstant(const Info& info) {
- boost::container::static_vector<Id, 3> members{F32[1]};
+void EmitContext::DefineRescalingInputPushConstant() {
+ boost::container::static_vector<Id, 3> members{};
u32 member_index{0};
- if (!info.texture_descriptors.empty()) {
- rescaling_textures_type = TypeArray(U32[1], Const(4u));
- Decorate(rescaling_textures_type, spv::Decoration::ArrayStride, 4u);
- members.push_back(rescaling_textures_type);
- rescaling_textures_member_index = ++member_index;
- }
- if (!info.image_descriptors.empty()) {
- rescaling_images_type = TypeArray(U32[1], Const(NUM_IMAGE_SCALING_WORDS));
- if (rescaling_textures_type.value != rescaling_images_type.value) {
- Decorate(rescaling_images_type, spv::Decoration::ArrayStride, 4u);
- }
- members.push_back(rescaling_images_type);
- rescaling_images_member_index = ++member_index;
+
+ rescaling_textures_type = TypeArray(U32[1], Const(4u));
+ Decorate(rescaling_textures_type, spv::Decoration::ArrayStride, 4u);
+ members.push_back(rescaling_textures_type);
+ rescaling_textures_member_index = member_index++;
+
+ rescaling_images_type = TypeArray(U32[1], Const(NUM_IMAGE_SCALING_WORDS));
+ Decorate(rescaling_images_type, spv::Decoration::ArrayStride, 4u);
+ members.push_back(rescaling_images_type);
+ rescaling_images_member_index = member_index++;
+
+ if (stage != Stage::Compute) {
+ members.push_back(F32[1]);
+ rescaling_downfactor_member_index = member_index++;
}
const Id push_constant_struct{TypeStruct(std::span(members.data(), members.size()))};
Decorate(push_constant_struct, spv::Decoration::Block);
Name(push_constant_struct, "ResolutionInfo");
- MemberDecorate(push_constant_struct, 0u, spv::Decoration::Offset, 0u);
- MemberName(push_constant_struct, 0u, "down_factor");
+ MemberDecorate(push_constant_struct, rescaling_textures_member_index, spv::Decoration::Offset,
+ static_cast<u32>(offsetof(RescalingLayout, rescaling_textures)));
+ MemberName(push_constant_struct, rescaling_textures_member_index, "rescaling_textures");
- const u32 offset_bias = stage == Stage::Compute ? sizeof(u32) : 0;
- if (!info.texture_descriptors.empty()) {
- MemberDecorate(
- push_constant_struct, rescaling_textures_member_index, spv::Decoration::Offset,
- static_cast<u32>(offsetof(RescalingLayout, rescaling_textures) - offset_bias));
- MemberName(push_constant_struct, rescaling_textures_member_index, "rescaling_textures");
- }
- if (!info.image_descriptors.empty()) {
- MemberDecorate(push_constant_struct, rescaling_images_member_index, spv::Decoration::Offset,
- static_cast<u32>(offsetof(RescalingLayout, rescaling_images) - offset_bias));
- MemberName(push_constant_struct, rescaling_images_member_index, "rescaling_images");
+ MemberDecorate(push_constant_struct, rescaling_images_member_index, spv::Decoration::Offset,
+ static_cast<u32>(offsetof(RescalingLayout, rescaling_images)));
+ MemberName(push_constant_struct, rescaling_images_member_index, "rescaling_images");
+
+ if (stage != Stage::Compute) {
+ MemberDecorate(push_constant_struct, rescaling_downfactor_member_index,
+ spv::Decoration::Offset,
+ static_cast<u32>(offsetof(RescalingLayout, down_factor)));
+ MemberName(push_constant_struct, rescaling_downfactor_member_index, "down_factor");
}
const Id pointer_type{TypePointer(spv::StorageClass::PushConstant, push_constant_struct)};
rescaling_push_constants = AddGlobalVariable(pointer_type, spv::StorageClass::PushConstant);
diff --git a/src/shader_recompiler/backend/spirv/emit_context.h b/src/shader_recompiler/backend/spirv/emit_context.h
index b67704baac..63f8185d99 100644
--- a/src/shader_recompiler/backend/spirv/emit_context.h
+++ b/src/shader_recompiler/backend/spirv/emit_context.h
@@ -244,6 +244,7 @@ public:
Id rescaling_images_type{};
u32 rescaling_textures_member_index{};
u32 rescaling_images_member_index{};
+ u32 rescaling_downfactor_member_index{};
u32 texture_rescaling_index{};
u32 image_rescaling_index{};
@@ -324,7 +325,7 @@ private:
void DefineAttributeMemAccess(const Info& info);
void DefineGlobalMemoryFunctions(const Info& info);
void DefineRescalingInput(const Info& info);
- void DefineRescalingInputPushConstant(const Info& info);
+ void DefineRescalingInputPushConstant();
void DefineRescalingInputUniformConstant();
void DefineInputs(const IR::Program& program);
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.h b/src/shader_recompiler/backend/spirv/emit_spirv.h
index cf59f25728..4b25534cea 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv.h
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.h
@@ -22,11 +22,12 @@ constexpr u32 NUM_TEXTURE_AND_IMAGE_SCALING_WORDS =
NUM_TEXTURE_SCALING_WORDS + NUM_IMAGE_SCALING_WORDS;
struct RescalingLayout {
- u32 down_factor;
alignas(16) std::array<u32, NUM_TEXTURE_SCALING_WORDS> rescaling_textures;
alignas(16) std::array<u32, NUM_IMAGE_SCALING_WORDS> rescaling_images;
+ alignas(16) u32 down_factor;
};
-constexpr u32 RESCALING_PUSH_CONSTANT_WORDS_OFFSET = offsetof(RescalingLayout, rescaling_textures);
+constexpr u32 RESCALING_LAYOUT_WORDS_OFFSET = offsetof(RescalingLayout, rescaling_textures);
+constexpr u32 RESCALING_LAYOUT_DOWN_FACTOR_OFFSET = offsetof(RescalingLayout, down_factor);
[[nodiscard]] std::vector<u32> EmitSPIRV(const Profile& profile, const RuntimeInfo& runtime_info,
IR::Program& program, Bindings& bindings);
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
index c0db7452f1..bac683ae18 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
@@ -529,8 +529,8 @@ Id EmitYDirection(EmitContext& ctx) {
Id EmitResolutionDownFactor(EmitContext& ctx) {
if (ctx.profile.unified_descriptor_binding) {
const Id pointer_type{ctx.TypePointer(spv::StorageClass::PushConstant, ctx.F32[1])};
- const Id pointer{
- ctx.OpAccessChain(pointer_type, ctx.rescaling_push_constants, ctx.u32_zero_value)};
+ const Id index{ctx.Const(ctx.rescaling_downfactor_member_index)};
+ const Id pointer{ctx.OpAccessChain(pointer_type, ctx.rescaling_push_constants, index)};
return ctx.OpLoad(ctx.F32[1], pointer);
} else {
const Id composite{ctx.OpLoad(ctx.F32[4], ctx.rescaling_uniform_constant)};
--
cgit v1.2.3-70-g09d2