Merge branch 'GLExtensions'

CMakeLists.txt

@@ -293,6 +293,8 @@ if(ANDROID)
 	set(USE_GLES3 1)
 endif()
 
+include_directories(Externals/GL)
+
 # For now GLES and EGL are tied to each other.
 # Enabling GLES also disables the OpenGL plugin.
 if(USE_GLES3)
@@ -352,8 +354,6 @@ if(NOT ANDROID)
 
 	if(NOT USE_GLES3)
 		include(FindOpenGL)
-		include_directories(${OPENGL_INCLUDE_DIR})
-		add_definitions(-DGLEW_NO_GLU)
 	else()
 		set(X11_FOUND 1)
 	endif()
@@ -653,22 +653,6 @@ else()
 	include_directories(Externals/SOIL)
 endif()
 
-if(WIN32)
-	find_library(GLEW glew32s PATHS Externals/GLew)
-	include_directories(Externals/GLew/include)
-else()
-	if(NOT USE_GLES3)
-		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-			include(FindGLEW)
-		endif()
-		if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_10_METHODS)
-			message("Using static GLEW from Externals")
-			add_subdirectory(Externals/GLew)
-			include_directories(Externals/GLew/include)
-		endif()
-	endif()
-endif()
-
 if (ANDROID)
 	message("Using static iconv from Externals")
 	include_directories(Externals/libiconv-1.14/include)

Externals/GLES3/GLES3/gl3ext.h

@@ -1,24 +0,0 @@
-#ifndef __gl3ext_h_
-#define __gl3ext_h_
-
-/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/* OpenGL ES 3 Extensions
- *
- * After an OES extension's interactions with OpenGl ES 3.0 have been documented,
- * its tokens and function definitions should be added to this file in a manner
- * that does not conflict with gl2ext.h or gl3.h.
- *
- * Tokens and function definitions for extensions that have become standard
- * features in OpenGL ES 3.0 will not be added to this file.
- *
- * Applications using OpenGL-ES-2-only extensions should include gl2ext.h
- */
-
-#endif /* __gl3ext_h_ */
-

Externals/GLES3/GLES3/gl3platform.h

@@ -1,30 +0,0 @@
-#ifndef __gl3platform_h_
-#define __gl3platform_h_
-
-/* $Revision: 18437 $ on $Date:: 2012-07-08 23:31:39 -0700 #$ */
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/* Platform-specific types and definitions for OpenGL ES 3.X  gl3.h
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * You are encouraged to submit all modifications to the Khronos group so that
- * they can be included in future versions of this file.  Please submit changes
- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
- * by filing a bug against product "OpenGL-ES" component "Registry".
- */
-
-#include <KHR/khrplatform.h>
-
-#ifndef GL_APICALL
-#define GL_APICALL  KHRONOS_APICALL
-#endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY KHRONOS_APIENTRY
-#endif
-
-#endif /* __gl3platform_h_ */

Externals/GLew/CMakeLists.txt

@@ -1,5 +0,0 @@
-include_directories(include)
-
-set(SRCS	src/glew.c)
-
-add_library(GLEW STATIC ${SRCS})

Externals/GLew/glew.vcxproj

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\glew.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\GL\glew.h" />
-    <ClInclude Include="include\GL\wglew.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2A3F751D-69E9-45F2-9199-9A00BFB6CC72}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\Source\VSProps\Base.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Externals/GLew/glew.vcxproj.filters

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="src\glew.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\GL\glew.h" />
-    <ClInclude Include="include\GL\wglew.h" />
-  </ItemGroup>
-</Project>

Externals/wxWidgets3/src/common/glcmn.cpp

@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 
 // for compilers that support precompilation, includes "wx.h".
+#define GL_GLEXT_PROTOTYPES
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

Source/Core/DolphinWX/Android/ButtonManager.cpp

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

Source/Core/DolphinWX/GLInterface.h

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

Source/Core/DolphinWX/GLInterface/AGL.h

@@ -18,7 +18,6 @@
 #define _INTERFACEAGL_H_
 
 #ifdef __APPLE__
-#include <GL/glew.h>
 #import <AppKit/AppKit.h>
 #endif
 

Source/Core/DolphinWX/GLInterface/EGL.cpp

@@ -35,6 +35,11 @@ void cInterfaceEGL::SwapInterval(int Interval)
 	eglSwapInterval(GLWin.egl_dpy, Interval);
 }
 
+void* cInterfaceEGL::GetProcAddress(std::string name)
+{
+	return (void*)eglGetProcAddress(name.c_str());
+}
+
 // Create rendering window.
 //		Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
 bool cInterfaceEGL::Create(void *&window_handle)