From 7bc089ee9740a3ef91f16e36786d8ed64e165acd Mon Sep 17 00:00:00 2001 From: jimqu Date: Tue, 16 Feb 2016 17:05:48 +0900 Subject: [PATCH] glamor: Return NullPixmap on failure to create shareable pixmap If we were asked to create a shareable pixmap, it doesn't make sense to return a pixmap which isn't shareable. Doing so caused trouble down the line such as a crash with older versions of glamor when trying to use GLX pixmaps of bpp < 32 via DRI2. Signed-off-by: JimQu (ported from amdgpu commit 2fcb7dadd3c71cd405cbbaafc777697538ca9c29) Reviewed-by: Alex Deucher --- src/radeon_glamor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index 6a12b334..cc2b1f2a 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -262,7 +262,9 @@ fallback_glamor: */ xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Failed to create textured DRI2/PRIME pixmap."); - return pixmap; + + radeon_glamor_destroy_pixmap(pixmap); + return NullPixmap; } /* Create textured pixmap failed means glamor failed to * create a texture from current BO for some reasons. We turn