wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-04-15 13:02:35 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Address CodeRabbit review comments

Browse Source 
- Use c_uint32 for EGLboolean return type (unsigned int per EGL spec, not _Bool)
- Try all enumerated EGL devices in order rather than only the first;
  skip devices where eglGetPlatformDisplayEXT or eglInitialize fails
This commit is contained in:
sam-kpm 2026-04-08 18:59:03 -06:00
parent e24d0f0ad1
commit 9e28569a00
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
comfy_extras/nodes_glsl.py
View File

@ -221,8 +221,9 @@ def _egl_device_display(eglInitialize):
_query_devices_ptr = _get_proc(b"eglQueryDevicesEXT") _query_devices_ptr = _get_proc(b"eglQueryDevicesEXT")
if not _query_devices_ptr: if not _query_devices_ptr:
raise RuntimeError("eglQueryDevicesEXT not available — install libnvidia-egl-gbm1 or libegl-mesa0") raise RuntimeError("eglQueryDevicesEXT not available — install libnvidia-egl-gbm1 or libegl-mesa0")
# EGLboolean is unsigned int (32-bit) in the EGL spec, not C99 _Bool.
_query_devices = ctypes.CFUNCTYPE( _query_devices = ctypes.CFUNCTYPE(
ctypes.c_bool, ctypes.c_uint32,
ctypes.c_int32, ctypes.POINTER(ctypes.c_void_p), ctypes.POINTER(ctypes.c_int32), ctypes.c_int32, ctypes.POINTER(ctypes.c_void_p), ctypes.POINTER(ctypes.c_int32),
)(_query_devices_ptr) )(_query_devices_ptr)
@ -243,17 +244,24 @@ def _egl_device_display(eglInitialize):
logger.debug(f"_egl_device_display: found {count.value} EGL device(s)") logger.debug(f"_egl_device_display: found {count.value} EGL device(s)")
EGL_PLATFORM_DEVICE_EXT = 0x313F EGL_PLATFORM_DEVICE_EXT = 0x313F
raw_display = _get_platform_display(EGL_PLATFORM_DEVICE_EXT, raw_devices[0], None) # Try each device in order; some may not support eglInitialize (e.g. non-render nodes).
if not raw_display: for i, raw_device in enumerate(raw_devices[:count.value]):
raise RuntimeError("eglGetPlatformDisplayEXT() returned NULL") raw_display = _get_platform_display(EGL_PLATFORM_DEVICE_EXT, raw_device, None)
# Cast the raw pointer to the opaque EGLDisplay type (c_void_p) that PyOpenGL uses. if not raw_display:
display = ctypes.c_void_p(raw_display) logger.debug(f"_egl_device_display: device {i} eglGetPlatformDisplayEXT returned NULL, skipping")
continue
# Cast the raw pointer to the opaque EGLDisplay type (c_void_p) that PyOpenGL uses.
display = ctypes.c_void_p(raw_display)
major, minor = ctypes.c_int32(0), ctypes.c_int32(0)
try:
if eglInitialize(display, major, minor):
logger.debug(f"_egl_device_display: device {i} succeeded, EGL version {major.value}.{minor.value}")
return display, major, minor
except Exception:
pass
logger.debug(f"_egl_device_display: device {i} eglInitialize failed, skipping")
major, minor = ctypes.c_int32(0), ctypes.c_int32(0) raise RuntimeError(f"eglInitialize() failed on all {count.value} enumerated EGL device(s)")
if not eglInitialize(display, major, minor):
raise RuntimeError("eglInitialize() failed on device display")
logger.debug(f"_egl_device_display: EGL version {major.value}.{minor.value}")
return display, major, minor
def _init_egl(): def _init_egl():