piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

[GLExtensions] Remove a bunch of unneeded headers. Fix Linux+EGL compiling. Move include to glx.h around to work around it including global GL/gl.h

Browse Source
This commit is contained in:
Ryan Houdek
2014-01-13 03:14:09 -06:00
committed by degasus
parent 6cdb05b633
commit 3d4d3f6b11
6 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/GLInterface/EGL.h
View File

@ -17,13 +17,7 @@
#ifndef _INTERFACEEGL_H_
#define _INTERFACEEGL_H_
#if USE_GLES
#include <GL/gl.h>
#else
#include <GL/glxew.h>
#include <GL/gl.h>
#endif
#include <EGL/egl.h>
#include "InterfaceBase.h"
class cPlatform;

5
Source/Core/DolphinWX/GLInterface/GLX.h
View File

@ -17,11 +17,6 @@
#ifndef _INTERFACEGLX_H_
#define _INTERFACEGLX_H_
#include <GL/gl.h>
#include <GL/glx.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include "X11_Util.h"
#include "InterfaceBase.h"

6
Source/Core/DolphinWX/GLInterface/X11_Util.cpp
View File

@ -69,12 +69,6 @@ bool cXInterface::Initialize(void *config)
if (GLWin.parent == 0)
GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen);
/* Set initial projection/viewing transformation.
* We can't be sure we'll get a ConfigureNotify event when the window
* first appears.
*/
glViewport(0, 0, (GLint) GLWin.width, (GLint) GLWin.height);
return true;
}