Remove OpenGL ES 1.1 support

We haven't depended on OpenGL ES 1.1 support for years now and if we can
remove the need to support GL's legacy fixed function apis then we may
simplify some parts of Cogl.

Author: rib

Makefile.am

@@ -34,7 +34,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--enable-maintainer-flags \
 	--enable-profile \
-	--enable-gles1 \
 	--enable-gles2 \
 	--enable-gl \
 	--enable-xlib-egl-platform \

README.in

@@ -42,7 +42,7 @@ REQUIREMENTS
 
 Cogl currently only requires:
 
-  • OpenGL ≥ 1.3 (or 1.2 + multitexturing), or OpenGL ES 2.0 (or 1.1)
+  • OpenGL ≥ 1.3 (or 1.2 + multitexturing), or OpenGL ES 2.0
   • GLX, AGL, WGL or an EGL implementation
 
 Cogl also has optional dependencies:

cogl/Makefile.am

@@ -30,7 +30,6 @@ AM_CPPFLAGS += \
 	-DG_LOG_DOMAIN=\"Cogl\" 	\
 	-DCOGL_COMPILATION		\
 	-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \
-	-DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \
 	-DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \
 	-DCOGL_LOCALEDIR=\""$(localedir)"\" \
 	$(NULL)

cogl/Makefile.sources

@@ -66,7 +66,6 @@ cogl_driver_sources = \
 cogl_gl_prototypes_h = \
 	gl-prototypes/cogl-gles2-functions.h		\
 	gl-prototypes/cogl-core-functions.h		\
-	gl-prototypes/cogl-in-gles-core-functions.h	\
 	gl-prototypes/cogl-in-gles2-core-functions.h	\
 	gl-prototypes/cogl-glsl-functions.h
 
@@ -265,11 +264,8 @@ cogl_sources_c = \
 	cogl-poll-private.h			\
 	cogl-poll.c				\
 	gl-prototypes/cogl-all-functions.h	\
-	gl-prototypes/cogl-gles1-functions.h	\
 	gl-prototypes/cogl-gles2-functions.h	\
 	gl-prototypes/cogl-core-functions.h	\
-	gl-prototypes/cogl-in-gles-core-functions.h	\
-	gl-prototypes/cogl-in-gles1-core-functions.h	\
 	gl-prototypes/cogl-in-gles2-core-functions.h	\
 	gl-prototypes/cogl-fixed-functions.h	\
 	gl-prototypes/cogl-glsl-functions.h	\

cogl/cogl-context.c

@@ -355,18 +355,18 @@ cogl_context_new (CoglDisplay *display,
   context->texture_download_pipeline = NULL;
   context->blit_texture_pipeline = NULL;
 
-#if defined (HAVE_COGL_GL) || defined (HAVE_COGL_GLES)
+#if defined (HAVE_COGL_GL)
   if (_cogl_has_private_feature (context, COGL_PRIVATE_FEATURE_ALPHA_TEST))
-    /* The default for GL_ALPHA_TEST is to always pass which is equivalent to
-     * the test being disabled therefore we assume that for all drivers there
-     * will be no performance impact if we always leave the test enabled which
-     * makes things a bit simpler for us. Under GLES2 the alpha test is
-     * implemented in the fragment shader so there is no enable for it
-     */
-    GE (context, glEnable (GL_ALPHA_TEST));
-#endif
+    {
+      /* The default for GL_ALPHA_TEST is to always pass which is equivalent to
+       * the test being disabled therefore we assume that for all drivers there
+       * will be no performance impact if we always leave the test enabled which
+       * makes things a bit simpler for us. Under GLES2 the alpha test is
+       * implemented in the fragment shader so there is no enable for it
+       */
+      GE (context, glEnable (GL_ALPHA_TEST));
+    }
 
-#if defined (HAVE_COGL_GL)
   if ((context->driver == COGL_DRIVER_GL3))
     {
       GLuint vertex_array;

cogl/cogl-defines.h.win32.in

@@ -47,15 +47,10 @@ G_BEGIN_DECLS
 #define CLUTTER_COGL_HAS_GL 1
 
 #ifdef COGL_HAS_EGL_SUPPORT
-#ifdef COGL_HAS_GLES1
-#include <GLES/gl.h>
-#include <GLES/egl.h>
-#else
 #include <EGL/egl.h>
 #define NativeDisplayType EGLNativeDisplayType
 #define NativeWindowType EGLNativeWindowType
 #endif
-#endif
 
 #ifndef GL_OES_EGL_image
 #define GLeglImageOES void *

cogl/cogl-defines.h.win32_SDL.in

@@ -48,15 +48,10 @@ G_BEGIN_DECLS
 #define CLUTTER_COGL_HAS_GL 1
 
 #ifdef COGL_HAS_EGL_SUPPORT
-#ifdef COGL_HAS_GLES1
-#include <GLES/gl.h>
-#include <GLES/egl.h>
-#else
 #include <EGL/egl.h>
 #define NativeDisplayType EGLNativeDisplayType
 #define NativeWindowType EGLNativeWindowType
 #endif
-#endif
 
 #ifndef GL_OES_EGL_image
 #define GLeglImageOES void *

cogl/cogl-feature-private.c

@@ -61,8 +61,6 @@ _cogl_feature_check (CoglRenderer *renderer,
         driver == COGL_DRIVER_GL3) &&
        COGL_CHECK_GL_VERSION (gl_major, gl_minor,
                               data->min_gl_major, data->min_gl_minor)) ||
-      (driver == COGL_DRIVER_GLES1 &&
-       (data->gles_availability & COGL_EXT_IN_GLES)) ||
       (driver == COGL_DRIVER_GLES2 &&
        (data->gles_availability & COGL_EXT_IN_GLES2)))
     {

cogl/cogl-feature-private.h

@@ -39,10 +39,11 @@
   ((driver_major) > (target_major) || \
    ((driver_major) == (target_major) && (driver_minor) >= (target_minor)))
 
+/* This is a leftover from when we used to support GLES 1.1, though
+ * we may want to use this to differentiate WebGL later */
 typedef enum
 {
-  COGL_EXT_IN_GLES = (1 << 0),
-  COGL_EXT_IN_GLES2 = (1 << 1)
+  COGL_EXT_IN_GLES2 = (1 << 0)
 } CoglExtGlesAvailability;
 
 typedef struct _CoglFeatureFunction CoglFeatureFunction;

cogl/cogl-matrix-stack.c

@@ -823,7 +823,7 @@ _cogl_matrix_flush_to_gl_builtin (CoglContext *ctx,
 {
   u_assert (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_GL_FIXED));
 
-#if defined (HAVE_COGL_GL) || defined (HAVE_COGL_GLES)
+#if defined (HAVE_COGL_GL)
   if (ctx->flushed_matrix_mode != mode)
     {
       GLenum gl_mode = 0;
@@ -863,7 +863,7 @@ _cogl_matrix_entry_flush_to_gl_builtins (CoglContext *ctx,
 {
   u_assert (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_GL_FIXED));
 
-#if defined (HAVE_COGL_GL) || defined (HAVE_COGL_GLES)
+#if defined (HAVE_COGL_GL)
   {
     CoglBool needs_flip;
     CoglMatrixEntryCache *cache;