atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

native_window: fix wayland pbuffer emulation

Browse Source
This commit is contained in:
Mis012
2024-11-30 18:50:45 +01:00
parent 0803848c6d
commit 9f244edc05
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libandroid/native_window.c
View File

@@ -489,7 +489,7 @@ void (* bionic_eglGetProcAddress(char const *procname))(void)
return eglGetProcAddress(procname); return eglGetProcAddress(procname);
} }
EGLDisplay bionic_eglGetDisplay(NativeDisplayType native_display) EGLDisplay bionic_eglGetDisplay(EGLNativeDisplayType native_display)
{ {
/* /*
* On android, at least SDL passes 0 (EGL_DISPLAY_DEFAULT) to eglGetDisplay and uses the resulting display. * On android, at least SDL passes 0 (EGL_DISPLAY_DEFAULT) to eglGetDisplay and uses the resulting display.
@@ -524,15 +524,32 @@ EGLBoolean bionic_eglChooseConfig(EGLDisplay display, EGLint *attrib_list, EGLCo
/* X11 supports pbuffers just fine */ /* X11 supports pbuffers just fine */
return eglChooseConfig(display, attrib_list, configs, config_size, num_config); return eglChooseConfig(display, attrib_list, configs, config_size, num_config);
} else { } else {
bool has_pbuffer_bit = false;
int attrib_list_size = 0;
for(EGLint *attr = attrib_list; *attr != EGL_NONE; attr+=2) { for(EGLint *attr = attrib_list; *attr != EGL_NONE; attr+=2) {
if(*attr == EGL_SURFACE_TYPE && (*(attr + 1) & EGL_PBUFFER_BIT) && *(attr + 1) != EGL_DONT_CARE) {
has_pbuffer_bit = true;
}
attrib_list_size += 2;
}
attrib_list_size += 1; // for EGL_NONE
if(has_pbuffer_bit) {
/* copy the list in case it's mapped read-only */
EGLint *new_attrib_list = malloc(sizeof(EGLint) * attrib_list_size);
memcpy(new_attrib_list, attrib_list, sizeof(EGLint) * attrib_list_size);
for(EGLint *attr = new_attrib_list; *attr != EGL_NONE; attr+=2) {
if(*attr == EGL_SURFACE_TYPE && *(attr + 1) != EGL_DONT_CARE) { if(*attr == EGL_SURFACE_TYPE && *(attr + 1) != EGL_DONT_CARE) {
*(attr + 1) &= ~EGL_PBUFFER_BIT; *(attr + 1) &= ~EGL_PBUFFER_BIT;
*(attr + 1) |= EGL_WINDOW_BIT; *(attr + 1) |= EGL_WINDOW_BIT;
} }
} }
EGLBoolean ret = eglChooseConfig(display, new_attrib_list, configs, config_size, num_config);
free(new_attrib_list);
return ret;
} else {
return eglChooseConfig(display, attrib_list, configs, config_size, num_config); return eglChooseConfig(display, attrib_list, configs, config_size, num_config);
} }
}
} }
EGLSurface bionic_eglCreatePbufferSurface(EGLDisplay display, EGLConfig config, EGLint const *attrib_list) EGLSurface bionic_eglCreatePbufferSurface(EGLDisplay display, EGLConfig config, EGLint const *attrib_list)