The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 23:59:27 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -352,10 +352,6 @@ if(NOT ANDROID)
if(NOT USE_GLES3) if(NOT USE_GLES3)
include(FindOpenGL) include(FindOpenGL)
include_directories(${OPENGL_INCLUDE_DIR})
add_definitions(-DGLEW_NO_GLU)
else()
set(X11_FOUND 1)
endif() endif()
include(FindALSA OPTIONAL) include(FindALSA OPTIONAL)

2
Source/Core/DolphinWX/Android/ButtonManager.cpp
View File

@ -19,8 +19,6 @@
#include "GLInterface.h" #include "GLInterface.h"
#include "Android/ButtonManager.h" #include "Android/ButtonManager.h"
extern void DrawButton(GLuint tex, float *coords);
namespace ButtonManager namespace ButtonManager
{ {
// Pair key is padID, BUTTONTYPE // Pair key is padID, BUTTONTYPE

9
Source/Core/DolphinWX/GLInterface.h
View File

@ -10,12 +10,7 @@
#else #else
#include "Thread.h" #include "Thread.h"
#ifdef ANDROID #if defined(USE_EGL) && USE_EGL
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <EGL/egl.h>
#include "GLInterface/EGL.h"
#elif defined(USE_EGL) && USE_EGL
#include "GLInterface/EGL.h" #include "GLInterface/EGL.h"
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include "GLInterface/AGL.h" #include "GLInterface/AGL.h"
@ -23,10 +18,12 @@
#include "GLInterface/WGL.h" #include "GLInterface/WGL.h"
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
#include "GLInterface/GLX.h" #include "GLInterface/GLX.h"
#include <GL/glx.h>
#else #else
#error Platform doesnt have a GLInterface #error Platform doesnt have a GLInterface
#endif #endif
typedef struct { typedef struct {
#if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop #if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop
int screen; int screen;

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

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

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

@ -17,11 +17,6 @@
#ifndef _INTERFACEGLX_H_ #ifndef _INTERFACEGLX_H_
#define _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 "X11_Util.h"
#include "InterfaceBase.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) if (GLWin.parent == 0)
GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen); 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; return true;
} }