From 10e6895cbda18070248a1c63a4394733b1c4b9ba Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Sun, 1 Jun 2025 13:50:51 +0800 Subject: [PATCH] [Fix] (gpu_utils): Fix undefined behaviour introduced by https://github.com/MobileGL-Dev/MobileGlues/commit/5e46d9e26a7166332a74a7e8fea9fa6dd9371ca8 This makes (at least without ANGLE) it work on Android Studio's AVD :D --- src/main/cpp/config/gpu_utils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/cpp/config/gpu_utils.cpp b/src/main/cpp/config/gpu_utils.cpp index 606813b..cbdc022 100644 --- a/src/main/cpp/config/gpu_utils.cpp +++ b/src/main/cpp/config/gpu_utils.cpp @@ -25,7 +25,7 @@ static const char *vk_lib[] = { std::string getGPUInfo() { EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY); if (eglDisplay == EGL_NO_DISPLAY || eglInitialize(eglDisplay, nullptr, nullptr) != EGL_TRUE) - return nullptr; + return ""; EGLint egl_attributes[] = { EGL_BLUE_SIZE, 8, EGL_GREEN_SIZE, 8, EGL_RED_SIZE, 8, @@ -36,7 +36,7 @@ std::string getGPUInfo() { EGLint num_configs = 0; if (eglChooseConfig(eglDisplay, egl_attributes, nullptr, 0, &num_configs) != EGL_TRUE || num_configs == 0) { eglTerminate(eglDisplay); - return nullptr; + return ""; } EGLConfig eglConfig; @@ -46,13 +46,13 @@ std::string getGPUInfo() { EGLContext context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, egl_context_attributes); if (context == EGL_NO_CONTEXT) { eglTerminate(eglDisplay); - return nullptr; + return ""; } if (eglMakeCurrent(eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, context) != EGL_TRUE) { eglDestroyContext(eglDisplay, context); eglTerminate(eglDisplay); - return nullptr; + return ""; } std::string renderer;