From 17d09143f0122be85067aa1f8c82f0be5a83ba5d Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Thu, 14 Apr 2022 01:21:05 +0200
Subject: [PATCH] rusticl/mesa: make resource_from_user_memory an optinal
 feature

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15439>
---
 src/gallium/frontends/rusticl/mesa/pipe/screen.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/gallium/frontends/rusticl/mesa/pipe/screen.rs b/src/gallium/frontends/rusticl/mesa/pipe/screen.rs
index 78e55613cda..5f164b95108 100644
--- a/src/gallium/frontends/rusticl/mesa/pipe/screen.rs
+++ b/src/gallium/frontends/rusticl/mesa/pipe/screen.rs
@@ -95,10 +95,13 @@ impl PipeScreen {
         tmpl: &pipe_resource,
         mem: *mut c_void,
     ) -> Option<PipeResource> {
-        PipeResource::new(
-            unsafe { (*self.screen).resource_from_user_memory.unwrap()(self.screen, tmpl, mem) },
-            true,
-        )
+        unsafe {
+            if let Some(func) = (*self.screen).resource_from_user_memory {
+                PipeResource::new(func(self.screen, tmpl, mem), true)
+            } else {
+                None
+            }
+        }
     }
 
     pub fn resource_create_buffer(&self, size: u32) -> Option<PipeResource> {
@@ -288,5 +291,4 @@ fn has_required_cbs(screen: *mut pipe_screen) -> bool {
         && s.get_shader_param.is_some()
         && s.is_format_supported.is_some()
         && s.resource_create.is_some()
-        && s.resource_from_user_memory.is_some()
 }