chithanh 14/03/30 19:05:43 Added: glamor-0.6.0-glamor_egl_create_argb8888.patch Log: Fix X server crash, bug #505574. (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.1 x11-libs/glamor/files/glamor-0.6.0-glamor_egl_create_argb8888.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/glamor/files/glamor-0.6.0-glamor_egl_create_argb8888.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/glamor/files/glamor-0.6.0-glamor_egl_create_argb8888.patch?rev=1.1&content-type=text/plain Index: glamor-0.6.0-glamor_egl_create_argb8888.patch =================================================================== >From cccfea4454949e3e376be42bb230603848997195 Mon Sep 17 00:00:00 2001 From: Axel Davy <[email protected]> Date: Tue, 04 Mar 2014 09:38:55 +0000 Subject: Fix a missing MakeCurrent in glamor_egl_create_argb8888_based_texture There is a missing MakeCurrent before creating the texture and link it to the EGLImage. This fixes an X server crash with the piglit test glx-make-current-multi-process on radeonsi from current Mesa Git. Signed-off-by: Axel Davy <[email protected]> Tested-by: Michel Dänzer <[email protected]> Signed-off-by: Alex Deucher <[email protected]> --- diff --git a/src/glamor_egl.c b/src/glamor_egl.c index ff4c0bd..ffa95a7 100644 --- a/src/glamor_egl.c +++ b/src/glamor_egl.c @@ -252,7 +252,9 @@ glamor_egl_create_argb8888_based_texture(ScreenPtr screen, gbm_bo_destroy(bo); if (image == EGL_NO_IMAGE_KHR) return 0; + glamor_egl_make_current(screen); glamor_create_texture_from_image(glamor_egl, image, &texture); + glamor_egl_restore_context(screen); glamor_egl->egl_destroy_image_khr(glamor_egl->display, image); return texture; -- cgit v0.9.0.2-2-gbebe
