OSDN Git Service

egl/dri2: only destroy created objects
authorMichael Olbrich <m.olbrich@pengutronix.de>
Tue, 29 Aug 2017 09:51:20 +0000 (11:51 +0200)
committerAndres Gomez <agomez@igalia.com>
Wed, 6 Sep 2017 15:05:10 +0000 (18:05 +0300)
commit52e70819b4302d06dbfc3fd3dd655e79aefba7c8
tree7d495e496e2dd4211fad12e0bc13379e2313432f
parentedbb6d405cb69849501c1df87dff69504604a2e6
egl/dri2: only destroy created objects

dri2_display_destroy may be called by dri2_initialize_wayland_drm() if
initialization fails. In this case, these objects may not be initialized.

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 81d5c31631840db704337489cf677cc596da79f5)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <agomez@igalia.com>
Conflicts:
src/egl/drivers/dri2/egl_dri2.c
src/egl/drivers/dri2/egl_dri2.c