summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2018-04-24 00:00:20 -0400
committerDylan Baker <dylan@pnwbakers.com>2018-04-26 10:49:31 -0700
commit66277b0b24680e66d0076bd8a0d8eca738304439 (patch)
treea34a0fe8a9338bbca3b48c03e199a3aa2f0d3e3e
parent969e0c5b66c13f3e24ef13bd15ffc966310c9d29 (diff)
Revert "st/dri: Fix dangling pointer to a destroyed dri_drawable"
This reverts commit dab02dea3411d325a5aee6cda5b581e61396ecc6. It causes crashes of qtcreator and firefox. Fixes: dab02de "st/dri: Fix dangling pointer to a destroyed dri_drawable" Cc: 18.0 18.1 <mesa-stable@lists.freedesktop.org> (cherry picked from commit 4559aefb5cee5878198f8491680abe47df3e3250)
-rw-r--r--src/gallium/state_trackers/dri/dri_drawable.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c
index 02328acd98..e5a7537e47 100644
--- a/src/gallium/state_trackers/dri/dri_drawable.c
+++ b/src/gallium/state_trackers/dri/dri_drawable.c
@@ -185,7 +185,6 @@ fail:
void
dri_destroy_buffer(__DRIdrawable * dPriv)
{
- struct dri_context *ctx = dri_context(dPriv->driContextPriv);
struct dri_drawable *drawable = dri_drawable(dPriv);
struct dri_screen *screen = drawable->screen;
struct st_api *stapi = screen->st_api;
@@ -203,9 +202,6 @@ dri_destroy_buffer(__DRIdrawable * dPriv)
/* Notify the st manager that this drawable is no longer valid */
stapi->destroy_drawable(stapi, &drawable->base);
- if (ctx && ctx->dPriv == dPriv)
- ctx->dPriv = NULL;
-
FREE(drawable);
}