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

cogl: Make private BLIT_FRAMEBUFFER feature public

Browse Source 
Will be a requirement for enabling shadow buffers.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1237
This commit is contained in:
Jonas Ådahl 2020-05-05 17:05:36 +02:00 committed by Georges Basile Stavracas Neto
parent 19550c28f9
commit f60c485117
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl/cogl-blit.c
View File

@ -158,7 +158,7 @@ _cogl_blit_framebuffer_begin (CoglBlitData *data)
supported. */ supported. */
if ((_cogl_texture_get_format (data->src_tex) & COGL_PREMULT_BIT) != if ((_cogl_texture_get_format (data->src_tex) & COGL_PREMULT_BIT) !=
(_cogl_texture_get_format (data->dst_tex) & COGL_PREMULT_BIT) || (_cogl_texture_get_format (data->dst_tex) & COGL_PREMULT_BIT) ||
!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER)) !cogl_has_feature (ctx, COGL_FEATURE_ID_BLIT_FRAMEBUFFER))
return FALSE; return FALSE;
dst_offscreen = _cogl_offscreen_new_with_texture_full dst_offscreen = _cogl_offscreen_new_with_texture_full

3
cogl/cogl/cogl-context.h
View File

@ -193,6 +193,8 @@ cogl_is_context (void *object);
* expected to return age values other than 0. * expected to return age values other than 0.
* @COGL_FEATURE_ID_PRESENTATION_TIME: Whether frame presentation * @COGL_FEATURE_ID_PRESENTATION_TIME: Whether frame presentation
* time stamps will be recorded in #CoglFrameInfo objects. * time stamps will be recorded in #CoglFrameInfo objects.
* @COGL_FEATURE_ID_BLIT_FRAMEBUFFER: Whether blitting using
* cogl_blit_framebuffer() is supported.
* *
* All the capabilities that can vary between different GPUs supported * All the capabilities that can vary between different GPUs supported
* by Cogl. Applications that depend on any of these features should explicitly * by Cogl. Applications that depend on any of these features should explicitly
@ -211,6 +213,7 @@ typedef enum _CoglFeatureID
COGL_FEATURE_ID_TEXTURE_RG, COGL_FEATURE_ID_TEXTURE_RG,
COGL_FEATURE_ID_BUFFER_AGE, COGL_FEATURE_ID_BUFFER_AGE,
COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL, COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL,
COGL_FEATURE_ID_BLIT_FRAMEBUFFER,
/*< private >*/ /*< private >*/
_COGL_N_FEATURE_IDS /*< skip >*/ _COGL_N_FEATURE_IDS /*< skip >*/

2
cogl/cogl/cogl-framebuffer.c
View File

@ -1292,7 +1292,7 @@ cogl_blit_framebuffer (CoglFramebuffer *src,
int src_x1, src_y1, src_x2, src_y2; int src_x1, src_y1, src_x2, src_y2;
int dst_x1, dst_y1, dst_x2, dst_y2; int dst_x1, dst_y1, dst_x2, dst_y2;
if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER)) if (!cogl_has_feature (ctx, COGL_FEATURE_ID_BLIT_FRAMEBUFFER))
{ {
g_set_error_literal (error, COGL_SYSTEM_ERROR, g_set_error_literal (error, COGL_SYSTEM_ERROR,
COGL_SYSTEM_ERROR_UNSUPPORTED, COGL_SYSTEM_ERROR_UNSUPPORTED,

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

@ -1509,7 +1509,7 @@ cogl_is_framebuffer (void *object);
* *
* This blits a region of the color buffer of the source buffer * This blits a region of the color buffer of the source buffer
* to the destination buffer. This function should only be * to the destination buffer. This function should only be
* called if the COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER feature is * called if the COGL_FEATURE_ID_BLIT_FRAMEBUFFER feature is
* advertised. * advertised.
* *
* The source and destination rectangles are defined in offscreen * The source and destination rectangles are defined in offscreen

1
cogl/cogl/cogl-private.h
View File

@ -42,7 +42,6 @@ typedef enum
{ {
COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE, COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE,
COGL_PRIVATE_FEATURE_MESA_PACK_INVERT, COGL_PRIVATE_FEATURE_MESA_PACK_INVERT,
COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER,
COGL_PRIVATE_FEATURE_PBOS, COGL_PRIVATE_FEATURE_PBOS,
COGL_PRIVATE_FEATURE_EXT_PACKED_DEPTH_STENCIL, COGL_PRIVATE_FEATURE_EXT_PACKED_DEPTH_STENCIL,
COGL_PRIVATE_FEATURE_OES_PACKED_DEPTH_STENCIL, COGL_PRIVATE_FEATURE_OES_PACKED_DEPTH_STENCIL,

4
cogl/cogl/driver/gl/cogl-framebuffer-gl.c
View File

@ -388,8 +388,8 @@ _cogl_framebuffer_gl_flush_state (CoglFramebuffer *draw_buffer,
{ {
/* NB: Currently we only take advantage of binding separate /* NB: Currently we only take advantage of binding separate
* read/write buffers for framebuffer blit purposes. */ * read/write buffers for framebuffer blit purposes. */
g_return_if_fail (_cogl_has_private_feature g_return_if_fail (cogl_has_feature
(ctx, COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER)); (ctx, COGL_FEATURE_ID_BLIT_FRAMEBUFFER));
_cogl_framebuffer_gl_bind (draw_buffer, GL_DRAW_FRAMEBUFFER); _cogl_framebuffer_gl_bind (draw_buffer, GL_DRAW_FRAMEBUFFER);
_cogl_framebuffer_gl_bind (read_buffer, GL_READ_FRAMEBUFFER); _cogl_framebuffer_gl_bind (read_buffer, GL_READ_FRAMEBUFFER);

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

@ -455,8 +455,8 @@ _cogl_driver_update_features (CoglContext *ctx,
TRUE); TRUE);
if (ctx->glBlitFramebuffer) if (ctx->glBlitFramebuffer)
COGL_FLAGS_SET (private_features, COGL_FLAGS_SET (ctx->features,
COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER, TRUE); COGL_FEATURE_ID_BLIT_FRAMEBUFFER, TRUE);
COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_PBOS, TRUE); COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_PBOS, TRUE);

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

@ -318,8 +318,8 @@ _cogl_driver_update_features (CoglContext *context,
COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_SAMPLER_OBJECTS, TRUE); COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_SAMPLER_OBJECTS, TRUE);
if (context->glBlitFramebuffer) if (context->glBlitFramebuffer)
COGL_FLAGS_SET (private_features, COGL_FLAGS_SET (context->features,
COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER, TRUE); COGL_FEATURE_ID_BLIT_FRAMEBUFFER, TRUE);
if (_cogl_check_extension ("GL_OES_element_index_uint", gl_extensions)) if (_cogl_check_extension ("GL_OES_element_index_uint", gl_extensions))
{ {