egl: fix typos
Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22663>
This commit is contained in:

committed by
Marge Bot

parent
9aefd97cfd
commit
523dffe6cd
@@ -180,7 +180,7 @@ dri_is_thread_safe(UNUSED void *loaderPrivate)
|
|||||||
* platform
|
* platform
|
||||||
*
|
*
|
||||||
* 'lock_fns' is the XLockDisplay function pointer of the X11 display 'dpy'.
|
* 'lock_fns' is the XLockDisplay function pointer of the X11 display 'dpy'.
|
||||||
* It wll be NULL if XInitThreads wasn't called.
|
* It will be NULL if XInitThreads wasn't called.
|
||||||
*/
|
*/
|
||||||
if (display->Platform == _EGL_PLATFORM_X11 && xdpy && !xdpy->lock_fns)
|
if (display->Platform == _EGL_PLATFORM_X11 && xdpy && !xdpy->lock_fns)
|
||||||
return false;
|
return false;
|
||||||
@@ -3364,7 +3364,7 @@ dri2_create_sync(_EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EGL_SYNC_REUSABLE_KHR:
|
case EGL_SYNC_REUSABLE_KHR:
|
||||||
/* intialize attr */
|
/* initialize attr */
|
||||||
ret = pthread_condattr_init(&attr);
|
ret = pthread_condattr_init(&attr);
|
||||||
|
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
@@ -999,7 +999,7 @@ droid_swap_buffers(_EGLDisplay *disp, _EGLSurface *draw)
|
|||||||
|
|
||||||
dri2_flush_drawable_for_swapbuffers_flags(disp, draw, -1);
|
dri2_flush_drawable_for_swapbuffers_flags(disp, draw, -1);
|
||||||
|
|
||||||
/* dri2_surf->buffer can be null even when no error has occured. For
|
/* dri2_surf->buffer can be null even when no error has occurred. For
|
||||||
* example, if the user has called no GL rendering commands since the
|
* example, if the user has called no GL rendering commands since the
|
||||||
* previous eglSwapBuffers, then the driver may have not triggered
|
* previous eglSwapBuffers, then the driver may have not triggered
|
||||||
* a callback to ANativeWindow_dequeueBuffer, in which case
|
* a callback to ANativeWindow_dequeueBuffer, in which case
|
||||||
|
@@ -421,7 +421,7 @@ get_wl_surface_proxy(struct wl_egl_window *window)
|
|||||||
* location where a pointer to wl_surface was stored. Thus, if
|
* location where a pointer to wl_surface was stored. Thus, if
|
||||||
* window->version is dereferenceable, we've been given an older version of
|
* window->version is dereferenceable, we've been given an older version of
|
||||||
* wl_egl_window, and window->version points to wl_surface */
|
* wl_egl_window, and window->version points to wl_surface */
|
||||||
if (_eglPointerIsDereferencable((void *)(window->version))) {
|
if (_eglPointerIsDereferenceable((void *)(window->version))) {
|
||||||
return wl_proxy_create_wrapper((void *)(window->version));
|
return wl_proxy_create_wrapper((void *)(window->version));
|
||||||
}
|
}
|
||||||
return wl_proxy_create_wrapper(window->surface);
|
return wl_proxy_create_wrapper(window->surface);
|
||||||
@@ -2295,7 +2295,7 @@ dri2_initialize_wayland_drm(_EGLDisplay *disp)
|
|||||||
/* To use Prime, we must have _DRI_IMAGE v7 at least. createImageFromFds
|
/* To use Prime, we must have _DRI_IMAGE v7 at least. createImageFromFds
|
||||||
* support indicates that Prime export/import is supported by the driver.
|
* support indicates that Prime export/import is supported by the driver.
|
||||||
* We deprecated the support to GEM names API, so we bail out if the
|
* We deprecated the support to GEM names API, so we bail out if the
|
||||||
* driver does not suport Prime. */
|
* driver does not support Prime. */
|
||||||
if (!(dri2_dpy->capabilities & WL_DRM_CAPABILITY_PRIME) ||
|
if (!(dri2_dpy->capabilities & WL_DRM_CAPABILITY_PRIME) ||
|
||||||
(dri2_dpy->image->base.version < 7) ||
|
(dri2_dpy->image->base.version < 7) ||
|
||||||
(dri2_dpy->image->createImageFromFds == NULL)) {
|
(dri2_dpy->image->createImageFromFds == NULL)) {
|
||||||
|
@@ -297,7 +297,7 @@ haiku_add_configs_for_visuals(_EGLDisplay *disp)
|
|||||||
_eglLog(_EGL_WARNING, "Haiku: failed to create any config");
|
_eglLog(_EGL_WARNING, "Haiku: failed to create any config");
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
TRACE("Config successfull\n");
|
TRACE("Config successful\n");
|
||||||
|
|
||||||
return EGL_TRUE;
|
return EGL_TRUE;
|
||||||
|
|
||||||
|
@@ -621,7 +621,7 @@ wgl_make_current(_EGLDisplay *disp, _EGLSurface *dsurf,
|
|||||||
/* wgl_dpy->core->bindContext succeeded, so take a reference on the
|
/* wgl_dpy->core->bindContext succeeded, so take a reference on the
|
||||||
* wgl_dpy. This prevents wgl_dpy from being reinitialized when a
|
* wgl_dpy. This prevents wgl_dpy from being reinitialized when a
|
||||||
* EGLDisplay is terminated and then initialized again while a
|
* EGLDisplay is terminated and then initialized again while a
|
||||||
* context is still bound. See wgl_intitialize() for a more in depth
|
* context is still bound. See wgl_initialize() for a more in depth
|
||||||
* explanation. */
|
* explanation. */
|
||||||
p_atomic_inc(&wgl_dpy->ref_count);
|
p_atomic_inc(&wgl_dpy->ref_count);
|
||||||
}
|
}
|
||||||
|
@@ -188,7 +188,7 @@ _egl_relax_end(_EGLDisplay *disp, _EGLResource **rs, unsigned rs_count)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper to relax (drop) the EGL BDL over it's body, optionally holding
|
* Helper to relax (drop) the EGL BDL over it's body, optionally holding
|
||||||
* a reference to a list of _EGLResource's until the lock is re-aquired,
|
* a reference to a list of _EGLResource's until the lock is re-acquired,
|
||||||
* protecting the resources from destruction while the BDL is dropped.
|
* protecting the resources from destruction while the BDL is dropped.
|
||||||
*/
|
*/
|
||||||
#define egl_relax(disp, ...) \
|
#define egl_relax(disp, ...) \
|
||||||
|
@@ -384,7 +384,7 @@ _eglValidateConfig(const _EGLConfig *conf, EGLBoolean for_matching)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* any invalid attribute value should have been catched */
|
/* any invalid attribute value should have been caught */
|
||||||
if (!valid || for_matching)
|
if (!valid || for_matching)
|
||||||
return valid;
|
return valid;
|
||||||
|
|
||||||
|
@@ -837,7 +837,7 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read)
|
|||||||
* returned context and surfaces.
|
* returned context and surfaces.
|
||||||
*
|
*
|
||||||
* Making a second call with the resources returned by the first call
|
* Making a second call with the resources returned by the first call
|
||||||
* unsurprisingly undoes the first call, except for the resouce reference
|
* unsurprisingly undoes the first call, except for the resource reference
|
||||||
* counts.
|
* counts.
|
||||||
*/
|
*/
|
||||||
EGLBoolean
|
EGLBoolean
|
||||||
|
@@ -54,7 +54,7 @@ _eglInitThreadInfo(_EGLThreadInfo *t)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the calling thread's thread info.
|
* Return the calling thread's thread info.
|
||||||
* If the calling thread nevers calls this function before, or if its thread
|
* If the calling thread never calls this function before, or if its thread
|
||||||
* info was destroyed, reinitialize it. This function never returns NULL.
|
* info was destroyed, reinitialize it. This function never returns NULL.
|
||||||
*/
|
*/
|
||||||
_EGLThreadInfo *
|
_EGLThreadInfo *
|
||||||
|
@@ -347,7 +347,7 @@ _eglQueryDevicesEXT(EGLint max_devices,
|
|||||||
dev = dev->Next;
|
dev = dev->Next;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* User requested the full device list, add the sofware device. */
|
/* User requested the full device list, add the software device. */
|
||||||
if (max_devices >= num_devs && swrast) {
|
if (max_devices >= num_devs && swrast) {
|
||||||
assert(_eglDeviceSupports(swrast, _EGL_DEVICE_SOFTWARE));
|
assert(_eglDeviceSupports(swrast, _EGL_DEVICE_SOFTWARE));
|
||||||
devices[num_devs - 1] = swrast;
|
devices[num_devs - 1] = swrast;
|
||||||
|
@@ -123,7 +123,7 @@ _eglGetNativePlatformFromEnv(void)
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Try detecting native platform with the help of native display characteristcs.
|
* Try detecting native platform with the help of native display characteristics.
|
||||||
*/
|
*/
|
||||||
static _EGLPlatformType
|
static _EGLPlatformType
|
||||||
_eglNativePlatformDetectNativeDisplay(void *nativeDisplay)
|
_eglNativePlatformDetectNativeDisplay(void *nativeDisplay)
|
||||||
@@ -137,7 +137,7 @@ _eglNativePlatformDetectNativeDisplay(void *nativeDisplay)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_DRM_PLATFORM)
|
#if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_DRM_PLATFORM)
|
||||||
if (_eglPointerIsDereferencable(nativeDisplay)) {
|
if (_eglPointerIsDereferenceable(nativeDisplay)) {
|
||||||
void *first_pointer = *(void **) nativeDisplay;
|
void *first_pointer = *(void **) nativeDisplay;
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND_PLATFORM
|
#ifdef HAVE_WAYLAND_PLATFORM
|
||||||
@@ -635,7 +635,7 @@ _eglGetDeviceDisplay(void *native_display,
|
|||||||
|
|
||||||
/* If the fd is explicitly provided and we did not dup() it yet, do so.
|
/* If the fd is explicitly provided and we did not dup() it yet, do so.
|
||||||
* The spec mandates that we do so, since we'll need it past the
|
* The spec mandates that we do so, since we'll need it past the
|
||||||
* eglGetPlatformDispay call.
|
* eglGetPlatformDisplay call.
|
||||||
*
|
*
|
||||||
* The new fd is guaranteed to be 3 or greater.
|
* The new fd is guaranteed to be 3 or greater.
|
||||||
*/
|
*/
|
||||||
|
@@ -204,7 +204,7 @@ struct _egl_display
|
|||||||
EGLBoolean Zink; /**< Use kopper only */
|
EGLBoolean Zink; /**< Use kopper only */
|
||||||
EGLBoolean ForceSoftware; /**< Use software path only */
|
EGLBoolean ForceSoftware; /**< Use software path only */
|
||||||
EGLAttrib *Attribs; /**< Platform-specific options */
|
EGLAttrib *Attribs; /**< Platform-specific options */
|
||||||
int fd; /**< plaform device specific, local fd */
|
int fd; /**< platform device specific, local fd */
|
||||||
} Options;
|
} Options;
|
||||||
|
|
||||||
/* these fields are set by the driver during init */
|
/* these fields are set by the driver during init */
|
||||||
|
@@ -139,7 +139,7 @@ _eglAddAtExitCall(void (*func)(void))
|
|||||||
}
|
}
|
||||||
|
|
||||||
EGLBoolean
|
EGLBoolean
|
||||||
_eglPointerIsDereferencable(void *p)
|
_eglPointerIsDereferenceable(void *p)
|
||||||
{
|
{
|
||||||
uintptr_t addr = (uintptr_t) p;
|
uintptr_t addr = (uintptr_t) p;
|
||||||
uint64_t page_size = 0;
|
uint64_t page_size = 0;
|
||||||
|
@@ -92,6 +92,6 @@ static inline unsigned int DebugBitFromType(EGLenum type)
|
|||||||
* Perform validity checks on a generic pointer.
|
* Perform validity checks on a generic pointer.
|
||||||
*/
|
*/
|
||||||
extern EGLBoolean
|
extern EGLBoolean
|
||||||
_eglPointerIsDereferencable(void *p);
|
_eglPointerIsDereferenceable(void *p);
|
||||||
|
|
||||||
#endif /* EGLGLOBALS_INCLUDED */
|
#endif /* EGLGLOBALS_INCLUDED */
|
||||||
|
Reference in New Issue
Block a user