Просмотр исходного кода

Port #3335 and #3373 from Citra: "Small SDL fixes" and "Print the actual error preventing SDL from working" (#637)

* Port #3335 and #3373 from Citra

* Fixup: Use the new logging placeholders
Tobias 8 лет назад
Родитель
Сommit
316b933a31
2 измененных файлов с 4 добавлено и 6 удалено
  1. 3 3
      src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
  2. 1 3
      src/yuzu_cmd/yuzu.cpp

+ 3 - 3
src/yuzu_cmd/emu_window/emu_window_sdl2.cpp

@@ -126,7 +126,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
                          SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
                          SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
 
 
     if (render_window == nullptr) {
     if (render_window == nullptr) {
-        LOG_CRITICAL(Frontend, "Failed to create SDL2 window! Exiting...");
+        LOG_CRITICAL(Frontend, "Failed to create SDL2 window! {}", SDL_GetError());
         exit(1);
         exit(1);
     }
     }
 
 
@@ -137,12 +137,12 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
     gl_context = SDL_GL_CreateContext(render_window);
     gl_context = SDL_GL_CreateContext(render_window);
 
 
     if (gl_context == nullptr) {
     if (gl_context == nullptr) {
-        LOG_CRITICAL(Frontend, "Failed to create SDL2 GL context! Exiting...");
+        LOG_CRITICAL(Frontend, "Failed to create SDL2 GL context! {}", SDL_GetError());
         exit(1);
         exit(1);
     }
     }
 
 
     if (!gladLoadGLLoader(static_cast<GLADloadproc>(SDL_GL_GetProcAddress))) {
     if (!gladLoadGLLoader(static_cast<GLADloadproc>(SDL_GL_GetProcAddress))) {
-        LOG_CRITICAL(Frontend, "Failed to initialize GL functions! Exiting...");
+        LOG_CRITICAL(Frontend, "Failed to initialize GL functions! {}", SDL_GetError());
         exit(1);
         exit(1);
     }
     }
 
 

+ 1 - 3
src/yuzu_cmd/yuzu.cpp

@@ -22,10 +22,8 @@
 #include "yuzu_cmd/config.h"
 #include "yuzu_cmd/config.h"
 #include "yuzu_cmd/emu_window/emu_window_sdl2.h"
 #include "yuzu_cmd/emu_window/emu_window_sdl2.h"
 
 
-#ifdef _MSC_VER
-#include <getopt.h>
-#else
 #include <getopt.h>
 #include <getopt.h>
+#ifndef _MSC_VER
 #include <unistd.h>
 #include <unistd.h>
 #endif
 #endif