Moved declarations of EGL dependencies to main.h.

src/libEGL/Display.cpp

@@ -16,10 +16,10 @@
 
 #include "common/debug.h"
 #include "libGLESv2/mathutil.h"
+#include "libGLESv2/main.h"
 
 #include "libEGL/main.h"
 
-
 namespace egl
 {
 namespace

src/libEGL/Surface.cpp

@@ -15,6 +15,7 @@
 #include "common/debug.h"
 #include "libGLESv2/Texture.h"
 #include "libGLESv2/renderer/SwapChain.h"
+#include "libGLESv2/main.h"
 
 #include "libEGL/main.h"
 #include "libEGL/Display.h"

src/libEGL/libEGL.cpp

@@ -12,6 +12,7 @@
 #include "common/version.h"
 #include "libGLESv2/Context.h"
 #include "libGLESv2/Texture.h"
+#include "libGLESv2/main.h"
 
 #include "libEGL/main.h"
 #include "libEGL/Display.h"

src/libGLESv2/Context.h

@@ -660,21 +660,4 @@ class Context
 };
 }
 
-extern "C"
-{
-// Exported functions for use by EGL
-gl::Context *glCreateContext(const gl::Context *shareContext, bool notifyResets, bool robustAccess);
-void glDestroyContext(gl::Context *context);
-void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *surface);
-gl::Context *glGetCurrentContext();
-rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice);
-void glDestroyRenderer(rx::Renderer *renderer);
-rx::SwapChain *glCreateSwapChain(rx::Renderer9 *renderer, HWND window, HANDLE shareHandle,
-                                       GLenum backBufferFormat, GLenum depthBufferFormat);  // D3D9_REPLACE
-void glDestroySwapChain(rx::SwapChain *swapChain);
-
-__eglMustCastToProperFunctionPointerType __stdcall glGetProcAddress(const char *procname);
-bool __stdcall glBindTexImage(egl::Surface *surface);
-}
-
 #endif   // INCLUDE_CONTEXT_H_

src/libGLESv2/main.h

@@ -45,4 +45,21 @@ const T &error(GLenum errorCode, const T &returnValue)
     return returnValue;
 }
 
+extern "C"
+{
+// Exported functions for use by EGL
+gl::Context *glCreateContext(const gl::Context *shareContext, bool notifyResets, bool robustAccess);
+void glDestroyContext(gl::Context *context);
+void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *surface);
+gl::Context *glGetCurrentContext();
+rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice);
+void glDestroyRenderer(rx::Renderer *renderer);
+rx::SwapChain *glCreateSwapChain(rx::Renderer9 *renderer, HWND window, HANDLE shareHandle,
+                                       GLenum backBufferFormat, GLenum depthBufferFormat);  // D3D9_REPLACE
+void glDestroySwapChain(rx::SwapChain *swapChain);
+
+__eglMustCastToProperFunctionPointerType __stdcall glGetProcAddress(const char *procname);
+bool __stdcall glBindTexImage(egl::Surface *surface);
+}
+
 #endif   // LIBGLESV2_MAIN_H_

src/libGLESv2/renderer/SwapChain.cpp

@@ -14,6 +14,7 @@
 #include "libGLESv2/renderer/renderer9_utils.h" // D3D9_REPLACE
 #include "libGLESv2/renderer/Renderer9.h"   // D3D9_REPLACE
 #include "libGLESv2/Context.h"
+#include "libGLESv2/main.h"
 
 namespace rx
 {