aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Macnak <natsu@google.com>2024-02-25 08:30:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-25 08:30:01 +0000
commit0a23f355f2415dcd1ef98ad11a19a462b6bb32d3 (patch)
treeb2b1faca00d7c1d79225279c6a14773a62e564df
parente68f3193c4f593d088a8a80688754a3c0a608612 (diff)
parent132d6485b136eda10afe9266b95309c1f8ff6646 (diff)
downloadvirglrenderer-0a23f355f2415dcd1ef98ad11a19a462b6bb32d3.tar.gz
Check for egl->gbm before trying to use. am: 132d6485b1
Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/2975231 Change-Id: I86db68fbeb8ab14a235f746d173e9c4c9adf9534 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/vrend_winsys_egl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vrend_winsys_egl.c b/src/vrend_winsys_egl.c
index 4b38d5ea..2c14dcf7 100644
--- a/src/vrend_winsys_egl.c
+++ b/src/vrend_winsys_egl.c
@@ -323,7 +323,9 @@ struct virgl_egl *virgl_egl_init(struct virgl_gbm *gbm, bool surfaceless, bool g
egl->egl_display = get_platform_display (EGL_PLATFORM_GBM_KHR,
(EGLNativeDisplayType)egl->gbm->device, NULL);
} else {
- egl->egl_display = eglGetDisplay((EGLNativeDisplayType)egl->gbm->device);
+ if (egl->gbm && egl->gbm->device) {
+ egl->egl_display = eglGetDisplay((EGLNativeDisplayType)egl->gbm->device);
+ }
}
if (!egl->egl_display) {