summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/arm/disassembler/load_symbol_map.cpp2
-rw-r--r--src/video_core/video_core.cpp7
2 files changed, 1 insertions, 8 deletions
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp
index d7fc0a042..b4a5429a2 100644
--- a/src/core/arm/disassembler/load_symbol_map.cpp
+++ b/src/core/arm/disassembler/load_symbol_map.cpp
@@ -19,7 +19,7 @@ void LoadSymbolMap(std::string filename) {
19 std::ifstream infile(filename); 19 std::ifstream infile(filename);
20 20
21 std::string address_str, function_name, line; 21 std::string address_str, function_name, line;
22 u32 size, address; 22 u32 size;
23 23
24 while (std::getline(infile, line)) { 24 while (std::getline(infile, line)) {
25 std::istringstream iss(line); 25 std::istringstream iss(line);
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 9aaff4917..c779771c5 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -21,13 +21,6 @@ EmuWindow* g_emu_window = NULL; ///< Frontend emulator window
21RendererBase* g_renderer = NULL; ///< Renderer plugin 21RendererBase* g_renderer = NULL; ///< Renderer plugin
22int g_current_frame = 0; 22int g_current_frame = 0;
23 23
24/// Start the video core
25void Start() {
26 if (g_emu_window == NULL) {
27 ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!");
28 }
29}
30
31/// Initialize the video core 24/// Initialize the video core
32void Init(EmuWindow* emu_window) { 25void Init(EmuWindow* emu_window) {
33 g_emu_window = emu_window; 26 g_emu_window = emu_window;