glamor: Make glamor_destroy_textured_pixmap idempotent
For robustness against drivers which may call both glamor_(egl_)destroy_textured_pixmap and glamor_destroy_pixmap. Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
0355e280a3
commit
c8d4c0a25d
|
@ -226,6 +226,7 @@ glamor_destroy_textured_pixmap(PixmapPtr pixmap)
|
||||||
glamor_egl_destroy_pixmap_image(pixmap);
|
glamor_egl_destroy_pixmap_image(pixmap);
|
||||||
#endif
|
#endif
|
||||||
glamor_pixmap_destroy_fbo(pixmap_priv);
|
glamor_pixmap_destroy_fbo(pixmap_priv);
|
||||||
|
glamor_set_pixmap_private(pixmap, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -540,8 +540,6 @@ glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv)
|
||||||
if (fbo)
|
if (fbo)
|
||||||
glamor_destroy_fbo(fbo);
|
glamor_destroy_fbo(fbo);
|
||||||
}
|
}
|
||||||
|
|
||||||
free(priv);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Bool
|
Bool
|
||||||
|
|
Loading…
Reference in New Issue
Block a user