VERY experimental Nintendo Switch 2 emulator
C++
video_coare: Reimplementing the maxwell drawing trigger mechanism
FengChen8eed4e7ee5d6
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cppindex 89a9d1f5ac..b41aa6fc1c 100644--- a/src/video_core/engines/maxwell_3d.cpp+++ b/src/video_core/engines/maxwell_3d.cpp@@ -117,10 +117,15 @@ void Maxwell3D::InitializeRegisterDefaults() {shadow_state = regs;- mme_inline[MAXWELL3D_REG_INDEX(draw.end)] = true;- mme_inline[MAXWELL3D_REG_INDEX(draw.begin)] = true;- mme_inline[MAXWELL3D_REG_INDEX(vertex_buffer.count)] = true;- mme_inline[MAXWELL3D_REG_INDEX(index_buffer.count)] = true;+ draw_command[MAXWELL3D_REG_INDEX(draw.end)] = true;+ draw_command[MAXWELL3D_REG_INDEX(draw.begin)] = true;+ draw_command[MAXWELL3D_REG_INDEX(vertex_buffer.first)] = true;+ draw_command[MAXWELL3D_REG_INDEX(vertex_buffer.count)] = true;+ draw_command[MAXWELL3D_REG_INDEX(index_buffer.first)] = true;+ draw_command[MAXWELL3D_REG_INDEX(index_buffer.count)] = true;+ draw_command[MAXWELL3D_REG_INDEX(index_buffer32_first)] = true;+ draw_command[MAXWELL3D_REG_INDEX(index_buffer16_first)] = true;+ draw_command[MAXWELL3D_REG_INDEX(index_buffer8_first)] = true;}void Maxwell3D::ProcessMacro(u32 method, const u32* base_start, u32 amount, bool is_last_call) {@@ -208,25 +213,6 @@ void Maxwell3D::ProcessMethodCall(u32 method, u32 argument, u32 nonshadow_argumereturn ProcessCBBind(3);case MAXWELL3D_REG_INDEX(bind_groups[4].raw_config):return ProcessCBBind(4);- case MAXWELL3D_REG_INDEX(draw.end):- return DrawArrays();- case MAXWELL3D_REG_INDEX(index_buffer32_first):- regs.index_buffer.count = regs.index_buffer32_first.count;- regs.index_buffer.first = regs.index_buffer32_first.first;- dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;- return DrawArrays();- case MAXWELL3D_REG_INDEX(index_buffer16_first):- regs.index_buffer.count = regs.index_buffer16_first.count;- regs.index_buffer.first = regs.index_buffer16_first.first;- dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;- return DrawArrays();- case MAXWELL3D_REG_INDEX(index_buffer8_first):- regs.index_buffer.count = regs.index_buffer8_first.count;- regs.index_buffer.first = regs.index_buffer8_first.first;- dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;- // a macro calls this one over and over, should it increase instancing?- // Used by Hades and likely other Vulkan games.- return DrawArrays();case MAXWELL3D_REG_INDEX(topology_override):use_topology_override = true;return;@@ -261,14 +247,13 @@ void Maxwell3D::CallMacroMethod(u32 method, const std::vector<u32>& parameters)// Execute the current macro.macro_engine->Execute(macro_positions[entry], parameters);- if (mme_draw.current_mode != MMEDrawMode::Undefined) {- FlushMMEInlineDraw();- }++ ProcessDeferredDraw();}void Maxwell3D::CallMethod(u32 method, u32 method_argument, bool is_last_call) {- // It is an error to write to a register other than the current macro's ARG register before it- // has finished execution.+ // It is an error to write to a register other than the current macro's ARG register before+ // it has finished execution.if (executing_macro != 0) {ASSERT(method == executing_macro + 1);}@@ -283,9 +268,16 @@ void Maxwell3D::CallMethod(u32 method, u32 method_argument, bool is_last_call) {ASSERT_MSG(method < Regs::NUM_REGS,"Invalid Maxwell3D register, increase the size of the Regs structure");- const u32 argument = ProcessShadowRam(method, method_argument);- ProcessDirtyRegisters(method, argument);- ProcessMethodCall(method, argument, method_argument, is_last_call);+ if (draw_command[method]) {+ regs.reg_array[method] = method_argument;+ deferred_draw_method.push_back(method);+ } else {+ ProcessDeferredDraw();++ const u32 argument = ProcessShadowRam(method, method_argument);+ ProcessDirtyRegisters(method, argument);+ ProcessMethodCall(method, argument, method_argument, is_last_call);+ }}void Maxwell3D::CallMultiMethod(u32 method, const u32* base_start, u32 amount,@@ -326,55 +318,6 @@ void Maxwell3D::CallMultiMethod(u32 method, const u32* base_start, u32 amount,}}-void Maxwell3D::StepInstance(const MMEDrawMode expected_mode, const u32 count) {- if (mme_draw.current_mode == MMEDrawMode::Undefined) {- if (mme_draw.gl_begin_consume) {- mme_draw.current_mode = expected_mode;- mme_draw.current_count = count;- mme_draw.instance_count = 1;- mme_draw.gl_begin_consume = false;- mme_draw.gl_end_count = 0;- }- return;- } else {- if (mme_draw.current_mode == expected_mode && count == mme_draw.current_count &&- mme_draw.instance_mode && mme_draw.gl_begin_consume) {- mme_draw.instance_count++;- mme_draw.gl_begin_consume = false;- return;- } else {- FlushMMEInlineDraw();- }- }- // Tail call in case it needs to retry.- StepInstance(expected_mode, count);-}--void Maxwell3D::CallMethodFromMME(u32 method, u32 method_argument) {- if (mme_inline[method]) {- regs.reg_array[method] = method_argument;- if (method == MAXWELL3D_REG_INDEX(vertex_buffer.count) ||- method == MAXWELL3D_REG_INDEX(index_buffer.count)) {- const MMEDrawMode expected_mode = method == MAXWELL3D_REG_INDEX(vertex_buffer.count)- ? MMEDrawMode::Array- : MMEDrawMode::Indexed;- StepInstance(expected_mode, method_argument);- } else if (method == MAXWELL3D_REG_INDEX(draw.begin)) {- mme_draw.instance_mode =- (regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::Subsequent) ||- (regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::Unchanged);- mme_draw.gl_begin_consume = true;- } else {- mme_draw.gl_end_count++;- }- } else {- if (mme_draw.current_mode != MMEDrawMode::Undefined) {- FlushMMEInlineDraw();- }- CallMethod(method, method_argument, true);- }-}-void Maxwell3D::ProcessTopologyOverride() {using PrimitiveTopology = Maxwell3D::Regs::PrimitiveTopology;using PrimitiveTopologyOverride = Maxwell3D::Regs::PrimitiveTopologyOverride;@@ -404,41 +347,6 @@ void Maxwell3D::ProcessTopologyOverride() {}}-void Maxwell3D::FlushMMEInlineDraw() {- LOG_TRACE(HW_GPU, "called, topology={}, count={}", regs.draw.topology.Value(),- regs.vertex_buffer.count);- ASSERT_MSG(!(regs.index_buffer.count && regs.vertex_buffer.count), "Both indexed and direct?");- ASSERT(mme_draw.instance_count == mme_draw.gl_end_count);-- // Both instance configuration registers can not be set at the same time.- ASSERT_MSG(regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::First ||- regs.draw.instance_id != Maxwell3D::Regs::Draw::InstanceId::Unchanged,- "Illegal combination of instancing parameters");-- ProcessTopologyOverride();-- const bool is_indexed = mme_draw.current_mode == MMEDrawMode::Indexed;- if (ShouldExecute()) {- rasterizer->Draw(is_indexed, true);- }-- // TODO(bunnei): Below, we reset vertex count so that we can use these registers to determine if- // the game is trying to draw indexed or direct mode. This needs to be verified on HW still -- // it's possible that it is incorrect and that there is some other register used to specify the- // drawing mode.- if (is_indexed) {- regs.index_buffer.count = 0;- } else {- regs.vertex_buffer.count = 0;- }- mme_draw.current_mode = MMEDrawMode::Undefined;- mme_draw.current_count = 0;- mme_draw.instance_count = 0;- mme_draw.instance_mode = false;- mme_draw.gl_begin_consume = false;- mme_draw.gl_end_count = 0;-}-void Maxwell3D::ProcessMacroUpload(u32 data) {macro_engine->AddCode(regs.load_mme.instruction_ptr++, data);}@@ -576,42 +484,6 @@ void Maxwell3D::ProcessSyncPoint() {}}-void Maxwell3D::DrawArrays() {- LOG_TRACE(HW_GPU, "called, topology={}, count={}", regs.draw.topology.Value(),- regs.vertex_buffer.count);- ASSERT_MSG(!(regs.index_buffer.count && regs.vertex_buffer.count), "Both indexed and direct?");-- // Both instance configuration registers can not be set at the same time.- ASSERT_MSG(regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::First ||- regs.draw.instance_id != Maxwell3D::Regs::Draw::InstanceId::Unchanged,- "Illegal combination of instancing parameters");-- ProcessTopologyOverride();-- if (regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::Subsequent) {- // Increment the current instance *before* drawing.- state.current_instance++;- } else if (regs.draw.instance_id != Maxwell3D::Regs::Draw::InstanceId::Unchanged) {- // Reset the current instance to 0.- state.current_instance = 0;- }-- const bool is_indexed{regs.index_buffer.count && !regs.vertex_buffer.count};- if (ShouldExecute()) {- rasterizer->Draw(is_indexed, false);- }-- // TODO(bunnei): Below, we reset vertex count so that we can use these registers to determine if- // the game is trying to draw indexed or direct mode. This needs to be verified on HW still -- // it's possible that it is incorrect and that there is some other register used to specify the- // drawing mode.- if (is_indexed) {- regs.index_buffer.count = 0;- } else {- regs.vertex_buffer.count = 0;- }-}-std::optional<u64> Maxwell3D::GetQueryResult() {switch (regs.report_semaphore.query.report) {case Regs::ReportSemaphore::Report::Payload:@@ -694,4 +566,87 @@ void Maxwell3D::ProcessClearBuffers() {rasterizer->Clear();}+void Maxwell3D::ProcessDeferredDraw() {+ auto method_count = deferred_draw_method.size();+ if (method_count) {+ enum class DrawMode {+ Undefined,+ General,+ Instance,+ };+ DrawMode draw_mode{DrawMode::Undefined};+ u32 instance_count = 1;++ auto first_method = deferred_draw_method[0];+ if (MAXWELL3D_REG_INDEX(draw.begin) == first_method) {+ // The minimum number of methods for drawing must be greater than or equal to+ // 3[draw.begin->vertex(index)count->draw.end] to avoid errors in index mode drawing+ if (method_count < 3) {+ 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;+ } else if (MAXWELL3D_REG_INDEX(index_buffer32_first) == first_method ||+ MAXWELL3D_REG_INDEX(index_buffer16_first) == first_method ||+ MAXWELL3D_REG_INDEX(index_buffer8_first) == first_method) {+ draw_mode = 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;+ }++ if (draw_mode == DrawMode::Instance) {+ ASSERT_MSG(deferred_draw_method.size() % 4 == 0, "Instance mode method size error");+ instance_count = static_cast<u32>(deferred_draw_method.size()) / 4;+ } else {+ if (MAXWELL3D_REG_INDEX(index_buffer32_first) == first_method) {+ regs.index_buffer.count = regs.index_buffer32_first.count;+ regs.index_buffer.first = regs.index_buffer32_first.first;+ dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;+ } else if (MAXWELL3D_REG_INDEX(index_buffer32_first) == first_method) {+ regs.index_buffer.count = regs.index_buffer16_first.count;+ regs.index_buffer.first = regs.index_buffer16_first.first;+ dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;+ } else if (MAXWELL3D_REG_INDEX(index_buffer32_first) == first_method) {+ regs.index_buffer.count = regs.index_buffer8_first.count;+ regs.index_buffer.first = regs.index_buffer8_first.first;+ dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;+ }+ }++ LOG_TRACE(HW_GPU, "called, topology={}, count={}", regs.draw.topology.Value(),+ regs.vertex_buffer.count);++ ASSERT_MSG(!(regs.index_buffer.count && regs.vertex_buffer.count),+ "Both indexed and direct?");++ // Both instance configuration registers can not be set at the same time.+ ASSERT_MSG(regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::First ||+ regs.draw.instance_id != Maxwell3D::Regs::Draw::InstanceId::Unchanged,+ "Illegal combination of instancing parameters");++ ProcessTopologyOverride();++ const bool is_indexed = regs.index_buffer.count && !regs.vertex_buffer.count;+ if (ShouldExecute()) {+ rasterizer->Draw(is_indexed, instance_count);+ }++ if (is_indexed) {+ regs.index_buffer.count = 0;+ } else {+ regs.vertex_buffer.count = 0;+ }++ deferred_draw_method.clear();+ }+}+} // namespace Tegra::Enginesdiff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.hindex 75e3b868dc..1472e88717 100644--- a/src/video_core/engines/maxwell_3d.h+++ b/src/video_core/engines/maxwell_3d.h@@ -3048,8 +3048,6 @@ public:};std::array<ShaderStageInfo, Regs::MaxShaderStage> shader_stages;-- u32 current_instance = 0; ///< Current instance to be used to simulate instanced rendering.};State state{};@@ -3064,11 +3062,6 @@ public:void CallMultiMethod(u32 method, const u32* base_start, u32 amount,u32 methods_pending) override;- /// Write the value to the register identified by method.- void CallMethodFromMME(u32 method, u32 method_argument);-- void FlushMMEInlineDraw();-bool ShouldExecute() const {return execute_on;}@@ -3081,21 +3074,6 @@ public:return *rasterizer;}- enum class MMEDrawMode : u32 {- Undefined,- Array,- Indexed,- };-- struct MMEDrawState {- MMEDrawMode current_mode{MMEDrawMode::Undefined};- u32 current_count{};- u32 instance_count{};- bool instance_mode{};- bool gl_begin_consume{};- u32 gl_end_count{};- } mme_draw;-struct DirtyState {using Flags = std::bitset<std::numeric_limits<u8>::max()>;using Table = std::array<u8, Regs::NUM_REGS>;@@ -3164,14 +3142,10 @@ private:/// Handles a write to the CB_BIND register.void ProcessCBBind(size_t stage_index);- /// Handles a write to the VERTEX_END_GL register, triggering a draw.- void DrawArrays();-/// Handles use of topology overrides (e.g., to avoid using a topology assigned from a macro)void ProcessTopologyOverride();- // Handles a instance drawcall from MME- void StepInstance(MMEDrawMode expected_mode, u32 count);+ void ProcessDeferredDraw();/// Returns a query's value or an empty object if the value will be deferred through a cache.std::optional<u64> GetQueryResult();@@ -3184,8 +3158,6 @@ private:/// Start offsets of each macro in macro_memorystd::array<u32, 0x80> macro_positions{};- std::array<bool, Regs::NUM_REGS> mme_inline{};-/// Macro method that is currently being executed / being fed parameters.u32 executing_macro = 0;/// Parameters that have been submitted to the macro call so far.@@ -3198,6 +3170,9 @@ private:bool execute_on{true};bool use_topology_override{false};++ std::array<bool, Regs::NUM_REGS> draw_command{};+ std::vector<u32> deferred_draw_method;};#define ASSERT_REG_POSITION(field_name, position) \diff --git a/src/video_core/macro/macro_hle.cpp b/src/video_core/macro/macro_hle.cppindex 8a8adbb42f..f896591bfe 100644--- a/src/video_core/macro/macro_hle.cpp+++ b/src/video_core/macro/macro_hle.cpp@@ -22,35 +22,29 @@ void HLE_771BB18C62444DA0(Engines::Maxwell3D& maxwell3d, const std::vector<u32>&maxwell3d.regs.draw.topology.Assign(static_cast<Tegra::Engines::Maxwell3D::Regs::PrimitiveTopology>(parameters[0] & 0x3ffffff));maxwell3d.regs.global_base_instance_index = parameters[5];- maxwell3d.mme_draw.instance_count = instance_count;maxwell3d.regs.global_base_vertex_index = parameters[3];maxwell3d.regs.index_buffer.count = parameters[1];maxwell3d.regs.index_buffer.first = parameters[4];if (maxwell3d.ShouldExecute()) {- maxwell3d.Rasterizer().Draw(true, true);+ maxwell3d.Rasterizer().Draw(true, instance_count);}maxwell3d.regs.index_buffer.count = 0;- maxwell3d.mme_draw.instance_count = 0;- maxwell3d.mme_draw.current_mode = Engines::Maxwell3D::MMEDrawMode::Undefined;}void HLE_0D61FC9FAAC9FCAD(Engines::Maxwell3D& maxwell3d, const std::vector<u32>& parameters) {- const u32 count = (maxwell3d.GetRegisterValue(0xD1B) & parameters[2]);+ const u32 instance_count = (maxwell3d.GetRegisterValue(0xD1B) & parameters[2]);maxwell3d.regs.vertex_buffer.first = parameters[3];maxwell3d.regs.vertex_buffer.count = parameters[1];maxwell3d.regs.global_base_instance_index = parameters[4];maxwell3d.regs.draw.topology.Assign(static_cast<Tegra::Engines::Maxwell3D::Regs::PrimitiveTopology>(parameters[0]));- maxwell3d.mme_draw.instance_count = count;if (maxwell3d.ShouldExecute()) {- maxwell3d.Rasterizer().Draw(false, true);+ maxwell3d.Rasterizer().Draw(false, instance_count);}maxwell3d.regs.vertex_buffer.count = 0;- maxwell3d.mme_draw.instance_count = 0;- maxwell3d.mme_draw.current_mode = Engines::Maxwell3D::MMEDrawMode::Undefined;}void HLE_0217920100488FF7(Engines::Maxwell3D& maxwell3d, const std::vector<u32>& parameters) {@@ -63,24 +57,21 @@ void HLE_0217920100488FF7(Engines::Maxwell3D& maxwell3d, const std::vector<u32>&maxwell3d.dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;maxwell3d.regs.global_base_vertex_index = element_base;maxwell3d.regs.global_base_instance_index = base_instance;- maxwell3d.mme_draw.instance_count = instance_count;- maxwell3d.CallMethodFromMME(0x8e3, 0x640);- maxwell3d.CallMethodFromMME(0x8e4, element_base);- maxwell3d.CallMethodFromMME(0x8e5, base_instance);+ maxwell3d.CallMethod(0x8e3, 0x640, true);+ maxwell3d.CallMethod(0x8e4, element_base, true);+ maxwell3d.CallMethod(0x8e5, base_instance, true);maxwell3d.regs.draw.topology.Assign(static_cast<Tegra::Engines::Maxwell3D::Regs::PrimitiveTopology>(parameters[0]));if (maxwell3d.ShouldExecute()) {- maxwell3d.Rasterizer().Draw(true, true);+ maxwell3d.Rasterizer().Draw(true, instance_count);}maxwell3d.regs.vertex_id_base = 0x0;maxwell3d.regs.index_buffer.count = 0;maxwell3d.regs.global_base_vertex_index = 0x0;maxwell3d.regs.global_base_instance_index = 0x0;- maxwell3d.mme_draw.instance_count = 0;- maxwell3d.CallMethodFromMME(0x8e3, 0x640);- maxwell3d.CallMethodFromMME(0x8e4, 0x0);- maxwell3d.CallMethodFromMME(0x8e5, 0x0);- maxwell3d.mme_draw.current_mode = Engines::Maxwell3D::MMEDrawMode::Undefined;+ maxwell3d.CallMethod(0x8e3, 0x640, true);+ maxwell3d.CallMethod(0x8e4, 0x0, true);+ maxwell3d.CallMethod(0x8e5, 0x0, true);}// Multidraw Indirect@@ -91,11 +82,9 @@ void HLE_3F5E74B9C9A50164(Engines::Maxwell3D& maxwell3d, const std::vector<u32>&maxwell3d.regs.index_buffer.count = 0;maxwell3d.regs.global_base_vertex_index = 0x0;maxwell3d.regs.global_base_instance_index = 0x0;- maxwell3d.mme_draw.instance_count = 0;- maxwell3d.CallMethodFromMME(0x8e3, 0x640);- maxwell3d.CallMethodFromMME(0x8e4, 0x0);- maxwell3d.CallMethodFromMME(0x8e5, 0x0);- maxwell3d.mme_draw.current_mode = Engines::Maxwell3D::MMEDrawMode::Undefined;+ maxwell3d.CallMethod(0x8e3, 0x640, true);+ maxwell3d.CallMethod(0x8e4, 0x0, true);+ maxwell3d.CallMethod(0x8e5, 0x0, true);maxwell3d.dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;});const u32 start_indirect = parameters[0];@@ -127,15 +116,13 @@ void HLE_3F5E74B9C9A50164(Engines::Maxwell3D& maxwell3d, const std::vector<u32>&maxwell3d.regs.index_buffer.count = num_vertices;maxwell3d.regs.global_base_vertex_index = base_vertex;maxwell3d.regs.global_base_instance_index = base_instance;- maxwell3d.mme_draw.instance_count = instance_count;- maxwell3d.CallMethodFromMME(0x8e3, 0x640);- maxwell3d.CallMethodFromMME(0x8e4, base_vertex);- maxwell3d.CallMethodFromMME(0x8e5, base_instance);+ maxwell3d.CallMethod(0x8e3, 0x640, true);+ maxwell3d.CallMethod(0x8e4, base_vertex, true);+ maxwell3d.CallMethod(0x8e5, base_instance, true);maxwell3d.dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;if (maxwell3d.ShouldExecute()) {- maxwell3d.Rasterizer().Draw(true, true);+ maxwell3d.Rasterizer().Draw(true, instance_count);}- maxwell3d.mme_draw.current_mode = Engines::Maxwell3D::MMEDrawMode::Undefined;}}diff --git a/src/video_core/macro/macro_interpreter.cpp b/src/video_core/macro/macro_interpreter.cppindex f670b1bca8..c0d32c112c 100644--- a/src/video_core/macro/macro_interpreter.cpp+++ b/src/video_core/macro/macro_interpreter.cpp@@ -335,7 +335,7 @@ void MacroInterpreterImpl::SetMethodAddress(u32 address) {}void MacroInterpreterImpl::Send(u32 value) {- maxwell3d.CallMethodFromMME(method_address.address, value);+ maxwell3d.CallMethod(method_address.address, value, true);// Increment the method address by the method increment.method_address.address.Assign(method_address.address.Value() +method_address.increment.Value());diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cppindex a302a9603d..25c1ce798c 100644--- a/src/video_core/macro/macro_jit_x64.cpp+++ b/src/video_core/macro/macro_jit_x64.cpp@@ -346,7 +346,7 @@ void MacroJITx64Impl::Compile_Read(Macro::Opcode opcode) {}void Send(Engines::Maxwell3D* maxwell3d, Macro::MethodAddress method_address, u32 value) {- maxwell3d->CallMethodFromMME(method_address.address, value);+ maxwell3d->CallMethod(method_address.address, value, true);}void MacroJITx64Impl::Compile_Send(Xbyak::Reg32 value) {diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.hindex d2d40884c2..1cbfef0902 100644--- a/src/video_core/rasterizer_interface.h+++ b/src/video_core/rasterizer_interface.h@@ -40,7 +40,7 @@ public:virtual ~RasterizerInterface() = default;/// Dispatches a draw invocation- virtual void Draw(bool is_indexed, bool is_instanced) = 0;+ virtual void Draw(bool is_indexed, u32 instance_count) = 0;/// Clear the current framebuffervirtual void Clear() = 0;diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cppindex e5c09a969b..21bac6ebf2 100644--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp@@ -205,7 +205,7 @@ void RasterizerOpenGL::Clear() {++num_queued_commands;}-void RasterizerOpenGL::Draw(bool is_indexed, bool is_instanced) {+void RasterizerOpenGL::Draw(bool is_indexed, u32 instance_count) {MICROPROFILE_SCOPE(OpenGL_Drawing);SCOPE_EXIT({ gpu.TickWork(); });@@ -228,8 +228,7 @@ void RasterizerOpenGL::Draw(bool is_indexed, bool is_instanced) {BeginTransformFeedback(pipeline, primitive_mode);const GLuint base_instance = static_cast<GLuint>(maxwell3d->regs.global_base_instance_index);- const GLsizei num_instances =- static_cast<GLsizei>(is_instanced ? maxwell3d->mme_draw.instance_count : 1);+ const GLsizei num_instances = static_cast<GLsizei>(instance_count);if (is_indexed) {const GLint base_vertex = static_cast<GLint>(maxwell3d->regs.global_base_vertex_index);const GLsizei num_vertices = static_cast<GLsizei>(maxwell3d->regs.index_buffer.count);diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.hindex 45131b7852..c93ba3b42b 100644--- a/src/video_core/renderer_opengl/gl_rasterizer.h+++ b/src/video_core/renderer_opengl/gl_rasterizer.h@@ -68,7 +68,7 @@ public:StateTracker& state_tracker_);~RasterizerOpenGL() override;- void Draw(bool is_indexed, bool is_instanced) override;+ void Draw(bool is_indexed, u32 instance_count) override;void Clear() override;void DispatchCompute() override;void ResetCounter(VideoCore::QueryType type) override;diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cppindex 47dfb45a1d..9a7d90b2a4 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp@@ -127,11 +127,10 @@ VkRect2D GetScissorState(const Maxwell& regs, size_t index, u32 up_scale = 1, u3return scissor;}-DrawParams MakeDrawParams(const Maxwell& regs, u32 num_instances, bool is_instanced,- bool is_indexed) {+DrawParams MakeDrawParams(const Maxwell& regs, u32 num_instances, bool is_indexed) {DrawParams params{.base_instance = regs.global_base_instance_index,- .num_instances = is_instanced ? num_instances : 1,+ .num_instances = num_instances,.base_vertex = is_indexed ? regs.global_base_vertex_index : regs.vertex_buffer.first,.num_vertices = is_indexed ? regs.index_buffer.count : regs.vertex_buffer.count,.first_index = is_indexed ? regs.index_buffer.first : 0,@@ -177,7 +176,7 @@ RasterizerVulkan::RasterizerVulkan(Core::Frontend::EmuWindow& emu_window_, TegraRasterizerVulkan::~RasterizerVulkan() = default;-void RasterizerVulkan::Draw(bool is_indexed, bool is_instanced) {+void RasterizerVulkan::Draw(bool is_indexed, u32 instance_count) {MICROPROFILE_SCOPE(Vulkan_Drawing);SCOPE_EXIT({ gpu.TickWork(); });@@ -199,8 +198,8 @@ void RasterizerVulkan::Draw(bool is_indexed, bool is_instanced) {UpdateDynamicStates();const auto& regs{maxwell3d->regs};- const u32 num_instances{maxwell3d->mme_draw.instance_count};- const DrawParams draw_params{MakeDrawParams(regs, num_instances, is_instanced, is_indexed)};+ const u32 num_instances{instance_count};+ const DrawParams draw_params{MakeDrawParams(regs, num_instances, is_indexed)};scheduler.Record([draw_params](vk::CommandBuffer cmdbuf) {if (draw_params.is_indexed) {cmdbuf.DrawIndexed(draw_params.num_vertices, draw_params.num_instances,diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.hindex 4cde3c983a..b3a182588d 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.h+++ b/src/video_core/renderer_vulkan/vk_rasterizer.h@@ -64,7 +64,7 @@ public:StateTracker& state_tracker_, Scheduler& scheduler_);~RasterizerVulkan() override;- void Draw(bool is_indexed, bool is_instanced) override;+ void Draw(bool is_indexed, u32 instance_count) override;void Clear() override;void DispatchCompute() override;void ResetCounter(VideoCore::QueryType type) override;