diff options
| -rw-r--r-- | src/core/gdbstub/gdbstub.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index 1360ee845..820b19e1a 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp | |||
| @@ -437,7 +437,7 @@ static void HandleSetThread() { | |||
| 437 | * | 437 | * |
| 438 | * @param signal Signal to be sent to client. | 438 | * @param signal Signal to be sent to client. |
| 439 | */ | 439 | */ |
| 440 | void SendSignal(u32 signal) { | 440 | static void SendSignal(u32 signal) { |
| 441 | if (gdbserver_socket == -1) { | 441 | if (gdbserver_socket == -1) { |
| 442 | return; | 442 | return; |
| 443 | } | 443 | } |
| @@ -713,7 +713,7 @@ static void Continue() { | |||
| 713 | * @param addr Address of breakpoint. | 713 | * @param addr Address of breakpoint. |
| 714 | * @param len Length of breakpoint. | 714 | * @param len Length of breakpoint. |
| 715 | */ | 715 | */ |
| 716 | bool CommitBreakpoint(BreakpointType type, PAddr addr, u32 len) { | 716 | static bool CommitBreakpoint(BreakpointType type, PAddr addr, u32 len) { |
| 717 | std::map<u32, Breakpoint>& p = GetBreakpointList(type); | 717 | std::map<u32, Breakpoint>& p = GetBreakpointList(type); |
| 718 | 718 | ||
| 719 | Breakpoint breakpoint; | 719 | Breakpoint breakpoint; |
| @@ -907,7 +907,7 @@ void ToggleServer(bool status) { | |||
| 907 | } | 907 | } |
| 908 | } | 908 | } |
| 909 | 909 | ||
| 910 | void Init(u16 port) { | 910 | static void Init(u16 port) { |
| 911 | if (!g_server_enabled) { | 911 | if (!g_server_enabled) { |
| 912 | // Set the halt loop to false in case the user enabled the gdbstub mid-execution. | 912 | // Set the halt loop to false in case the user enabled the gdbstub mid-execution. |
| 913 | // This way the CPU can still execute normally. | 913 | // This way the CPU can still execute normally. |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 6fdb7f61b..b9315ed33 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -65,7 +65,7 @@ union PicaShaderConfig { | |||
| 65 | // We don't sync const_color here because of the high variance, it is a | 65 | // We don't sync const_color here because of the high variance, it is a |
| 66 | // shader uniform instead. | 66 | // shader uniform instead. |
| 67 | const auto& tev_stages = regs.GetTevStages(); | 67 | const auto& tev_stages = regs.GetTevStages(); |
| 68 | DEBUG_ASSERT(res.tev_stages.size() == tev_stages.size()); | 68 | DEBUG_ASSERT(state.tev_stages.size() == tev_stages.size()); |
| 69 | for (size_t i = 0; i < tev_stages.size(); i++) { | 69 | for (size_t i = 0; i < tev_stages.size(); i++) { |
| 70 | const auto& tev_stage = tev_stages[i]; | 70 | const auto& tev_stage = tev_stages[i]; |
| 71 | state.tev_stages[i].sources_raw = tev_stage.sources_raw; | 71 | state.tev_stages[i].sources_raw = tev_stage.sources_raw; |