diff options
| author | Axel Davy <axel.davy@ens.fr> | 2014-03-04 10:38:55 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-03-05 14:59:02 -0500 |
| commit | cccfea4454949e3e376be42bb230603848997195 (patch) | |
| tree | 9935095e47aea7fef5e36e040cfe19d103d61e22 | |
| parent | 8ad57c288d5ba6478ac9653e43c10545a6bafae1 (diff) | |
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 <axel.davy@ens.fr>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | src/glamor_egl.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |