summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-02-17 23:42:28 +0100
committerLioncash <mathew1800@gmail.com>2015-02-17 23:57:23 +0100
commit5d2366e1e9adaa5b4275127dff5005f2ef2f8ff8 (patch)
treefbe9bc5f148ee6c5e0abf6a3c284f65d88d7731c
parentMerge pull request #529 from Subv/master (diff)
downloadyuzu-5d2366e1e9adaa5b4275127dff5005f2ef2f8ff8.tar
yuzu-5d2366e1e9adaa5b4275127dff5005f2ef2f8ff8.tar.gz
yuzu-5d2366e1e9adaa5b4275127dff5005f2ef2f8ff8.tar.bz2
yuzu-5d2366e1e9adaa5b4275127dff5005f2ef2f8ff8.tar.lz
yuzu-5d2366e1e9adaa5b4275127dff5005f2ef2f8ff8.tar.xz
yuzu-5d2366e1e9adaa5b4275127dff5005f2ef2f8ff8.tar.zst
yuzu-5d2366e1e9adaa5b4275127dff5005f2ef2f8ff8.zip
-rw-r--r--src/core/core_timing.cpp2
-rw-r--r--src/video_core/debug_utils/debug_utils.cpp4
-rw-r--r--src/video_core/gpu_debugger.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 604875160..cabe2a074 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -129,7 +129,7 @@ static void FreeTsEvent(Event* event) {
}
int RegisterEvent(const char* name, TimedCallback callback) {
- event_types.push_back(EventType(callback, name));
+ event_types.emplace_back(callback, name);
return (int)event_types.size() - 1;
}
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 8c4ec1044..0beb72e6b 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -189,7 +189,7 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data
);
if (it == output_info_table.end()) {
- output_info_table.push_back({});
+ output_info_table.emplace_back();
output_info_table.back().type = type;
output_info_table.back().component_mask = component_mask;
output_info_table.back().id = i;
@@ -285,7 +285,7 @@ void OnPicaRegWrite(u32 id, u32 value)
if (!is_pica_tracing)
return;
- pica_trace->writes.push_back({id, value});
+ pica_trace->writes.emplace_back(id, value);
}
std::unique_ptr<PicaTrace> FinishPicaTracing()
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h
index 03641d93b..48ac269e3 100644
--- a/src/video_core/gpu_debugger.h
+++ b/src/video_core/gpu_debugger.h
@@ -58,8 +58,8 @@ public:
if (observers.empty())
return;
- gx_command_history.push_back(GSP_GPU::Command());
- GSP_GPU::Command& cmd = gx_command_history[gx_command_history.size()-1];
+ gx_command_history.emplace_back();
+ GSP_GPU::Command& cmd = gx_command_history.back();
memcpy(&cmd, command_data, sizeof(GSP_GPU::Command));