Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dead vs inputs in spir-v, and don't bind corresponding vbo #1029

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Remove dead vs inputs in spir-v, and don't bind corresponding vbo #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c5f956
Remove dead vs inputs in spir-v, and don't bind corresponding vbo
baggins183 Sep 22, 2024
946a94c
remove warning
baggins183 Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ void EmitContext::DefineInputs() {
false, input.instance_data_buf,
};
} else {
if (!info.loads.GetAny(IR::Attribute::Param0 + input.binding)) {
continue;
}

Id id{DefineInput(type, input.binding)};
if (input.instance_step_rate == Info::VsInput::InstanceIdType::Plain) {
Name(id, fmt::format("vs_instance_attr{}", input.binding));
Expand Down
20 changes: 12 additions & 8 deletions src/video_core/buffer_cache/buffer_cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ bool BufferCache::BindVertexBuffers(const Shader::Info& vs_info) {
}

const auto& buffer = vs_info.ReadUd<AmdGpu::Buffer>(input.sgpr_base, input.dword_offset);
if (buffer.GetSize() == 0) {
if (buffer.GetSize() == 0 ||
!vs_info.loads.GetAny(Shader::IR::Attribute::Param0 + input.binding)) {
continue;
}
guest_buffers.emplace_back(buffer);
Expand All @@ -164,13 +165,16 @@ bool BufferCache::BindVertexBuffers(const Shader::Info& vs_info) {
return lhv.base_address < rhv.base_address;
});

boost::container::static_vector<BufferRange, NumVertexBuffers> ranges_merged{ranges[0]};
for (auto range : ranges) {
auto& prev_range = ranges_merged.back();
if (prev_range.end_address < range.base_address) {
ranges_merged.emplace_back(range);
} else {
prev_range.end_address = std::max(prev_range.end_address, range.end_address);
boost::container::static_vector<BufferRange, NumVertexBuffers> ranges_merged;
if (!ranges.empty()) {
ranges_merged.emplace_back(ranges[0]);
for (auto range : ranges) {
auto& prev_range = ranges_merged.back();
if (prev_range.end_address < range.base_address) {
ranges_merged.emplace_back(range);
} else {
prev_range.end_address = std::max(prev_range.end_address, range.end_address);
}
}
}

Expand Down
Loading