The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 16:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disabled padsimple with gltest.

Browse Source 
SDL now doesn't crash


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1641 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-23 14:12:44 +00:00
parent 590adfce53
commit e099bbc3ba
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
View File

@ -189,7 +189,6 @@ void PAD_Initialize(SPADInitialize _PADInitialize)
dinput.Init((HWND)g_PADInitialize.hWnd);
#elif defined(HAVE_X11) && HAVE_X11
GXdsp = (Display*)g_PADInitialize.hWnd;
XkbSetDetectableAutoRepeat(GXdsp, True, NULL);
#endif
LoadConfig();

4
Source/Plugins/Plugin_PadSimple/Src/SConscript
View File

@ -9,6 +9,10 @@ if not env['HAVE_X11']:
print name + " must have X11 to be build"
Return()
if env['GLTEST']:
print name + " Doesn't work with testgl"
Return()
files = [
"PadSimple.cpp",
]

3
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -386,7 +386,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
GLX_DEPTH_SIZE, 24,
GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode, GLX_SAMPLES_ARB, 1, None };
GLWin.dpy = XOpenDisplay(0);
g_VideoInitialize.pWindowHandle = (HWND)GLWin.dpy;
g_VideoInitialize.pWindowHandle = (HWND)GLWin.dpy;
GLWin.screen = DefaultScreen(GLWin.dpy);
GLWin.fs = g_Config.bFullscreen; //Set to setting in Options
@ -417,6 +417,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
vi->visual, AllocNone);
GLWin.attr.colormap = cmap;
GLWin.attr.border_pixel = 0;
XkbSetDetectableAutoRepeat(GLWin.dpy, True, NULL);
#if defined(HAVE_XXF86VM) && HAVE_XXF86VM
// get a connection

2
Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp
View File

@ -92,6 +92,8 @@ X11Window::X11Window(int _iwidth, int _iheight) {
attr.colormap = cmap;
attr.border_pixel = 0;
XkbSetDetectableAutoRepeat(dpy, True, NULL);
// get a connection
XF86VidModeQueryVersion(dpy, &vidModeMajorVersion, &vidModeMinorVersion);

1
Source/Plugins/Plugin_VideoOGL/Src/X11Window.h
View File

@ -11,6 +11,7 @@
#include <X11/keysym.h>
#include <X11/extensions/xf86vmode.h>
#include <X11/XKBlib.h>
class X11Window : public GLWindow
{