[mutter] cogl: Remove unused cogl-gles2 API
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Remove unused cogl-gles2 API
- Date: Fri, 16 Aug 2019 06:43:37 +0000 (UTC)
commit 7e8a8649926db7e40468300a0142832f3f48edf4
Author: Adam Jackson <ajax redhat com>
Date: Tue Mar 19 17:50:39 2019 -0400
cogl: Remove unused cogl-gles2 API
This was introduced in:
commit 010d16f6479c90b66b7f90ab0341575b41555fca
Author: Robert Bragg <robert linux intel com>
Date: Tue Mar 6 03:21:30 2012 +0000
Adds initial GLES2 integration support
This makes it possible to integrate existing GLES2 code with
applications using Cogl as the rendering api.
That's maybe a reasonable thing for a standalone cogl to want, but our
cogl has only one consumer. So if we want additional rendering out of
our cogl layer, it makes more sense to just add that to cogl rather than
support clutter or mutter or the javascript bindings creating their own
GLES contexts.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/500
cogl/cogl-gles2/GLES2/gl2.h | 169 ---
cogl/cogl-gles2/GLES2/gl2ext.h | 1498 -----------------------
cogl/cogl-gles2/GLES2/gl2platform.h | 28 -
cogl/cogl-gles2/cogl-gles2-api.c | 1048 ----------------
cogl/cogl-gles2/libmutter-cogl-gles2.map | 4 -
cogl/cogl-gles2/meson.build | 45 -
cogl/cogl-gles2/mutter-cogl-gles2.pc.in | 13 -
cogl/cogl/cogl-context-private.h | 3 -
cogl/cogl/cogl-context.c | 4 -
cogl/cogl/cogl-context.h | 3 -
cogl/cogl/cogl-gles2-context-private.h | 201 ---
cogl/cogl/cogl-gles2-context.c | 1964 ------------------------------
cogl/cogl/cogl-gles2-types.h | 475 --------
cogl/cogl/cogl-gles2.h | 416 -------
cogl/cogl/cogl-renderer-private.h | 5 -
cogl/cogl/cogl-renderer.c | 24 +-
cogl/cogl/cogl-renderer.h | 5 -
cogl/cogl/cogl.symbols | 12 -
cogl/cogl/meson.build | 4 -
cogl/cogl/winsys/cogl-winsys-egl.c | 154 +--
cogl/cogl/winsys/cogl-winsys-private.h | 17 -
cogl/meson.build | 3 -
cogl/test-fixtures/test-utils.c | 6 -
cogl/test-fixtures/test-utils.h | 1 -
cogl/tests/conform/meson.build | 1 -
cogl/tests/conform/test-conform-main.c | 6 -
cogl/tests/conform/test-gles2-context.c | 963 ---------------
27 files changed, 2 insertions(+), 7070 deletions(-)
---
diff --git a/cogl/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h
index 7e87db7d8..e02d36021 100644
--- a/cogl/cogl/cogl-context-private.h
+++ b/cogl/cogl/cogl-context-private.h
@@ -212,9 +212,6 @@ struct _CoglContext
CoglList onscreen_dirty_queue;
CoglClosure *onscreen_dispatch_idle;
- CoglGLES2Context *current_gles2_context;
- GQueue gles2_context_stack;
-
/* This becomes TRUE the first time the context is bound to an
* onscreen buffer. This is used by cogl-framebuffer-gl to determine
* when to initialise the glDrawBuffer state */
diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c
index d912ac429..6843636d6 100644
--- a/cogl/cogl/cogl-context.c
+++ b/cogl/cogl/cogl-context.c
@@ -288,8 +288,6 @@ cogl_context_new (CoglDisplay *display,
_cogl_list_init (&context->onscreen_events_queue);
_cogl_list_init (&context->onscreen_dirty_queue);
- g_queue_init (&context->gles2_context_stack);
-
context->journal_flush_attributes_array =
g_array_new (TRUE, FALSE, sizeof (CoglAttribute *));
context->journal_clip_bounds = NULL;
@@ -454,8 +452,6 @@ _cogl_context_free (CoglContext *context)
if (context->swap_callback_closures)
g_hash_table_destroy (context->swap_callback_closures);
- g_warn_if_fail (context->gles2_context_stack.length == 0);
-
if (context->journal_flush_attributes_array)
g_array_free (context->journal_flush_attributes_array, TRUE);
if (context->journal_clip_bounds)
diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
index c8dbf6622..7d40e1b60 100644
--- a/cogl/cogl/cogl-context.h
+++ b/cogl/cogl/cogl-context.h
@@ -202,8 +202,6 @@ cogl_is_context (void *object);
* @COGL_FEATURE_ID_BUFFER_AGE: Available if the age of #CoglOnscreen back
* buffers are tracked and so cogl_onscreen_get_buffer_age() can be
* expected to return age values other than 0.
- * @COGL_FEATURE_ID_GLES2_CONTEXT: Whether creating new GLES2 contexts is
- * suported.
* @COGL_FEATURE_ID_DEPTH_TEXTURE: Whether #CoglFramebuffer support rendering
* the depth buffer to a texture.
* @COGL_FEATURE_ID_PRESENTATION_TIME: Whether frame presentation
@@ -227,7 +225,6 @@ typedef enum _CoglFeatureID
COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE,
COGL_FEATURE_ID_MIRRORED_REPEAT,
COGL_FEATURE_ID_SWAP_BUFFERS_EVENT,
- COGL_FEATURE_ID_GLES2_CONTEXT,
COGL_FEATURE_ID_DEPTH_TEXTURE,
COGL_FEATURE_ID_PRESENTATION_TIME,
COGL_FEATURE_ID_FENCE,
diff --git a/cogl/cogl/cogl-renderer-private.h b/cogl/cogl/cogl-renderer-private.h
index a308801a7..0607f9124 100644
--- a/cogl/cogl/cogl-renderer-private.h
+++ b/cogl/cogl/cogl-renderer-private.h
@@ -84,11 +84,6 @@ struct _CoglRenderer
void *winsys;
};
-/* Mask of constraints that effect driver selection. All of the other
- * constraints effect only the winsys selection */
-#define COGL_RENDERER_DRIVER_CONSTRAINTS \
- COGL_RENDERER_CONSTRAINT_SUPPORTS_COGL_GLES2
-
typedef CoglFilterReturn (* CoglNativeFilterFunc) (void *native_event,
void *data);
diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index e4319bac5..b892f9055 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -76,7 +76,6 @@ typedef struct _CoglDriverDescription
{
CoglDriver id;
const char *name;
- CoglRendererConstraint constraints;
/* It would be nice to make this a pointer and then use a compound
* literal from C99 to initialise it but we probably can't get away
* with using C99 here. Instead we'll just use a fixed-size array.
@@ -94,7 +93,6 @@ static CoglDriverDescription _cogl_drivers[] =
{
COGL_DRIVER_GL,
"gl",
- 0,
{ COGL_PRIVATE_FEATURE_ANY_GL,
COGL_PRIVATE_FEATURE_GL_FIXED,
COGL_PRIVATE_FEATURE_GL_PROGRAMMABLE,
@@ -106,7 +104,6 @@ static CoglDriverDescription _cogl_drivers[] =
{
COGL_DRIVER_GL3,
"gl3",
- 0,
{ COGL_PRIVATE_FEATURE_ANY_GL,
COGL_PRIVATE_FEATURE_GL_PROGRAMMABLE,
-1 },
@@ -119,7 +116,6 @@ static CoglDriverDescription _cogl_drivers[] =
{
COGL_DRIVER_GLES2,
"gles2",
- COGL_RENDERER_CONSTRAINT_SUPPORTS_COGL_GLES2,
{ COGL_PRIVATE_FEATURE_ANY_GL,
COGL_PRIVATE_FEATURE_GL_EMBEDDED,
COGL_PRIVATE_FEATURE_GL_PROGRAMMABLE,
@@ -132,7 +128,6 @@ static CoglDriverDescription _cogl_drivers[] =
{
COGL_DRIVER_NOP,
"nop",
- 0, /* constraints satisfied */
{ -1 },
&_cogl_driver_nop,
NULL, /* texture driver */
@@ -398,31 +393,15 @@ driver_id_to_name (CoglDriver id)
typedef struct _SatisfyConstraintsState
{
- GList *constraints;
const CoglDriverDescription *driver_description;
} SatisfyConstraintsState;
+/* XXX this is still uglier than it needs to be */
static gboolean
satisfy_constraints (CoglDriverDescription *description,
void *user_data)
{
SatisfyConstraintsState *state = user_data;
- GList *l;
-
- for (l = state->constraints; l; l = l->next)
- {
- CoglRendererConstraint constraint = GPOINTER_TO_UINT (l->data);
-
- /* Most of the constraints only affect the winsys selection so
- * we'll filter them out */
- if (!(constraint & COGL_RENDERER_DRIVER_CONSTRAINTS))
- continue;
-
- /* If the driver doesn't satisfy any constraint then continue
- * to the next driver description */
- if (!(constraint & description->constraints))
- return TRUE;
- }
state->driver_description = description;
@@ -493,7 +472,6 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
}
state.driver_description = NULL;
- state.constraints = renderer->constraints;
foreach_driver_description (driver_override,
satisfy_constraints,
diff --git a/cogl/cogl/cogl-renderer.h b/cogl/cogl/cogl-renderer.h
index 09ccbb899..cdee0008e 100644
--- a/cogl/cogl/cogl-renderer.h
+++ b/cogl/cogl/cogl-renderer.h
@@ -261,10 +261,6 @@ cogl_renderer_connect (CoglRenderer *renderer, GError **error);
* @COGL_RENDERER_CONSTRAINT_USES_XLIB: Require the renderer to be X11
* based and use Xlib
* @COGL_RENDERER_CONSTRAINT_USES_EGL: Require the renderer to be EGL based
- * @COGL_RENDERER_CONSTRAINT_SUPPORTS_COGL_GLES2: Require that the
- * renderer supports creating a #CoglGLES2Context via
- * cogl_gles2_context_new(). This can be used to integrate GLES 2.0
- * code into Cogl based applications.
*
* These constraint flags are hard-coded features of the different renderer
* backends. Sometimes a platform may support multiple rendering options which
@@ -286,7 +282,6 @@ typedef enum
COGL_RENDERER_CONSTRAINT_USES_X11 = (1 << 0),
COGL_RENDERER_CONSTRAINT_USES_XLIB = (1 << 1),
COGL_RENDERER_CONSTRAINT_USES_EGL = (1 << 2),
- COGL_RENDERER_CONSTRAINT_SUPPORTS_COGL_GLES2 = (1 << 3)
} CoglRendererConstraint;
diff --git a/cogl/cogl/cogl.symbols b/cogl/cogl/cogl.symbols
index fda1397d5..897701949 100644
--- a/cogl/cogl/cogl.symbols
+++ b/cogl/cogl/cogl.symbols
@@ -334,15 +334,6 @@ cogl_get_static_identity_quaternion
cogl_get_static_zero_quaternion
cogl_get_viewport
-#ifdef COGL_HAS_GTYPE_SUPPORT
-cogl_gles2_context_get_gtype
-#endif
-cogl_gles2_context_get_vtable
-cogl_gles2_context_new
-cogl_gles2_get_current_vtable
-cogl_gles2_texture_get_handle
-cogl_gles2_texture_2d_new_from_handle
-
#ifdef COGL_HAS_GLIB_SUPPORT
cogl_glib_renderer_source_new
cogl_glib_source_new
@@ -381,7 +372,6 @@ cogl_is_bitmap
cogl_is_buffer
cogl_is_context
cogl_is_frame_info
-cogl_is_gles2_context
cogl_is_index_buffer
#if 0
/* not implemented! */
@@ -690,7 +680,6 @@ cogl_polygon
cogl_pop_draw_buffer
#endif
cogl_pop_framebuffer
-cogl_pop_gles2_context
cogl_pop_matrix
cogl_pop_source
@@ -752,7 +741,6 @@ cogl_push_draw_buffer
#endif
cogl_push_framebuffer
-cogl_push_gles2_context
cogl_push_matrix
cogl_push_source
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index dab2674c4..1057ef955 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -106,8 +106,6 @@ cogl_nonintrospected_headers = [
'cogl-display.h',
'cogl-context.h',
'cogl-snippet.h',
- 'cogl-gles2.h',
- 'cogl-gles2-types.h',
'cogl-index-buffer.h',
'cogl-attribute-buffer.h',
'cogl-indices.h',
@@ -362,8 +360,6 @@ cogl_sources = [
'cogl-memory-stack.c',
'cogl-magazine-private.h',
'cogl-magazine.c',
- 'cogl-gles2-context-private.h',
- 'cogl-gles2-context.c',
'cogl-closure-list-private.h',
'cogl-closure-list.c',
'cogl-fence.c',
diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
index a5a665f03..611d93353 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -41,7 +41,6 @@
#include "cogl-swap-chain-private.h"
#include "cogl-renderer-private.h"
#include "cogl-onscreen-template-private.h"
-#include "cogl-gles2-context-private.h"
#include "cogl-egl.h"
#include "cogl-private.h"
#include "winsys/cogl-winsys-egl-private.h"
@@ -110,40 +109,6 @@ static const CoglFeatureData winsys_feature_data[] =
#include "winsys/cogl-winsys-egl-feature-functions.h"
};
-static const char *
-get_error_string (void)
-{
- switch (eglGetError()){
- case EGL_BAD_DISPLAY:
- return "Invalid display";
- case EGL_NOT_INITIALIZED:
- return "Display not initialized";
- case EGL_BAD_ALLOC:
- return "Not enough resources to allocate context";
- case EGL_BAD_ATTRIBUTE:
- return "Invalid attribute";
- case EGL_BAD_CONFIG:
- return "Invalid config";
- case EGL_BAD_CONTEXT:
- return "Invalid context";
- case EGL_BAD_CURRENT_SURFACE:
- return "Invalid current surface";
- case EGL_BAD_MATCH:
- return "Bad match";
- case EGL_BAD_NATIVE_PIXMAP:
- return "Invalid native pixmap";
- case EGL_BAD_NATIVE_WINDOW:
- return "Invalid native window";
- case EGL_BAD_PARAMETER:
- return "Invalid parameter";
- case EGL_BAD_SURFACE:
- return "Invalid surface";
- default:
- g_assert_not_reached ();
- return NULL;
- }
-}
-
static GCallback
_cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer,
const char *name,
@@ -556,14 +521,6 @@ _cogl_winsys_context_init (CoglContext *context, GError **error)
COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_BUFFER_AGE, TRUE);
}
- /* NB: We currently only support creating standalone GLES2 contexts
- * for offscreen rendering and so we need a dummy (non-visible)
- * surface to be able to bind those contexts */
- if (egl_display->dummy_surface != EGL_NO_SURFACE &&
- context->driver == COGL_DRIVER_GLES2)
- COGL_FLAGS_SET (context->features,
- COGL_FEATURE_ID_GLES2_CONTEXT, TRUE);
-
if (egl_renderer->platform_vtable->context_init &&
!egl_renderer->platform_vtable->context_init (context, error))
return FALSE;
@@ -583,54 +540,6 @@ _cogl_winsys_context_deinit (CoglContext *context)
g_free (context->winsys);
}
-typedef struct _CoglGLES2ContextEGL
-{
- EGLContext egl_context;
- EGLSurface dummy_surface;
-} CoglGLES2ContextEGL;
-
-static void *
-_cogl_winsys_context_create_gles2_context (CoglContext *ctx, GError **error)
-{
- CoglRendererEGL *egl_renderer = ctx->display->renderer->winsys;
- CoglDisplayEGL *egl_display = ctx->display->winsys;
- EGLint attribs[3];
- EGLContext egl_context;
-
- attribs[0] = EGL_CONTEXT_CLIENT_VERSION;
- attribs[1] = 2;
- attribs[2] = EGL_NONE;
-
- egl_context = eglCreateContext (egl_renderer->edpy,
- egl_display->egl_config,
- egl_display->egl_context,
- attribs);
- if (egl_context == EGL_NO_CONTEXT)
- {
- g_set_error (error, COGL_WINSYS_ERROR,
- COGL_WINSYS_ERROR_CREATE_GLES2_CONTEXT,
- "%s", get_error_string ());
- return NULL;
- }
-
- return (void *)egl_context;
-}
-
-static void
-_cogl_winsys_destroy_gles2_context (CoglGLES2Context *gles2_ctx)
-{
- CoglContext *context = gles2_ctx->context;
- CoglDisplay *display = context->display;
- CoglDisplayEGL *egl_display = display->winsys;
- CoglRenderer *renderer = display->renderer;
- CoglRendererEGL *egl_renderer = renderer->winsys;
- EGLContext egl_context = gles2_ctx->winsys;
-
- g_return_if_fail (egl_display->current_context != egl_context);
-
- eglDestroyContext (egl_renderer->edpy, egl_context);
-}
-
static gboolean
_cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
GError **error)
@@ -878,58 +787,6 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
eglSwapBuffers (egl_renderer->edpy, egl_onscreen->egl_surface);
}
-static void
-_cogl_winsys_save_context (CoglContext *ctx)
-{
- CoglContextEGL *egl_context = ctx->winsys;
- CoglDisplayEGL *egl_display = ctx->display->winsys;
-
- egl_context->saved_draw_surface = egl_display->current_draw_surface;
- egl_context->saved_read_surface = egl_display->current_read_surface;
-}
-
-static gboolean
-_cogl_winsys_set_gles2_context (CoglGLES2Context *gles2_ctx, GError **error)
-{
- CoglContext *ctx = gles2_ctx->context;
- CoglDisplayEGL *egl_display = ctx->display->winsys;
- gboolean status;
-
- if (gles2_ctx->write_buffer &&
- cogl_is_onscreen (gles2_ctx->write_buffer))
- status =
- bind_onscreen_with_context (COGL_ONSCREEN (gles2_ctx->write_buffer),
- gles2_ctx->winsys);
- else
- status = _cogl_winsys_egl_make_current (ctx->display,
- egl_display->dummy_surface,
- egl_display->dummy_surface,
- gles2_ctx->winsys);
-
- if (!status)
- {
- g_set_error (error,
- COGL_WINSYS_ERROR,
- COGL_WINSYS_ERROR_MAKE_CURRENT,
- "Failed to make gles2 context current");
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void
-_cogl_winsys_restore_context (CoglContext *ctx)
-{
- CoglContextEGL *egl_context = ctx->winsys;
- CoglDisplayEGL *egl_display = ctx->display->winsys;
-
- _cogl_winsys_egl_make_current (ctx->display,
- egl_context->saved_draw_surface,
- egl_context->saved_read_surface,
- egl_display->egl_context);
-}
-
#if defined(EGL_KHR_fence_sync) || defined(EGL_KHR_reusable_sync)
static void *
_cogl_winsys_fence_add (CoglContext *context)
@@ -971,8 +828,7 @@ _cogl_winsys_fence_destroy (CoglContext *context, void *fence)
static CoglWinsysVtable _cogl_winsys_vtable =
{
- .constraints = COGL_RENDERER_CONSTRAINT_USES_EGL |
- COGL_RENDERER_CONSTRAINT_SUPPORTS_COGL_GLES2,
+ .constraints = COGL_RENDERER_CONSTRAINT_USES_EGL,
/* This winsys is only used as a base for the EGL-platform
winsys's so it does not have an ID or a name */
@@ -984,9 +840,6 @@ static CoglWinsysVtable _cogl_winsys_vtable =
.display_destroy = _cogl_winsys_display_destroy,
.context_init = _cogl_winsys_context_init,
.context_deinit = _cogl_winsys_context_deinit,
- .context_create_gles2_context =
- _cogl_winsys_context_create_gles2_context,
- .destroy_gles2_context = _cogl_winsys_destroy_gles2_context,
.onscreen_init = _cogl_winsys_onscreen_init,
.onscreen_deinit = _cogl_winsys_onscreen_deinit,
.onscreen_bind = _cogl_winsys_onscreen_bind,
@@ -995,11 +848,6 @@ static CoglWinsysVtable _cogl_winsys_vtable =
.onscreen_swap_region = _cogl_winsys_onscreen_swap_region,
.onscreen_get_buffer_age = _cogl_winsys_onscreen_get_buffer_age,
- /* CoglGLES2Context related methods */
- .save_context = _cogl_winsys_save_context,
- .set_gles2_context = _cogl_winsys_set_gles2_context,
- .restore_context = _cogl_winsys_restore_context,
-
#if defined(EGL_KHR_fence_sync) || defined(EGL_KHR_reusable_sync)
.fence_add = _cogl_winsys_fence_add,
.fence_is_complete = _cogl_winsys_fence_is_complete,
diff --git a/cogl/cogl/winsys/cogl-winsys-private.h b/cogl/cogl/winsys/cogl-winsys-private.h
index e855afd45..1ed7bf4fb 100644
--- a/cogl/cogl/winsys/cogl-winsys-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-private.h
@@ -33,7 +33,6 @@
#include "cogl-renderer.h"
#include "cogl-onscreen.h"
-#include "cogl-gles2.h"
#ifdef COGL_HAS_XLIB_SUPPORT
#include "cogl-texture-pixmap-x11-private.h"
@@ -61,7 +60,6 @@ typedef enum /*< prefix=COGL_WINSYS_ERROR >*/
COGL_WINSYS_ERROR_CREATE_CONTEXT,
COGL_WINSYS_ERROR_CREATE_ONSCREEN,
COGL_WINSYS_ERROR_MAKE_CURRENT,
- COGL_WINSYS_ERROR_CREATE_GLES2_CONTEXT,
} CoglWinsysError;
typedef struct _CoglWinsysVtable
@@ -99,9 +97,6 @@ typedef struct _CoglWinsysVtable
void
(*context_deinit) (CoglContext *context);
- void *
- (*context_create_gles2_context) (CoglContext *ctx, GError **error);
-
gboolean
(*onscreen_init) (CoglOnscreen *onscreen, GError **error);
@@ -158,18 +153,6 @@ typedef struct _CoglWinsysVtable
CoglTexturePixmapStereoMode stereo_mode);
#endif
- void
- (*save_context) (CoglContext *ctx);
-
- gboolean
- (*set_gles2_context) (CoglGLES2Context *gles2_ctx, GError **error);
-
- void
- (*restore_context) (CoglContext *ctx);
-
- void
- (*destroy_gles2_context) (CoglGLES2Context *gles2_ctx);
-
void *
(*fence_add) (CoglContext *ctx);
diff --git a/cogl/meson.build b/cogl/meson.build
index 1cd2092d5..64a54a522 100644
--- a/cogl/meson.build
+++ b/cogl/meson.build
@@ -117,9 +117,6 @@ endif
subdir('cogl')
subdir('cogl-path')
subdir('cogl-pango')
-if have_gles2
- subdir('cogl-gles2')
-endif
if have_cogl_tests
subdir('tests')
endif
diff --git a/cogl/test-fixtures/test-utils.c b/cogl/test-fixtures/test-utils.c
index e0dce2505..38ed11c8a 100644
--- a/cogl/test-fixtures/test-utils.c
+++ b/cogl/test-fixtures/test-utils.c
@@ -42,12 +42,6 @@ check_flags (TestFlags flags,
return FALSE;
}
- if (flags & TEST_REQUIREMENT_GLES2_CONTEXT &&
- !cogl_has_feature (test_ctx, COGL_FEATURE_ID_GLES2_CONTEXT))
- {
- return FALSE;
- }
-
if (flags & TEST_REQUIREMENT_MAP_WRITE &&
!cogl_has_feature (test_ctx, COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE))
{
diff --git a/cogl/test-fixtures/test-utils.h b/cogl/test-fixtures/test-utils.h
index 485c12375..fe76a53e3 100644
--- a/cogl/test-fixtures/test-utils.h
+++ b/cogl/test-fixtures/test-utils.h
@@ -36,7 +36,6 @@ typedef enum _TestFlags
TEST_REQUIREMENT_TEXTURE_RECTANGLE = 1<<4,
TEST_REQUIREMENT_TEXTURE_RG = 1<<5,
TEST_REQUIREMENT_POINT_SPRITE = 1<<6,
- TEST_REQUIREMENT_GLES2_CONTEXT = 1<<7,
TEST_REQUIREMENT_MAP_WRITE = 1<<8,
TEST_REQUIREMENT_GLSL = 1<<9,
TEST_REQUIREMENT_OFFSCREEN = 1<<10,
diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 3242f7eec..d5dcdc0aa 100644
--- a/cogl/tests/conform/meson.build
+++ b/cogl/tests/conform/meson.build
@@ -25,7 +25,6 @@ cogl_test_conformance_sources = [
'test-point-sprite.c',
'test-no-gl-header.c',
'test-version.c',
- 'test-gles2-context.c',
'test-euler-quaternion.c',
'test-layer-remove.c',
'test-alpha-test.c',
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 5dc3851f9..2b70d3543 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -127,12 +127,6 @@ main (int argc, char **argv)
UNPORTED_TEST (test_viewport);
- ADD_TEST (test_gles2_context, TEST_REQUIREMENT_GLES2_CONTEXT, 0);
- ADD_TEST (test_gles2_context_fbo, TEST_REQUIREMENT_GLES2_CONTEXT, 0);
- ADD_TEST (test_gles2_context_copy_tex_image,
- TEST_REQUIREMENT_GLES2_CONTEXT,
- 0);
-
ADD_TEST (test_euler_quaternion, 0, 0);
ADD_TEST (test_color_hsl, 0, 0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
