Bug 703516 - Move GLContext code into a separate folder. r=jrmuizel

--HG--
rename : gfx/thebes/EGLUtils.h => gfx/gl/EGLUtils.h
rename : gfx/thebes/GLContext.cpp => gfx/gl/GLContext.cpp
rename : gfx/thebes/GLContext.h => gfx/gl/GLContext.h
rename : gfx/thebes/GLContextProvider.h => gfx/gl/GLContextProvider.h
rename : gfx/thebes/GLContextProviderCGL.mm => gfx/gl/GLContextProviderCGL.mm
rename : gfx/thebes/GLContextProviderEGL.cpp => gfx/gl/GLContextProviderEGL.cpp
rename : gfx/thebes/GLContextProviderGLX.cpp => gfx/gl/GLContextProviderGLX.cpp
rename : gfx/thebes/GLContextProviderImpl.h => gfx/gl/GLContextProviderImpl.h
rename : gfx/thebes/GLContextProviderNull.cpp => gfx/gl/GLContextProviderNull.cpp
rename : gfx/thebes/GLContextProviderOSMesa.cpp => gfx/gl/GLContextProviderOSMesa.cpp
rename : gfx/thebes/GLContextProviderWGL.cpp => gfx/gl/GLContextProviderWGL.cpp
rename : gfx/thebes/GLContextSymbols.h => gfx/gl/GLContextSymbols.h
rename : gfx/thebes/GLDefs.h => gfx/gl/GLDefs.h
rename : gfx/thebes/GLXLibrary.h => gfx/gl/GLXLibrary.h
rename : gfx/thebes/WGLLibrary.h => gfx/gl/WGLLibrary.h

gfx/Makefile.in

@@ -48,7 +48,7 @@ ifdef MOZ_TREE_CAIRO
 DIRS		= cairo
 endif
 
-DIRS		+= 2d ycbcr angle src qcms layers harfbuzz/src ots/src thebes ipc
+DIRS		+= 2d ycbcr angle src qcms gl layers harfbuzz/src ots/src thebes ipc
 
 ifeq (,$(filter-out cocoa android windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS        += skia

gfx/gl/Makefile.in

@@ -0,0 +1,96 @@
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= gl
+LIBRARY_NAME	= gl
+LIBXUL_LIBRARY	= 1
+EXPORT_LIBRARY	= 1
+
+EXPORTS	= \
+	GLDefs.h \
+	GLContext.h \
+	GLContextSymbols.h \
+	GLContextProvider.h \
+	GLContextProviderImpl.h \
+	EGLUtils.h \
+	$(NULL)
+
+ifdef MOZ_X11
+EXPORTS += \
+	GLXLibrary.h \
+	$(NULL)
+endif
+
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+EXPORTS	+= \
+	WGLLibrary.h \
+	$(NULL)
+endif
+
+CPPSRCS	= \
+	GLContext.cpp \
+	GLContextProviderOSMesa.cpp \
+	$(NULL)
+
+GL_PROVIDER = Null
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+GL_PROVIDER = WGL
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+GL_PROVIDER = CGL
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ifdef MOZ_PLATFORM_MAEMO
+GL_PROVIDER = EGL
+else
+ifdef MOZ_EGL_XRENDER_COMPOSITE
+GL_PROVIDER = EGL
+else
+GL_PROVIDER = GLX
+endif
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+ifdef MOZ_PLATFORM_MAEMO
+GL_PROVIDER = EGL
+else
+GL_PROVIDER = GLX
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+GL_PROVIDER = EGL
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
+GL_PROVIDER = EGL
+endif
+
+# Mac is a special snowflake
+ifeq ($(GL_PROVIDER),CGL)
+CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
+else
+CPPSRCS += GLContextProvider$(GL_PROVIDER).cpp
+endif
+
+# Win32 is a special snowflake, for ANGLE
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+CPPSRCS += GLContextProviderEGL.cpp
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES := $(filter-out -DUNICODE,$(DEFINES))
+
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)

gfx/thebes/Makefile.in

@@ -46,13 +46,7 @@ EXPORTS	= \
 	gfxUnicodeProperties.h \
 	gfxUtils.h \
 	gfxUserFontSet.h \
-	GLDefs.h \
-	GLContext.h \
-	GLContextSymbols.h \
-	GLContextProvider.h \
-	GLContextProviderImpl.h \
 	nsCoreAnimationSupport.h \
-	EGLUtils.h \
 	gfxSharedImageSurface.h \
 	$(NULL)
 
@@ -95,7 +89,6 @@ ifdef MOZ_X11
 EXPORTS += \
 	gfxXlibSurface.h \
         gfxXlibNativeRenderer.h \
-	GLXLibrary.h \
 	$(NULL)
 endif
 
@@ -131,7 +124,6 @@ EXPORTS += \
 ifdef MOZ_X11
 EXPORTS += \
 	gfxXlibSurface.h \
-	GLXLibrary.h \
 	$(NULL)
 endif
 
@@ -148,7 +140,6 @@ EXPORTS	+= \
 	gfxWindowsPlatform.h \
 	gfxWindowsSurface.h \
 	gfxWindowsNativeDrawing.h \
-	WGLLibrary.h \
 	gfxDWriteFonts.h \
 	gfxD2DSurface.h \
 	gfxGDIFont.h \
@@ -188,8 +179,6 @@ CPPSRCS	= \
 	gfxUnicodeProperties.cpp \
 	gfxScriptItemizer.cpp \
 	gfxHarfBuzzShaper.cpp \
-	GLContext.cpp \
-	GLContextProviderOSMesa.cpp \
 	gfxSharedImageSurface.cpp \
 	$(NULL)
 
@@ -348,56 +337,6 @@ endif
 
 CSRCS += woff.c
 
-GL_PROVIDER = Null
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-GL_PROVIDER = WGL
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-GL_PROVIDER = CGL
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-ifdef MOZ_PLATFORM_MAEMO
-GL_PROVIDER = EGL
-else
-ifdef MOZ_EGL_XRENDER_COMPOSITE
-GL_PROVIDER = EGL
-else
-GL_PROVIDER = GLX
-endif
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-ifdef MOZ_PLATFORM_MAEMO
-GL_PROVIDER = EGL
-else
-GL_PROVIDER = GLX
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-GL_PROVIDER = EGL
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-GL_PROVIDER = EGL
-endif
-
-# Mac is a special snowflake
-ifeq ($(GL_PROVIDER),CGL)
-CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
-else
-CPPSRCS += GLContextProvider$(GL_PROVIDER).cpp
-endif
-
-# Win32 is a special snowflake, for ANGLE
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-CPPSRCS += GLContextProviderEGL.cpp
-endif
-
 DEFINES += -DIMPL_THEBES -DWOFF_MOZILLA_CLIENT
 
 include $(topsrcdir)/config/rules.mk

toolkit/library/libxul-config.mk

@@ -265,7 +265,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 COMPONENT_LIBS += widget_gonk
 endif
 
-STATIC_LIBS += thebes ycbcr
+STATIC_LIBS += thebes gl ycbcr
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 STATIC_LIBS += profiler