Reviewed-by: Charmaine Lee <charmai...@vmware.com>
________________________________________
From: Lucas Stach <l.st...@pengutronix.de>
Sent: Thursday, July 13, 2017 10:01 AM
To: mesa-dev@lists.freedesktop.org
Cc: Charmaine Lee; Brian Paul
Subject: [PATCH] st/mesa: handle stfbi being NULL on entry of
st_framebuffer_reuse_or_create
Apparently this can happen. Just bail out early in that case, as all the called
functions return NULL in that case.
Fixes weston-terminal for me.
Fixes: 147d7fb772a7 ("st/mesa: add a winsys buffers list in st_context")
Signed-off-by: Lucas Stach <l.st...@pengutronix.de>
---
src/mesa/state_tracker/st_manager.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/mesa/state_tracker/st_manager.c
b/src/mesa/state_tracker/st_manager.c
index 348b456c4d1d..d910eec00a16 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -788,6 +788,9 @@ st_framebuffer_reuse_or_create(struct st_context *st,
{
struct st_framebuffer *cur = NULL, *stfb = NULL;
+ if (!stfbi)
+ return NULL;
+
/* Check if there is already a framebuffer object for the specified
* framebuffer interface in this context. If there is one, use it.
*/
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
