summaryrefslogtreecommitdiffstats
path: root/src/video_core/engines/maxwell_3d.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-09-10 17:55:45 +0200
committerGitHub <noreply@github.com>2019-09-10 17:55:45 +0200
commitc7ec7bc1f5183f580bf34f9e2dfb59c986551f36 (patch)
treea141f778eb57f4583acd24cdcd8027bf2f7099ac /src/video_core/engines/maxwell_3d.cpp
parentMerge pull request #2759 from ReinUsesLisp/compute-images (diff)
parentmaxwell_3d: Avoid moving macro_params (diff)
downloadyuzu-c7ec7bc1f5183f580bf34f9e2dfb59c986551f36.tar
yuzu-c7ec7bc1f5183f580bf34f9e2dfb59c986551f36.tar.gz
yuzu-c7ec7bc1f5183f580bf34f9e2dfb59c986551f36.tar.bz2
yuzu-c7ec7bc1f5183f580bf34f9e2dfb59c986551f36.tar.lz
yuzu-c7ec7bc1f5183f580bf34f9e2dfb59c986551f36.tar.xz
yuzu-c7ec7bc1f5183f580bf34f9e2dfb59c986551f36.tar.zst
yuzu-c7ec7bc1f5183f580bf34f9e2dfb59c986551f36.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/engines/maxwell_3d.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index f5158d219..c8c92757a 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -244,7 +244,7 @@ void Maxwell3D::InitDirtySettings() {
dirty_pointers[MAXWELL3D_REG_INDEX(polygon_offset_clamp)] = polygon_offset_dirty_reg;
}
-void Maxwell3D::CallMacroMethod(u32 method, std::vector<u32> parameters) {
+void Maxwell3D::CallMacroMethod(u32 method, std::size_t num_parameters, const u32* parameters) {
// Reset the current macro.
executing_macro = 0;
@@ -252,7 +252,7 @@ void Maxwell3D::CallMacroMethod(u32 method, std::vector<u32> parameters) {
const u32 entry = ((method - MacroRegistersStart) >> 1) % macro_positions.size();
// Execute the current macro.
- macro_interpreter.Execute(macro_positions[entry], std::move(parameters));
+ macro_interpreter.Execute(macro_positions[entry], num_parameters, parameters);
}
void Maxwell3D::CallMethod(const GPU::MethodCall& method_call) {
@@ -289,7 +289,8 @@ void Maxwell3D::CallMethod(const GPU::MethodCall& method_call) {
// Call the macro when there are no more parameters in the command buffer
if (method_call.IsLastCall()) {
- CallMacroMethod(executing_macro, std::move(macro_params));
+ CallMacroMethod(executing_macro, macro_params.size(), macro_params.data());
+ macro_params.clear();
}
return;
}