Module: Mesa Branch: staging/20.1 Commit: 92d4329230d2a9e237c4c3a23a572c7d32ea2282 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92d4329230d2a9e237c4c3a23a572c7d32ea2282
Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Thu Jul 9 16:59:39 2020 +0200 st/mesa: set compressed_data to NULL when freed Reported-by: Karol Herbst <[email protected]> Fixes: b6db703e0f0 ("st/mesa: make texture views inherit compressed_data storage") Reviewed-by: Karol Herbst <[email protected]> Tested-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5821> (cherry picked from commit 51bdaf0b601522dfc599bd352806e66ef56876a3) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_cb_texture.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 5d1e26704ec..9c58fb485df 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -22,7 +22,7 @@ "description": "st/mesa: set compressed_data to NULL when freed", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "b6db703e0f007fbcf4389ec607ae4c3e8fc9ee0d" }, diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 66f1bf15e95..21908f3f214 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -219,6 +219,7 @@ st_FreeTextureImageBuffer(struct gl_context *ctx, pipe_reference(&stImage->compressed_data->reference, NULL)) { free(stImage->compressed_data->ptr); free(stImage->compressed_data); + stImage->compressed_data = NULL; } /* if the texture image is being deallocated, the structure of the _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
