blob: b9de24177bb87e96f7934c5fd154fee7c2a8ccb3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From cccfea4454949e3e376be42bb230603848997195 Mon Sep 17 00:00:00 2001
From: Axel Davy <axel.davy@ens.fr>
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 <axel.davy@ens.fr>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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
|
GitWeb
