From 0db300ddea6ebfa6eb9fad7f73d6e941d5c169e7 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 2 Jun 2020 11:52:35 +0300 Subject: [PATCH] i965: don't forget to set screen on duped image We'll start using this field more for querying image properties. Without it we run into a crash. Signed-off-by: Lionel Landwerlin Cc: Reviewed-by: Kenneth Graunke Part-of: (cherry picked from commit e41e820648b1cb662cbe938c73d755331d48c6db) --- .pick_status.json | 2 +- src/mesa/drivers/dri/i965/intel_screen.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index b9d49ecc18e..64a33b6830c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1444,7 +1444,7 @@ "description": "i965: don't forget to set screen on duped image", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 822393f6731..201a3b7e151 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -980,6 +980,7 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate) return NULL; brw_bo_reference(orig_image->bo); + image->screen = orig_image->screen; image->bo = orig_image->bo; image->internal_format = orig_image->internal_format; image->planar_format = orig_image->planar_format;