[cogl/wip/combined-driver-build: 3/5] cogl-context: Remove the driver private data

[Neil Roberts <nroberts src gnome org>]

commit 5878290c18bcee75ca0013b6928b7d1a78baa792
Author: Neil Roberts <neil linux intel com>
Date:   Thu Jul 7 12:02:05 2011 +0100

    cogl-context: Remove the driver private data
    
    Since the GL function pointers have move to the root of CoglContext,
    the driver specific data for GLES became empty and the GL data had
    only one varible which apparently nothing was using. It's therefore
    convenient to remove the private driver data to make it easier to have
    a build of Cogl which enables both GL and GLES support. If we ever
    need driver private data later we might want to use
    cogl_object_set_user_data instead.

 cogl/Makefile.am                            |    2 -
 cogl/cogl-context-private.h                 |   10 -------
 cogl/driver/gl/cogl-context-driver-gl.h     |   35 ---------------------------
 cogl/driver/gles/cogl-context-driver-gles.h |   34 --------------------------
 4 files changed, 0 insertions(+), 81 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 802fc30..7e7469c 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -106,7 +106,6 @@ if COGL_DRIVER_GL
 cogl_driver_sources += \
 	$(srcdir)/driver/gl/cogl-gl.c			\
 	$(srcdir)/driver/gl/cogl-texture-driver-gl.c	\
-	$(srcdir)/driver/gl/cogl-context-driver-gl.h	\
 	$(NULL)
 endif
 
@@ -114,7 +113,6 @@ if COGL_DRIVER_GLES
 cogl_driver_sources += \
 	$(srcdir)/driver/gles/cogl-gles.c			\
 	$(srcdir)/driver/gles/cogl-texture-driver-gles.c	\
-	$(srcdir)/driver/gles/cogl-context-driver-gles.h	\
 	$(NULL)
 
 endif # COGL_DRIVER_GLES
diff --git a/cogl/cogl-context-private.h b/cogl/cogl-context-private.h
index 386407f..aeefc7d 100644
--- a/cogl/cogl-context-private.h
+++ b/cogl/cogl-context-private.h
@@ -33,14 +33,6 @@
 #include "cogl-xlib-private.h"
 #endif
 
-#if HAVE_COGL_GL
-#include "cogl-context-driver-gl.h"
-#endif
-
-#if HAVE_COGL_GLES || HAVE_COGL_GLES2
-#include "cogl-context-driver-gles.h"
-#endif
-
 #include "cogl-display-private.h"
 #include "cogl-primitives.h"
 #include "cogl-clip-stack.h"
@@ -259,8 +251,6 @@ struct _CoglContext
   CoglXlibTrapState *trap_state;
 #endif
 
-  CoglContextDriver drv;
-
   unsigned int winsys_features
     [COGL_FLAGS_N_INTS_FOR_SIZE (COGL_WINSYS_FEATURE_N_FEATURES)];
   void *winsys;