ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiling Dolphin on devices that provide crazy GLES drivers

This commit is contained in:
Ryan Houdek 2013-03-05 03:53:25 +00:00
parent b7db96e2e5
commit 3ac7ee4623
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp
View File

@ -141,7 +141,7 @@ bool cInterfaceEGL::Create(void *&window_handle)
return false; return false;
} }
GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.win, NULL); GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, (NativeWindowType)GLWin.win, NULL);
if (!GLWin.egl_surf) { if (!GLWin.egl_surf) {
ERROR_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n"); ERROR_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n");
return false; return false;

1
Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h
View File

@ -20,6 +20,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#ifdef USE_GLES #ifdef USE_GLES
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <X11/Xutil.h>
#else #else
#include <GL/glxew.h> #include <GL/glxew.h>
#include <GL/gl.h> #include <GL/gl.h>

2
Source/Core/DolphinWX/Src/X11Utils.cpp
View File

@ -16,7 +16,6 @@
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "X11Utils.h" #include "X11Utils.h"
#include "WxUtils.h"
#include <unistd.h> #include <unistd.h>
#include <spawn.h> #include <spawn.h>
@ -27,6 +26,7 @@ extern char **environ;
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include "WxUtils.h"
#endif #endif
namespace X11Utils namespace X11Utils