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

winsys-egl-kms: dont create 0x0 surface

Browse Source 
commit 188752158 changed cogl to stop needlessly creating its own
monitor output configuration when mutter would just soon overwrite
it anyway.

Unfortunately, that commit is causing a crash in some cases because
cogl will now create and later draw to a 0x0 egl surface until mutter
sets the monitor layout.

This commit changes cogl to avoid creating and using a surface, before
it knows how big of a surface to create.

https://bugzilla.gnome.org/show_bug.cgi?id=758073
This commit is contained in:
Ray Strode 2016-02-22 13:19:54 -05:00
parent 96d8be620a
commit 1c1ad69f26
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cogl/winsys/cogl-winsys-egl-kms.c
View File

@ -909,6 +909,7 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
if (kms_onscreen->pending_surface) if (kms_onscreen->pending_surface)
{ {
free_current_bo (onscreen); free_current_bo (onscreen);
if (kms_onscreen->surface)
gbm_surface_destroy (kms_onscreen->surface); gbm_surface_destroy (kms_onscreen->surface);
kms_onscreen->surface = kms_onscreen->pending_surface; kms_onscreen->surface = kms_onscreen->pending_surface;
kms_onscreen->pending_surface = NULL; kms_onscreen->pending_surface = NULL;
@ -1030,6 +1031,15 @@ _cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
kms_onscreen = g_slice_new0 (CoglOnscreenKMS); kms_onscreen = g_slice_new0 (CoglOnscreenKMS);
egl_onscreen->platform = kms_onscreen; egl_onscreen->platform = kms_onscreen;
/* If a kms_fd is set then the display width and height
* won't be available until cogl_kms_display_set_layout
* is called. In that case, defer creating the surface
* until then.
*/
if (kms_display->width == 0 ||
kms_display->height == 0)
return TRUE;
kms_onscreen->surface = kms_onscreen->surface =
gbm_surface_create (kms_renderer->gbm, gbm_surface_create (kms_renderer->gbm,
kms_display->width, kms_display->width,
@ -1265,9 +1275,25 @@ cogl_kms_display_set_layout (CoglDisplay *display,
if (kms_onscreen->pending_surface) if (kms_onscreen->pending_surface)
gbm_surface_destroy (kms_onscreen->pending_surface); gbm_surface_destroy (kms_onscreen->pending_surface);
/* If there's already a surface, wait until the next swap to switch
* it out, otherwise, if we're just starting up we can use the new
* surface right away.
*/
if (kms_onscreen->surface != NULL)
{
kms_onscreen->pending_surface = new_surface; kms_onscreen->pending_surface = new_surface;
kms_onscreen->pending_egl_surface = new_egl_surface; kms_onscreen->pending_egl_surface = new_egl_surface;
} }
else
{
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (kms_display->onscreen);
kms_onscreen->surface = new_surface;
egl_onscreen->egl_surface = new_egl_surface;
_cogl_framebuffer_winsys_update_size (framebuffer, width, height);
}
}
kms_display->width = width; kms_display->width = width;
kms_display->height = height; kms_display->height = height;