brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Remove always-set COGL_FEATURE_OFFSCREEN

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/866
This commit is contained in:
Adam Jackson 2019-10-17 18:32:00 -04:00 committed by Georges Basile Stavracas Neto
parent 6a8830a551
commit cf107c89b8
6 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter/clutter-feature.c
View File

@ -72,8 +72,7 @@ clutter_features_from_cogl (guint cogl_flags)
clutter_flags |= CLUTTER_FEATURE_SHADERS_GLSL;
if (cogl_flags & COGL_FEATURE_OFFSCREEN)
clutter_flags |= CLUTTER_FEATURE_OFFSCREEN;
clutter_flags |= CLUTTER_FEATURE_OFFSCREEN;
return clutter_flags;
}

2
cogl/cogl/cogl-types.h
View File

@ -114,7 +114,6 @@ typedef struct _CoglTextureVertex CoglTextureVertex;
* CoglFeatureFlags:
* @COGL_FEATURE_TEXTURE_YUV: ycbcr conversion support
* @COGL_FEATURE_TEXTURE_READ_PIXELS: glReadPixels() support
* @COGL_FEATURE_OFFSCREEN: FBO support
* @COGL_FEATURE_OFFSCREEN_MULTISAMPLE: Multisample support on FBOs
* @COGL_FEATURE_FOUR_CLIP_PLANES: At least 4 clip planes available
* @COGL_FEATURE_STENCIL_BUFFER: Stencil buffer support
@ -137,7 +136,6 @@ typedef enum
{
COGL_FEATURE_TEXTURE_YUV = (1 << 3),
COGL_FEATURE_TEXTURE_READ_PIXELS = (1 << 4),
COGL_FEATURE_OFFSCREEN = (1 << 6),
COGL_FEATURE_OFFSCREEN_MULTISAMPLE = (1 << 7),
COGL_FEATURE_FOUR_CLIP_PLANES = (1 << 9),
COGL_FEATURE_STENCIL_BUFFER = (1 << 10),

1
cogl/cogl/driver/gl/gl/cogl-driver-gl.c
View File

@ -415,7 +415,6 @@ _cogl_driver_update_features (CoglContext *ctx,
"Framebuffer objects are required to use the GL driver");
return FALSE;
}
flags |= COGL_FEATURE_OFFSCREEN;
COGL_FLAGS_SET (private_features,
COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS,
TRUE);

6
cogl/cogl/driver/gl/gles/cogl-driver-gles.c
View File

@ -301,18 +301,12 @@ _cogl_driver_update_features (CoglContext *context,
gl_minor,
gl_extensions);
flags |= COGL_FEATURE_OFFSCREEN;
/* Note GLES 2 core doesn't support mipmaps for npot textures or
* repeat modes other than CLAMP_TO_EDGE. */
COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_ANY_GL, TRUE);
COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_ALPHA_TEXTURES, TRUE);
if (context->glGenRenderbuffers)
{
flags |= COGL_FEATURE_OFFSCREEN;
}
if (context->glBlitFramebuffer)
COGL_FLAGS_SET (private_features,
COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER, TRUE);

3
src/tests/clutter/conform/actor-offscreen-redirect.c
View File

@ -314,9 +314,6 @@ actor_offscreen_redirect (void)
{
Data data = { 0 };
if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
return;
data.stage = clutter_test_get_stage ();
data.parent_container = clutter_actor_new ();
data.container = g_object_new (foo_group_get_type (), NULL);

8
src/tests/clutter/conform/texture-fbo.c
View File

@ -165,14 +165,6 @@ texture_fbo (TestConformSimpleFixture *fixture,
ClutterActor *actor;
int ypos = 0;
if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
{
if (g_test_verbose ())
g_print ("Offscreen buffers are not available, skipping.\n");
return;
}
state.frame = 0;
state.stage = clutter_stage_new ();