diff options
author | Fernando S <fsahmkow27@gmail.com> | 2022-11-06 01:13:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-06 01:13:59 +0100 |
commit | df38c03a09ad56fdb299d78b39a3951d6ade83aa (patch) | |
tree | e8426f3ab88db4ca904b4cb2ae056d7ad6edd2c2 /src/video_core/engines/maxwell_3d.cpp | |
parent | Merge pull request #9173 from bunnei/kern-update-15 (diff) | |
parent | video_core: Fix drawing trigger mechanism regression (diff) | |
download | yuzu-df38c03a09ad56fdb299d78b39a3951d6ade83aa.tar yuzu-df38c03a09ad56fdb299d78b39a3951d6ade83aa.tar.gz yuzu-df38c03a09ad56fdb299d78b39a3951d6ade83aa.tar.bz2 yuzu-df38c03a09ad56fdb299d78b39a3951d6ade83aa.tar.lz yuzu-df38c03a09ad56fdb299d78b39a3951d6ade83aa.tar.xz yuzu-df38c03a09ad56fdb299d78b39a3951d6ade83aa.tar.zst yuzu-df38c03a09ad56fdb299d78b39a3951d6ade83aa.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 57 |
1 files changed, 25 insertions, 32 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index f9794dfe4..4a2f2c1fd 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -631,47 +631,40 @@ void Maxwell3D::ProcessDeferredDraw() { Instance, }; DrawMode draw_mode{DrawMode::Undefined}; - u32 instance_count = 1; - - u32 index = 0; - u32 method = 0; u32 method_count = static_cast<u32>(deferred_draw_method.size()); - for (; index < method_count && - (method = deferred_draw_method[index]) != MAXWELL3D_REG_INDEX(draw.begin); - ++index) - ; - - if (MAXWELL3D_REG_INDEX(draw.begin) != method) { - return; - } - - // The minimum number of methods for drawing must be greater than or equal to - // 3[draw.begin->vertex(index)count(first)->draw.end] to avoid errors in index mode drawing - if ((method_count - index) < 3) { + u32 method = deferred_draw_method[method_count - 1]; + if (MAXWELL3D_REG_INDEX(draw.end) != method) { return; } draw_mode = (regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::Subsequent) || (regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::Unchanged) ? DrawMode::Instance : DrawMode::General; - - // Drawing will only begin with draw.begin or index_buffer method, other methods directly - // clear - if (draw_mode == DrawMode::Undefined) { - deferred_draw_method.clear(); - return; - } - + u32 instance_count = 0; if (draw_mode == DrawMode::Instance) { - ASSERT_MSG(deferred_draw_method.size() % 4 == 0, "Instance mode method size error"); - instance_count = static_cast<u32>(method_count - index) / 4; + u32 vertex_buffer_count = 0; + u32 index_buffer_count = 0; + for (u32 index = 0; index < method_count; ++index) { + method = deferred_draw_method[index]; + if (method == MAXWELL3D_REG_INDEX(vertex_buffer.count)) { + instance_count = ++vertex_buffer_count; + } else if (method == MAXWELL3D_REG_INDEX(index_buffer.count)) { + instance_count = ++index_buffer_count; + } + } + ASSERT_MSG(!(vertex_buffer_count && index_buffer_count), + "Instance both indexed and direct?"); } else { - method = deferred_draw_method[index + 1]; - if (MAXWELL3D_REG_INDEX(draw_inline_index) == method || - MAXWELL3D_REG_INDEX(inline_index_2x16.even) == method || - MAXWELL3D_REG_INDEX(inline_index_4x8.index0) == method) { - regs.index_buffer.count = static_cast<u32>(inline_index_draw_indexes.size() / 4); - regs.index_buffer.format = Regs::IndexFormat::UnsignedInt; + instance_count = 1; + for (u32 index = 0; index < method_count; ++index) { + method = deferred_draw_method[index]; + if (MAXWELL3D_REG_INDEX(draw_inline_index) == method || + MAXWELL3D_REG_INDEX(inline_index_2x16.even) == method || + MAXWELL3D_REG_INDEX(inline_index_4x8.index0) == method) { + regs.index_buffer.count = static_cast<u32>(inline_index_draw_indexes.size() / 4); + regs.index_buffer.format = Regs::IndexFormat::UnsignedInt; + break; + } } } |