Mesa (staging/20.0): i965: don't forget to set screen on duped image

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: fdb763d6a5fb02ab68e568a9ac7c0cc2de06d949
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fdb763d6a5fb02ab68e568a9ac7c0cc2de06d949

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Tue Jun  2 11:52:35 2020 +0300

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 <lionel.g.landwerlin at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4861>
(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 b331b3c8bf2..ee87f0b918a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -994,7 +994,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 cc6d47e42eb..ad66333f55b 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;