gremling/KytyPS5
1
0 Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-29 16:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

graphics: fix vertex and instance IDs for unpatched indirect draws

Browse Source
This commit is contained in:
nmzik committed 2026-10-28 04:33:03 +01:00
1 parent 1be1c6c4f9
commit a833e1b735
10 files changed
+72 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp
+1
View File
@@ -689,6 +689,7 @@ void PipelineCache::GetGraphicsPrograms(const CommandBuffer& command, DrawRender
const bool mesh_active = vertex_info[0].logical_stage == ShaderType::Mesh;
if (!tess_active && !mesh_active) {
vertex_info[0].indirect_offsets = state.indirect_offsets;
vertex_info[0].indirect_draw = state.indirect_draw;
}
if (object_primitive_id) {
// CxObjectIdMode: register source plus a 32-bit pipelined primitive-ID addition.
src/graphics/host_gpu/renderer/pipeline/pipelineCache.h
+1
View File
@@ -139,6 +139,7 @@ struct DrawRenderState {
ShaderPixelInputInfo ps_input_info;
// Input: the user-data slots a GPU-read indirect draw patches.
ShaderIndirectOffsets indirect_offsets;
bool indirect_draw = false;
[[nodiscard]] std::span<const ShaderVertexInputInfo> VertexStages() const {
return {vertex_info.data(), vertex_info[1].stage ? 3u : 1u};
src/graphics/host_gpu/renderer/renderDraw.cpp
+19 -7
View File
@@ -52,7 +52,7 @@ std::pair<int32_t, uint32_t> ResolveDrawOffsets(uint32_t index_offset,
const ShaderVertexInputInfo& vs_input_info) {
auto vertex_offset = static_cast<int32_t>(index_offset);
uint32_t instance_offset = 0;
if (!vs_input_info.fetch_embedded) {
if (!vs_input_info.has_dynamic_vertex_fetch) {
return {vertex_offset, instance_offset};
}
@@ -1251,16 +1251,26 @@ void RenderExecutor::ExecutePreparedDraw(uint64_t submit_id, CommandBuffer& buff
}
// Vulkan offsets for a prepared draw, or nullopt when its indirect records need the CPU: mesh
// and quad-list draws for counts, tessellation draws for patched SGPRs. Indirect records carry
// their own offsets.
// and quad-list draws for counts, tessellation draws for the index/SGPR prolog. Indirect records
// carry their own offsets.
static std::optional<DrawEmitInfo> ResolveDrawEmit(const HW::UserConfig& ucfg,
const ShaderVertexInputInfo& vs,
DrawOffsetSource source,
int32_t first_vertex,
uint32_t first_instance,
const DrawIndirectArgs& indirect) {
if ((indirect.address != 0 || source == DrawOffsetSource::IndirectArgs) &&
ucfg.GetIndexOffset() != 0) {
static std::once_flag warning_once;
std::call_once(warning_once, [&] {
Log::WriteToConsoleAndLog(fmt::format(
"GPU: indirect draw ignores GE_INDX_OFFSET=0x{:08x}; geometry may be incorrect.\n",
ucfg.GetIndexOffset()));
});
}
if (indirect.address != 0) {
if (vs.stage.module->info.stage == ShaderType::Mesh ||
if (!vs.indirect_draw ||
vs.stage.module->info.stage == ShaderType::Mesh ||
ucfg.GetPrimType() == Prospero::PrimitiveType::kQuadListLegacy ||
vs.indirect_offsets != indirect.offsets) {
return std::nullopt;
@@ -1269,7 +1279,7 @@ static std::optional<DrawEmitInfo> ResolveDrawEmit(const HW::UserConfig&
}
if (source == DrawOffsetSource::IndirectArgs) {
// Native fetches consume the patched SGPRs; rewritten fetches need Vulkan offsets.
return vs.fetch_embedded ? DrawEmitInfo {first_vertex, first_instance} : DrawEmitInfo {};
return vs.has_dynamic_vertex_fetch ? DrawEmitInfo {first_vertex, first_instance} : DrawEmitInfo {};
}
const auto [vertex_offset, instance_offset] = ResolveDrawOffsets(ucfg.GetIndexOffset(), vs);
return DrawEmitInfo {vertex_offset + first_vertex, instance_offset};
@@ -1326,7 +1336,8 @@ bool RenderExecutor::DrawIndex(uint64_t submit_id, CommandBuffer& buffer,
hw_check(buffer);
DrawRenderState state {.indirect_offsets = args.indirect.offsets};
DrawRenderState state {.indirect_offsets = args.indirect.offsets,
.indirect_draw = args.indirect.address != 0};
if (!GetDrawTopology(ucfg, state.topology)) {
return true;
}
@@ -1431,7 +1442,8 @@ bool RenderExecutor::DrawAuto(uint64_t submit_id, CommandBuffer& buffer, const D
const DrawCallInfo draw {CommandBufferDebugOp::DrawIndexAuto,
args.vertex_count, args.instance_count, args.first_instance};
DrawRenderState state {.indirect_offsets = args.indirect.offsets};
DrawRenderState state {.indirect_offsets = args.indirect.offsets,
.indirect_draw = args.indirect.address != 0};
if (!GetDrawTopology(ucfg, state.topology)) {
ResetBindings();
return true;