diff options
Diffstat (limited to 'src/citra/emu_window/emu_window_glfw.cpp')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 982619126..929e09f43 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp | |||
| @@ -36,15 +36,15 @@ const bool EmuWindow_GLFW::IsOpen() { | |||
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | void EmuWindow_GLFW::OnFramebufferResizeEvent(GLFWwindow* win, int width, int height) { | 38 | void EmuWindow_GLFW::OnFramebufferResizeEvent(GLFWwindow* win, int width, int height) { |
| 39 | _dbg_assert_(GUI, width > 0); | 39 | _dbg_assert_(Frontend, width > 0); |
| 40 | _dbg_assert_(GUI, height > 0); | 40 | _dbg_assert_(Frontend, height > 0); |
| 41 | 41 | ||
| 42 | GetEmuWindow(win)->NotifyFramebufferSizeChanged(std::pair<unsigned,unsigned>(width, height)); | 42 | GetEmuWindow(win)->NotifyFramebufferSizeChanged(std::pair<unsigned,unsigned>(width, height)); |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int height) { | 45 | void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int height) { |
| 46 | _dbg_assert_(GUI, width > 0); | 46 | _dbg_assert_(Frontend, width > 0); |
| 47 | _dbg_assert_(GUI, height > 0); | 47 | _dbg_assert_(Frontend, height > 0); |
| 48 | 48 | ||
| 49 | // NOTE: GLFW provides no proper way to set a minimal window size. | 49 | // NOTE: GLFW provides no proper way to set a minimal window size. |
| 50 | // Hence, we just ignore the corresponding EmuWindow hint. | 50 | // Hence, we just ignore the corresponding EmuWindow hint. |
| @@ -59,12 +59,12 @@ EmuWindow_GLFW::EmuWindow_GLFW() { | |||
| 59 | ReloadSetKeymaps(); | 59 | ReloadSetKeymaps(); |
| 60 | 60 | ||
| 61 | glfwSetErrorCallback([](int error, const char *desc){ | 61 | glfwSetErrorCallback([](int error, const char *desc){ |
| 62 | ERROR_LOG(GUI, "GLFW 0x%08x: %s", error, desc); | 62 | LOG_ERROR(Frontend, "GLFW 0x%08x: %s", error, desc); |
| 63 | }); | 63 | }); |
| 64 | 64 | ||
| 65 | // Initialize the window | 65 | // Initialize the window |
| 66 | if(glfwInit() != GL_TRUE) { | 66 | if(glfwInit() != GL_TRUE) { |
| 67 | ERROR_LOG(GUI, "Failed to initialize GLFW! Exiting..."); | 67 | LOG_CRITICAL(Frontend, "Failed to initialize GLFW! Exiting..."); |
| 68 | exit(1); | 68 | exit(1); |
| 69 | } | 69 | } |
| 70 | glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); | 70 | glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); |
| @@ -79,7 +79,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() { | |||
| 79 | window_title.c_str(), nullptr, nullptr); | 79 | window_title.c_str(), nullptr, nullptr); |
| 80 | 80 | ||
| 81 | if (m_render_window == nullptr) { | 81 | if (m_render_window == nullptr) { |
| 82 | ERROR_LOG(GUI, "Failed to create GLFW window! Exiting..."); | 82 | LOG_CRITICAL(Frontend, "Failed to create GLFW window! Exiting..."); |
| 83 | exit(1); | 83 | exit(1); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| @@ -149,7 +149,7 @@ void EmuWindow_GLFW::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,u | |||
| 149 | std::pair<int,int> current_size; | 149 | std::pair<int,int> current_size; |
| 150 | glfwGetWindowSize(m_render_window, ¤t_size.first, ¤t_size.second); | 150 | glfwGetWindowSize(m_render_window, ¤t_size.first, ¤t_size.second); |
| 151 | 151 | ||
| 152 | _dbg_assert_(GUI, (int)minimal_size.first > 0 && (int)minimal_size.second > 0); | 152 | _dbg_assert_(Frontend, (int)minimal_size.first > 0 && (int)minimal_size.second > 0); |
| 153 | int new_width = std::max(current_size.first, (int)minimal_size.first); | 153 | int new_width = std::max(current_size.first, (int)minimal_size.first); |
| 154 | int new_height = std::max(current_size.second, (int)minimal_size.second); | 154 | int new_height = std::max(current_size.second, (int)minimal_size.second); |
| 155 | 155 | ||