diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-10 15:44:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-10 15:44:31 +0000 |
| commit | 4c12db2c9527bf65466975e2768584108a29ac3a (patch) | |
| tree | 9fe722f85b473a8f9edf9875bd83fcb091a830aa | |
| parent | c152183db99d05e12dbf88edb39a855b808a952b (diff) | |
| parent | fb20dcc9020b6e93bc99df6045e3f18f50b7af79 (diff) | |
| download | virglrenderer-busytown-mac-infra-release.tar.gz | |
Snap for 11819167 from fb20dcc9020b6e93bc99df6045e3f18f50b7af79 to busytown-mac-infra-releasebusytown-mac-infra-release
Change-Id: I76f67411c74fed504103f8360bafbc2b45a7a367
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | src/vrend_winsys_egl.c | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -66,7 +66,6 @@ cc_library { "-include prebuilt-intermediates/config.h", "-Wno-unused-parameter", ], - c_std: "experimental", local_include_dirs: [ "prebuilt-intermediates", "src", @@ -163,10 +162,10 @@ cc_library { ], shared_libs: [ "libcutils", - "libdrm", "liblog", ], static_libs: [ + "libdrm", "libepoxy", "libgbm", ], 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) { |