From 9c6fa9421d57394600fbeade7a2ceb3e264bd108 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 31 Jul 2020 01:38:41 +0200 Subject: [PATCH] egl: const _eglDriver Converted using `s/_EGLDriver/const _EGLDriver/g` and dropped a couple of irrelevant changes in comments, in the `_EGL_DRIVER_TYPECAST()` macro and the typedef itself. Signed-off-by: Eric Engestrom Reviewed-by: Frank Binns Reviewed-by: Emil Velikov Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 90 +++++++------- src/egl/drivers/dri2/egl_dri2.h | 54 ++++----- src/egl/drivers/dri2/platform_android.c | 22 ++-- src/egl/drivers/dri2/platform_device.c | 8 +- src/egl/drivers/dri2/platform_drm.c | 16 +-- src/egl/drivers/dri2/platform_surfaceless.c | 8 +- src/egl/drivers/dri2/platform_wayland.c | 24 ++-- src/egl/drivers/dri2/platform_x11.c | 40 +++--- src/egl/drivers/dri2/platform_x11_dri3.c | 22 ++-- src/egl/drivers/haiku/egl_haiku.cpp | 22 ++-- src/egl/main/eglapi.c | 128 ++++++++++---------- src/egl/main/eglconfig.c | 6 +- src/egl/main/eglconfig.h | 6 +- src/egl/main/eglcontext.c | 2 +- src/egl/main/eglcontext.h | 2 +- src/egl/main/egldisplay.c | 2 +- src/egl/main/egldisplay.h | 4 +- src/egl/main/egldriver.c | 2 +- src/egl/main/egldriver.h | 84 ++++++------- src/egl/main/eglsurface.c | 10 +- src/egl/main/eglsurface.h | 10 +- src/egl/main/eglsync.c | 2 +- src/egl/main/eglsync.h | 2 +- 23 files changed, 283 insertions(+), 283 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 2114077470e..8c6fd19ab2e 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -644,7 +644,7 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id, } EGLBoolean -dri2_add_pbuffer_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp) +dri2_add_pbuffer_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); unsigned int format_count[ARRAY_SIZE(dri2_pbuffer_visuals)] = { 0 }; @@ -1142,7 +1142,7 @@ dri2_setup_extensions(_EGLDisplay *disp) * called many times (without a eglTerminate in between). */ static EGLBoolean -dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize(const _EGLDriver *drv, _EGLDisplay *disp) { EGLBoolean ret = EGL_FALSE; struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1311,7 +1311,7 @@ dri2_egl_surface_free_local_buffers(struct dri2_egl_surface *dri2_surf) * called many times (without a eglInitialize in between). */ static EGLBoolean -dri2_terminate(_EGLDriver *drv, _EGLDisplay *disp) +dri2_terminate(const _EGLDriver *drv, _EGLDisplay *disp) { /* Release all non-current Context/Surfaces. */ _eglReleaseDisplayResources(drv, disp); @@ -1466,7 +1466,7 @@ dri2_fill_context_attribs(struct dri2_egl_context *dri2_ctx, * Called via eglCreateContext(), drv->CreateContext(). */ static _EGLContext * -dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, +dri2_create_context(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, _EGLContext *share_list, const EGLint *attrib_list) { struct dri2_egl_context *dri2_ctx; @@ -1641,7 +1641,7 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, * Called via eglDestroyContext(), drv->DestroyContext(). */ static EGLBoolean -dri2_destroy_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx) +dri2_destroy_context(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx) { struct dri2_egl_context *dri2_ctx = dri2_egl_context(ctx); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1695,7 +1695,7 @@ dri2_fini_surface(_EGLSurface *surf) } static EGLBoolean -dri2_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1756,7 +1756,7 @@ dri2_create_drawable(struct dri2_egl_display *dri2_dpy, * Called via eglMakeCurrent(), drv->MakeCurrent(). */ static EGLBoolean -dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf, +dri2_make_current(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf, _EGLSurface *rsurf, _EGLContext *ctx) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1900,13 +1900,13 @@ dri2_surface_get_dri_drawable(_EGLSurface *surf) * Called from eglGetProcAddress() via drv->GetProcAddress(). */ static _EGLProc -dri2_get_proc_address(_EGLDriver *drv, const char *procname) +dri2_get_proc_address(const _EGLDriver *drv, const char *procname) { return _glapi_get_proc_address(procname); } static _EGLSurface* -dri2_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { @@ -1916,7 +1916,7 @@ dri2_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface* -dri2_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_pixmap, const EGLint *attrib_list) { @@ -1928,7 +1928,7 @@ dri2_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface* -dri2_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1938,7 +1938,7 @@ dri2_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1984,7 +1984,7 @@ dri2_flush_drawable_for_swapbuffers(_EGLDisplay *disp, _EGLSurface *draw) } static EGLBoolean -dri2_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); __DRIdrawable *dri_drawable = dri2_dpy->vtbl->get_dri_drawable(surf); @@ -2006,7 +2006,7 @@ dri2_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) } static EGLBoolean -dri2_swap_buffers_with_damage(_EGLDriver *drv, _EGLDisplay *disp, +dri2_swap_buffers_with_damage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, const EGLint *rects, EGLint n_rects) { @@ -2034,7 +2034,7 @@ dri2_swap_buffers_with_damage(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_swap_buffers_region(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_swap_buffers_region(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint numRects, const EGLint *rects) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2056,7 +2056,7 @@ dri2_swap_buffers_region(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, } static EGLBoolean -dri2_set_damage_region(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_set_damage_region(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint *rects, EGLint n_rects) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2070,7 +2070,7 @@ dri2_set_damage_region(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, } static EGLBoolean -dri2_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_post_sub_buffer(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint x, EGLint y, EGLint width, EGLint height) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2080,7 +2080,7 @@ dri2_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, } static EGLBoolean -dri2_copy_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_copy_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, void *native_pixmap_target) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2090,7 +2090,7 @@ dri2_copy_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, } static EGLint -dri2_query_buffer_age(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_query_buffer_age(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); if (!dri2_dpy->vtbl->query_buffer_age) @@ -2099,7 +2099,7 @@ dri2_query_buffer_age(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) } static EGLBoolean -dri2_wait_client(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx) +dri2_wait_client(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); _EGLSurface *surf = ctx->DrawSurface; @@ -2117,7 +2117,7 @@ dri2_wait_client(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx) } static EGLBoolean -dri2_wait_native(_EGLDriver *drv, _EGLDisplay *disp, EGLint engine) +dri2_wait_native(const _EGLDriver *drv, _EGLDisplay *disp, EGLint engine) { (void) drv; (void) disp; @@ -2130,7 +2130,7 @@ dri2_wait_native(_EGLDriver *drv, _EGLDisplay *disp, EGLint engine) } static EGLBoolean -dri2_bind_tex_image(_EGLDriver *drv, +dri2_bind_tex_image(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2174,7 +2174,7 @@ dri2_bind_tex_image(_EGLDriver *drv, } static EGLBoolean -dri2_release_tex_image(_EGLDriver *drv, +dri2_release_tex_image(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2207,7 +2207,7 @@ dri2_release_tex_image(_EGLDriver *drv, } static _EGLImage* -dri2_create_image(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, +dri2_create_image(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list) { @@ -2477,7 +2477,7 @@ dri2_create_image_khr_texture(_EGLDisplay *disp, _EGLContext *ctx, } static EGLBoolean -dri2_query_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_query_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2487,7 +2487,7 @@ dri2_query_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, } static struct wl_buffer* -dri2_create_wayland_buffer_from_image(_EGLDriver *drv, _EGLDisplay *disp, +dri2_create_wayland_buffer_from_image(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2757,7 +2757,7 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs) } static EGLBoolean -dri2_query_dma_buf_formats(_EGLDriver *drv, _EGLDisplay *disp, +dri2_query_dma_buf_formats(const _EGLDriver *drv, _EGLDisplay *disp, EGLint max, EGLint *formats, EGLint *count) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2788,7 +2788,7 @@ dri2_query_dma_buf_formats(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_query_dma_buf_modifiers(_EGLDriver *drv, _EGLDisplay *disp, EGLint format, +dri2_query_dma_buf_modifiers(const _EGLDriver *drv, _EGLDisplay *disp, EGLint format, EGLint max, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *count) { @@ -2917,7 +2917,7 @@ dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx, return res; } static _EGLImage * -dri2_create_drm_image_mesa(_EGLDriver *drv, _EGLDisplay *disp, +dri2_create_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, const EGLint *attr_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -2989,7 +2989,7 @@ dri2_create_drm_image_mesa(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_export_drm_image_mesa(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, +dri2_export_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *name, EGLint *handle, EGLint *stride) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -3035,7 +3035,7 @@ dri2_can_export_dma_buf_image(_EGLDisplay *disp, _EGLImage *img) } static EGLBoolean -dri2_export_dma_buf_image_query_mesa(_EGLDriver *drv, _EGLDisplay *disp, +dri2_export_dma_buf_image_query_mesa(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fourcc, EGLint *nplanes, EGLuint64KHR *modifiers) @@ -3080,7 +3080,7 @@ dri2_export_dma_buf_image_query_mesa(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_export_dma_buf_image_mesa(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, +dri2_export_dma_buf_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, int *fds, EGLint *strides, EGLint *offsets) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -3128,7 +3128,7 @@ dri2_export_dma_buf_image_mesa(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *im #endif _EGLImage * -dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, +dri2_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list) { @@ -3163,7 +3163,7 @@ dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_destroy_image_khr(_EGLDriver *drv, _EGLDisplay *disp, _EGLImage *image) +dri2_destroy_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *image) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_image *dri2_img = dri2_egl_image(image); @@ -3232,7 +3232,7 @@ dri2_wl_release_buffer(void *user_data, struct wl_drm_buffer *buffer) } static EGLBoolean -dri2_bind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp, +dri2_bind_wayland_display_wl(const _EGLDriver *drv, _EGLDisplay *disp, struct wl_display *wl_dpy) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -3274,7 +3274,7 @@ dri2_bind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_unbind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp, +dri2_unbind_wayland_display_wl(const _EGLDriver *drv, _EGLDisplay *disp, struct wl_display *wl_dpy) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -3291,7 +3291,7 @@ dri2_unbind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_query_wayland_buffer_wl(_EGLDriver *drv, _EGLDisplay *disp, +dri2_query_wayland_buffer_wl(const _EGLDriver *drv, _EGLDisplay *disp, struct wl_resource *buffer_resource, EGLint attribute, EGLint *value) { @@ -3351,7 +3351,7 @@ dri2_egl_unref_sync(struct dri2_egl_display *dri2_dpy, } static _EGLSync * -dri2_create_sync(_EGLDriver *drv, _EGLDisplay *disp, +dri2_create_sync(const _EGLDriver *drv, _EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list) { _EGLContext *ctx = _eglGetCurrentContext(); @@ -3452,7 +3452,7 @@ dri2_create_sync(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_destroy_sync(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) +dri2_destroy_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_sync *dri2_sync = dri2_egl_sync(sync); @@ -3481,7 +3481,7 @@ dri2_destroy_sync(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) } static EGLint -dri2_dup_native_fence_fd(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) +dri2_dup_native_fence_fd(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_sync *dri2_sync = dri2_egl_sync(sync); @@ -3506,7 +3506,7 @@ dri2_dup_native_fence_fd(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) } static void -dri2_set_blob_cache_funcs(_EGLDriver *drv, _EGLDisplay *disp, +dri2_set_blob_cache_funcs(const _EGLDriver *drv, _EGLDisplay *disp, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get) { @@ -3517,7 +3517,7 @@ dri2_set_blob_cache_funcs(_EGLDriver *drv, _EGLDisplay *disp, } static EGLint -dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, +dri2_client_wait_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, EGLint flags, EGLTime timeout) { _EGLContext *ctx = _eglGetCurrentContext(); @@ -3609,7 +3609,7 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, } static EGLBoolean -dri2_signal_sync(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, +dri2_signal_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, EGLenum mode) { struct dri2_egl_sync *dri2_sync = dri2_egl_sync(sync); @@ -3635,7 +3635,7 @@ dri2_signal_sync(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, } static EGLint -dri2_server_wait_sync(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) +dri2_server_wait_sync(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync) { _EGLContext *ctx = _eglGetCurrentContext(); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -3674,7 +3674,7 @@ dri2_interop_export_object(_EGLDisplay *disp, _EGLContext *ctx, return dri2_dpy->interop->export_object(dri2_ctx->dri_context, in, out); } -_EGLDriver _eglDriver = { +const _EGLDriver _eglDriver = { .Initialize = dri2_initialize, .Terminate = dri2_terminate, .CreateContext = dri2_create_context, diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index ac703cea1d8..7e5f03c19de 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -92,72 +92,72 @@ struct dri2_egl_display_vtbl { int (*authenticate)(_EGLDisplay *disp, uint32_t id); /* mandatory */ - _EGLSurface* (*create_window_surface)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLSurface* (*create_window_surface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, void *native_window, const EGLint *attrib_list); /* optional */ - _EGLSurface* (*create_pixmap_surface)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLSurface* (*create_pixmap_surface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, void *native_pixmap, const EGLint *attrib_list); /* optional */ - _EGLSurface* (*create_pbuffer_surface)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLSurface* (*create_pbuffer_surface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, const EGLint *attrib_list); /* mandatory */ - EGLBoolean (*destroy_surface)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*destroy_surface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface); /* optional */ - EGLBoolean (*swap_interval)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*swap_interval)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval); /* mandatory */ - _EGLImage* (*create_image)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLImage* (*create_image)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list); /* mandatory */ - EGLBoolean (*swap_buffers)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*swap_buffers)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf); /* optional - falls back to .swap_buffers */ - EGLBoolean (*swap_buffers_with_damage)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*swap_buffers_with_damage)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, const EGLint *rects, EGLint n_rects); /* optional */ - EGLBoolean (*swap_buffers_region)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*swap_buffers_region)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint numRects, const EGLint *rects); /* optional */ - EGLBoolean (*post_sub_buffer)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*post_sub_buffer)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint x, EGLint y, EGLint width, EGLint height); /* optional */ - EGLBoolean (*copy_buffers)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*copy_buffers)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, void *native_pixmap_target); /* optional */ - EGLint (*query_buffer_age)(_EGLDriver *drv, _EGLDisplay *disp, + EGLint (*query_buffer_age)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf); /* optional */ - EGLBoolean (*query_surface)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*query_surface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value); /* optional */ struct wl_buffer* (*create_wayland_buffer_from_image)( - _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img); + const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img); /* optional */ EGLBoolean (*get_sync_values)(_EGLDisplay *display, _EGLSurface *surface, @@ -446,10 +446,10 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id, const int *rgba_shifts, const unsigned int *rgba_sizes); EGLBoolean -dri2_add_pbuffer_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp); +dri2_add_pbuffer_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp); _EGLImage * -dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, +dri2_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list); @@ -459,14 +459,14 @@ dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx, #ifdef HAVE_X11_PLATFORM EGLBoolean -dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_x11(const _EGLDriver *drv, _EGLDisplay *disp); void dri2_teardown_x11(struct dri2_egl_display *dri2_dpy); unsigned int dri2_x11_get_red_mask_for_depth(struct dri2_egl_display *dri2_dpy, int depth); #else static inline EGLBoolean -dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11(const _EGLDriver *drv, _EGLDisplay *disp) { return _eglError(EGL_NOT_INITIALIZED, "X11 platform not built"); } @@ -481,12 +481,12 @@ dri2_x11_get_red_mask_for_depth(struct dri2_egl_display *dri2_dpy, int depth) #ifdef HAVE_DRM_PLATFORM EGLBoolean -dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_drm(const _EGLDriver *drv, _EGLDisplay *disp); void dri2_teardown_drm(struct dri2_egl_display *dri2_dpy); #else static inline EGLBoolean -dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_drm(const _EGLDriver *drv, _EGLDisplay *disp) { return _eglError(EGL_NOT_INITIALIZED, "GBM/DRM platform not built"); } @@ -496,14 +496,14 @@ dri2_teardown_drm(struct dri2_egl_display *dri2_dpy) {} #ifdef HAVE_WAYLAND_PLATFORM EGLBoolean -dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_wayland(const _EGLDriver *drv, _EGLDisplay *disp); void dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy); bool dri2_wl_is_format_supported(void* user_data, uint32_t format); #else static inline EGLBoolean -dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_wayland(const _EGLDriver *drv, _EGLDisplay *disp) { return _eglError(EGL_NOT_INITIALIZED, "Wayland platform not built"); } @@ -513,20 +513,20 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy) {} #ifdef HAVE_ANDROID_PLATFORM EGLBoolean -dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_android(const _EGLDriver *drv, _EGLDisplay *disp); #else static inline EGLBoolean -dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_android(const _EGLDriver *drv, _EGLDisplay *disp) { return _eglError(EGL_NOT_INITIALIZED, "Android platform not built"); } #endif EGLBoolean -dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_surfaceless(const _EGLDriver *drv, _EGLDisplay *disp); EGLBoolean -dri2_initialize_device(_EGLDriver *drv, _EGLDisplay *disp); +dri2_initialize_device(const _EGLDriver *drv, _EGLDisplay *disp); static inline void dri2_teardown_device(struct dri2_egl_display *dri2_dpy) { /* noop */ } @@ -538,7 +538,7 @@ dri2_get_dri_config(struct dri2_egl_config *conf, EGLint surface_type, EGLenum colorspace); static inline void -dri2_set_WL_bind_wayland_display(_EGLDriver *drv, _EGLDisplay *disp) +dri2_set_WL_bind_wayland_display(const _EGLDriver *drv, _EGLDisplay *disp) { #ifdef HAVE_WAYLAND_PLATFORM struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 6bcb1dcc529..ecf0efcd3d3 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -332,7 +332,7 @@ droid_set_shared_buffer_mode(_EGLDisplay *disp, _EGLSurface *surf, bool mode) } static _EGLSurface * -droid_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, +droid_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { @@ -445,7 +445,7 @@ cleanup_surface: } static _EGLSurface * -droid_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, +droid_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { @@ -454,7 +454,7 @@ droid_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -droid_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, +droid_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, const EGLint *attrib_list) { return droid_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, @@ -462,7 +462,7 @@ droid_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -droid_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +droid_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -498,7 +498,7 @@ droid_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) } static EGLBoolean -droid_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, +droid_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -701,7 +701,7 @@ droid_image_get_buffers(__DRIdrawable *driDrawable, } static EGLint -droid_query_buffer_age(_EGLDriver *drv, +droid_query_buffer_age(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface); @@ -715,7 +715,7 @@ droid_query_buffer_age(_EGLDriver *drv, } static EGLBoolean -droid_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) +droid_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw); @@ -1006,7 +1006,7 @@ droid_create_image_from_name(_EGLDisplay *disp, _EGLContext *ctx, #endif /* HAVE_DRM_GRALLOC */ static EGLBoolean -droid_query_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +droid_query_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -1069,7 +1069,7 @@ dri2_create_image_android_native_buffer(_EGLDisplay *disp, } static _EGLImage * -droid_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, +droid_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list) { @@ -1178,7 +1178,7 @@ droid_get_capability(void *loaderPrivate, enum dri_loader_cap cap) } static EGLBoolean -droid_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp) +droid_add_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); static const struct { @@ -1588,7 +1588,7 @@ droid_open_device(_EGLDisplay *disp, bool swrast) #endif EGLBoolean -dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_android(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; bool device_opened = false; diff --git a/src/egl/drivers/dri2/platform_device.c b/src/egl/drivers/dri2/platform_device.c index 7c12b4792c2..d17aee5cc97 100644 --- a/src/egl/drivers/dri2/platform_device.c +++ b/src/egl/drivers/dri2/platform_device.c @@ -115,7 +115,7 @@ device_image_get_buffers(__DRIdrawable *driDrawable, } static _EGLSurface * -dri2_device_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, +dri2_device_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, _EGLConfig *conf, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -160,7 +160,7 @@ dri2_device_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, } static EGLBoolean -device_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +device_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -175,7 +175,7 @@ device_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) } static _EGLSurface * -dri2_device_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_device_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, const EGLint *attrib_list) { return dri2_device_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, @@ -317,7 +317,7 @@ device_probe_device_sw(_EGLDisplay *disp) } EGLBoolean -dri2_initialize_device(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_device(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index d7b64338d3a..6b279b65a17 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -138,7 +138,7 @@ dri2_drm_config_is_compatible(struct dri2_egl_display *dri2_dpy, } static _EGLSurface * -dri2_drm_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_drm_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_surface, const EGLint *attrib_list) { @@ -192,7 +192,7 @@ dri2_drm_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri2_drm_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_drm_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { @@ -207,7 +207,7 @@ dri2_drm_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_drm_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_drm_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -418,7 +418,7 @@ dri2_drm_flush_front_buffer(__DRIdrawable * driDrawable, void *loaderPrivate) } static EGLBoolean -dri2_drm_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) +dri2_drm_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw); @@ -450,7 +450,7 @@ dri2_drm_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) } static EGLint -dri2_drm_query_buffer_age(_EGLDriver *drv, +dri2_drm_query_buffer_age(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface); @@ -490,7 +490,7 @@ dri2_drm_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx, } static _EGLImage * -dri2_drm_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, +dri2_drm_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list) { @@ -610,7 +610,7 @@ swrast_get_image(__DRIdrawable *driDrawable, } static EGLBoolean -drm_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp) +drm_add_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); const struct gbm_dri_visual *visuals = dri2_dpy->gbm_dri->visual_table; @@ -682,7 +682,7 @@ static const struct dri2_egl_display_vtbl dri2_drm_display_vtbl = { }; EGLBoolean -dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_drm(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index c6761395a0c..f0d5e047e07 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -108,7 +108,7 @@ surfaceless_image_get_buffers(__DRIdrawable *driDrawable, } static _EGLSurface * -dri2_surfaceless_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, +dri2_surfaceless_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, _EGLConfig *conf, const EGLint *attrib_list) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -153,7 +153,7 @@ dri2_surfaceless_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, } static EGLBoolean -surfaceless_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +surfaceless_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -168,7 +168,7 @@ surfaceless_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *sur } static _EGLSurface * -dri2_surfaceless_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_surfaceless_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, const EGLint *attrib_list) { return dri2_surfaceless_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, @@ -313,7 +313,7 @@ surfaceless_probe_device_sw(_EGLDisplay *disp) } EGLBoolean -dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_surfaceless(const _EGLDriver *drv, _EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy; const char* err; diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index b49337eef53..3d9f0f76d72 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -307,7 +307,7 @@ get_wl_surface_proxy(struct wl_egl_window *window) * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_wl_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { @@ -410,7 +410,7 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri2_wl_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_wl_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { @@ -429,7 +429,7 @@ dri2_wl_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, * Called via eglDestroySurface(), drv->DestroySurface(). */ static EGLBoolean -dri2_wl_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_wl_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -1053,7 +1053,7 @@ try_damage_buffer(struct dri2_egl_surface *dri2_surf, * Called via eglSwapBuffers(), drv->SwapBuffers(). */ static EGLBoolean -dri2_wl_swap_buffers_with_damage(_EGLDriver *drv, +dri2_wl_swap_buffers_with_damage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, const EGLint *rects, @@ -1154,7 +1154,7 @@ dri2_wl_swap_buffers_with_damage(_EGLDriver *drv, } static EGLint -dri2_wl_query_buffer_age(_EGLDriver *drv, +dri2_wl_query_buffer_age(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface) { struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface); @@ -1168,13 +1168,13 @@ dri2_wl_query_buffer_age(_EGLDriver *drv, } static EGLBoolean -dri2_wl_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) +dri2_wl_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) { return dri2_wl_swap_buffers_with_damage(drv, disp, draw, NULL, 0); } static struct wl_buffer * -dri2_wl_create_wayland_buffer_from_image(_EGLDriver *drv, +dri2_wl_create_wayland_buffer_from_image(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img) { @@ -1407,7 +1407,7 @@ static const __DRIextension *image_loader_extensions[] = { }; static EGLBoolean -dri2_wl_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp) +dri2_wl_add_configs_for_visuals(const _EGLDriver *drv, _EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); unsigned int format_count[ARRAY_SIZE(dri2_wl_visuals)] = { 0 }; @@ -1482,7 +1482,7 @@ dri2_wl_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp) } static EGLBoolean -dri2_initialize_wayland_drm(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_wayland_drm(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -1949,7 +1949,7 @@ dri2_wl_swrast_put_image(__DRIdrawable * draw, int op, } static EGLBoolean -dri2_wl_swrast_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) +dri2_wl_swrast_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw); @@ -2019,7 +2019,7 @@ static const __DRIextension *swrast_loader_extensions[] = { }; static EGLBoolean -dri2_initialize_wayland_swrast(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_wayland_swrast(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -2104,7 +2104,7 @@ dri2_initialize_wayland_swrast(_EGLDriver *drv, _EGLDisplay *disp) } EGLBoolean -dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_wayland(const _EGLDriver *drv, _EGLDisplay *disp) { EGLBoolean initialized = EGL_FALSE; diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 200f397691d..68520f82022 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -52,7 +52,7 @@ #endif static EGLBoolean -dri2_x11_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval); uint32_t @@ -247,7 +247,7 @@ dri2_x11_get_red_mask_for_depth(struct dri2_egl_display *dri2_dpy, int depth) * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -dri2_x11_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, +dri2_x11_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, _EGLConfig *conf, void *native_surface, const EGLint *attrib_list) { @@ -363,7 +363,7 @@ dri2_x11_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -dri2_x11_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_x11_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { @@ -386,7 +386,7 @@ dri2_x11_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri2_x11_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_x11_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_pixmap, const EGLint *attrib_list) { @@ -395,7 +395,7 @@ dri2_x11_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri2_x11_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_x11_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, const EGLint *attrib_list) { return dri2_x11_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, @@ -403,7 +403,7 @@ dri2_x11_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_x11_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri2_x11_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); @@ -437,7 +437,7 @@ dri2_x11_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) * have. */ static EGLBoolean -dri2_query_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri2_query_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value) { @@ -851,7 +851,7 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display *dri2_dpy, } static EGLBoolean -dri2_copy_region(_EGLDriver *drv, _EGLDisplay *disp, +dri2_copy_region(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, xcb_xfixes_region_t region) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -881,7 +881,7 @@ dri2_copy_region(_EGLDriver *drv, _EGLDisplay *disp, } static int64_t -dri2_x11_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, +dri2_x11_swap_buffers_msc(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, int64_t msc, int64_t divisor, int64_t remainder) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -931,7 +931,7 @@ dri2_x11_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, } static EGLBoolean -dri2_x11_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) +dri2_x11_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw); @@ -949,7 +949,7 @@ dri2_x11_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) } static EGLBoolean -dri2_x11_swap_buffers_region(_EGLDriver *drv, _EGLDisplay *disp, +dri2_x11_swap_buffers_region(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, EGLint numRects, const EGLint *rects) { @@ -978,7 +978,7 @@ dri2_x11_swap_buffers_region(_EGLDriver *drv, _EGLDisplay *disp, } static EGLBoolean -dri2_x11_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, +dri2_x11_post_sub_buffer(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, EGLint x, EGLint y, EGLint width, EGLint height) { const EGLint rect[4] = { x, y, width, height }; @@ -990,7 +990,7 @@ dri2_x11_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, } static EGLBoolean -dri2_x11_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1003,7 +1003,7 @@ dri2_x11_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, } static EGLBoolean -dri2_x11_copy_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri2_x11_copy_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, void *native_pixmap_target) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); @@ -1134,7 +1134,7 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx, } static _EGLImage * -dri2_x11_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, +dri2_x11_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list) { @@ -1230,7 +1230,7 @@ dri2_find_screen_for_display(const _EGLDisplay *disp, int fallback_screen) } static EGLBoolean -dri2_get_xcb_connection(_EGLDriver *drv, _EGLDisplay *disp, +dri2_get_xcb_connection(const _EGLDriver *drv, _EGLDisplay *disp, struct dri2_egl_display *dri2_dpy) { xcb_screen_iterator_t s; @@ -1269,7 +1269,7 @@ disconnect: } static EGLBoolean -dri2_initialize_x11_swrast(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11_swrast(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -1356,7 +1356,7 @@ static const __DRIextension *dri3_image_loader_extensions[] = { }; static EGLBoolean -dri2_initialize_x11_dri3(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11_dri3(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -1463,7 +1463,7 @@ static const __DRIextension *dri2_loader_extensions[] = { }; static EGLBoolean -dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11_dri2(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; struct dri2_egl_display *dri2_dpy; @@ -1534,7 +1534,7 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp) } EGLBoolean -dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp) +dri2_initialize_x11(const _EGLDriver *drv, _EGLDisplay *disp) { EGLBoolean initialized = EGL_FALSE; diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c index ed410544a53..e1bacd804a7 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.c +++ b/src/egl/drivers/dri2/platform_x11_dri3.c @@ -104,7 +104,7 @@ static const struct loader_dri3_vtable egl_dri3_vtable = { }; static EGLBoolean -dri3_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri3_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf); @@ -124,7 +124,7 @@ dri3_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) } static EGLBoolean -dri3_set_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri3_set_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf); @@ -136,7 +136,7 @@ dri3_set_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, } static _EGLSurface * -dri3_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, +dri3_create_surface(const _EGLDriver *drv, _EGLDisplay *disp, EGLint type, _EGLConfig *conf, void *native_surface, const EGLint *attrib_list) { @@ -222,7 +222,7 @@ dri3_authenticate(_EGLDisplay *disp, uint32_t id) * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -dri3_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri3_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { @@ -238,7 +238,7 @@ dri3_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri3_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri3_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_pixmap, const EGLint *attrib_list) { @@ -247,7 +247,7 @@ dri3_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, } static _EGLSurface * -dri3_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri3_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, const EGLint *attrib_list) { return dri3_create_surface(drv, disp, EGL_PBUFFER_BIT, conf, @@ -374,7 +374,7 @@ dri3_create_image_khr_pixmap_from_buffers(_EGLDisplay *disp, _EGLContext *ctx, #endif static _EGLImage * -dri3_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, +dri3_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list) { @@ -421,7 +421,7 @@ const __DRIimageLoaderExtension dri3_image_loader_extension = { }; static EGLBoolean -dri3_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) +dri3_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) { struct dri3_egl_surface *dri3_surf = dri3_egl_surface(draw); @@ -431,7 +431,7 @@ dri3_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw) } static EGLBoolean -dri3_copy_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +dri3_copy_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, void *native_pixmap_target) { struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf); @@ -447,7 +447,7 @@ dri3_copy_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, } static int -dri3_query_buffer_age(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +dri3_query_buffer_age(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct dri3_egl_surface *dri3_surf = dri3_egl_surface(surf); @@ -455,7 +455,7 @@ dri3_query_buffer_age(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) } static EGLBoolean -dri3_query_surface(_EGLDriver *drv, _EGLDisplay *disp, +dri3_query_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value) { diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp index 9daf907e68c..48f0848629e 100644 --- a/src/egl/drivers/haiku/egl_haiku.cpp +++ b/src/egl/drivers/haiku/egl_haiku.cpp @@ -76,7 +76,7 @@ struct haiku_egl_surface * Called via eglCreateWindowSurface(), drv->CreateWindowSurface(). */ static _EGLSurface * -haiku_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, +haiku_create_window_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_window, const EGLint *attrib_list) { CALLED(); @@ -113,7 +113,7 @@ haiku_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, static _EGLSurface * -haiku_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, +haiku_create_pixmap_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, void *native_pixmap, const EGLint *attrib_list) { return NULL; @@ -121,7 +121,7 @@ haiku_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp, static _EGLSurface * -haiku_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, +haiku_create_pbuffer_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, const EGLint *attrib_list) { return NULL; @@ -129,7 +129,7 @@ haiku_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp, static EGLBoolean -haiku_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +haiku_destroy_surface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { if (_eglPutSurface(surf)) { // XXX: detach haiku_egl_surface::gl from the native window and destroy it @@ -205,7 +205,7 @@ cleanup: extern "C" EGLBoolean -init_haiku(_EGLDriver *drv, _EGLDisplay *disp) +init_haiku(const _EGLDriver *drv, _EGLDisplay *disp) { _EGLDevice *dev; CALLED(); @@ -231,7 +231,7 @@ init_haiku(_EGLDriver *drv, _EGLDisplay *disp) extern "C" EGLBoolean -haiku_terminate(_EGLDriver* drv,_EGLDisplay *disp) +haiku_terminate(const _EGLDriver* drv,_EGLDisplay *disp) { return EGL_TRUE; } @@ -239,7 +239,7 @@ haiku_terminate(_EGLDriver* drv,_EGLDisplay *disp) extern "C" _EGLContext* -haiku_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, +haiku_create_context(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, _EGLContext *share_list, const EGLint *attrib_list) { CALLED(); @@ -265,7 +265,7 @@ cleanup: extern "C" EGLBoolean -haiku_destroy_context(_EGLDriver* drv, _EGLDisplay *disp, _EGLContext* ctx) +haiku_destroy_context(const _EGLDriver* drv, _EGLDisplay *disp, _EGLContext* ctx) { struct haiku_egl_context* context = haiku_egl_context(ctx); @@ -280,7 +280,7 @@ haiku_destroy_context(_EGLDriver* drv, _EGLDisplay *disp, _EGLContext* ctx) extern "C" EGLBoolean -haiku_make_current(_EGLDriver* drv, _EGLDisplay *disp, _EGLSurface *dsurf, +haiku_make_current(const _EGLDriver* drv, _EGLDisplay *disp, _EGLSurface *dsurf, _EGLSurface *rsurf, _EGLContext *ctx) { CALLED(); @@ -301,7 +301,7 @@ haiku_make_current(_EGLDriver* drv, _EGLDisplay *disp, _EGLSurface *dsurf, extern "C" EGLBoolean -haiku_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) +haiku_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) { struct haiku_egl_surface* surface = haiku_egl_surface(surf); @@ -312,7 +312,7 @@ haiku_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf) extern "C" -_EGLDriver _eglDriver = { +const _EGLDriver _eglDriver = { .Initialize = init_haiku, .Terminate = haiku_terminate, .CreateContext = haiku_create_context, diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index b68772256fe..d135c941c76 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -171,7 +171,7 @@ struct _egl_entrypoint { }; -static inline _EGLDriver * +static inline const _EGLDriver * _eglCheckDisplay(_EGLDisplay *disp, const char *msg) { if (!disp) { @@ -186,10 +186,10 @@ _eglCheckDisplay(_EGLDisplay *disp, const char *msg) } -static inline _EGLDriver * +static inline const _EGLDriver * _eglCheckSurface(_EGLDisplay *disp, _EGLSurface *surf, const char *msg) { - _EGLDriver *drv = _eglCheckDisplay(disp, msg); + const _EGLDriver *drv = _eglCheckDisplay(disp, msg); if (!drv) return NULL; if (!surf) { @@ -200,10 +200,10 @@ _eglCheckSurface(_EGLDisplay *disp, _EGLSurface *surf, const char *msg) } -static inline _EGLDriver * +static inline const _EGLDriver * _eglCheckContext(_EGLDisplay *disp, _EGLContext *context, const char *msg) { - _EGLDriver *drv = _eglCheckDisplay(disp, msg); + const _EGLDriver *drv = _eglCheckDisplay(disp, msg); if (!drv) return NULL; if (!context) { @@ -214,10 +214,10 @@ _eglCheckContext(_EGLDisplay *disp, _EGLContext *context, const char *msg) } -static inline _EGLDriver * +static inline const _EGLDriver * _eglCheckConfig(_EGLDisplay *disp, _EGLConfig *conf, const char *msg) { - _EGLDriver *drv = _eglCheckDisplay(disp, msg); + const _EGLDriver *drv = _eglCheckDisplay(disp, msg); if (!drv) return NULL; if (!conf) { @@ -228,10 +228,10 @@ _eglCheckConfig(_EGLDisplay *disp, _EGLConfig *conf, const char *msg) } -static inline _EGLDriver * +static inline const _EGLDriver * _eglCheckSync(_EGLDisplay *disp, _EGLSync *s, const char *msg) { - _EGLDriver *drv = _eglCheckDisplay(disp, msg); + const _EGLDriver *drv = _eglCheckDisplay(disp, msg); if (!drv) return NULL; if (!s) { @@ -672,7 +672,7 @@ eglTerminate(EGLDisplay dpy) RETURN_EGL_ERROR(NULL, EGL_BAD_DISPLAY, EGL_FALSE); if (disp->Initialized) { - _EGLDriver *drv = disp->Driver; + const _EGLDriver *drv = disp->Driver; drv->Terminate(drv, disp); /* do not reset disp->Driver */ @@ -692,7 +692,7 @@ const char * EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name) { _EGLDisplay *disp; - _EGLDriver *drv; + const _EGLDriver *drv; #if !USE_LIBGLVND if (dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS) { @@ -724,7 +724,7 @@ eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE); @@ -745,7 +745,7 @@ eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE); @@ -768,7 +768,7 @@ eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLConfig *conf = _eglLookupConfig(config, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE); @@ -788,7 +788,7 @@ eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_list, _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLConfig *conf = _eglLookupConfig(config, disp); _EGLContext *share = _eglLookupContext(share_list, disp); - _EGLDriver *drv; + const _EGLDriver *drv; _EGLContext *context; EGLContext ret; @@ -816,7 +816,7 @@ eglDestroyContext(EGLDisplay dpy, EGLContext ctx) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLContext *context = _eglLookupContext(ctx, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_CONTEXT_KHR, context, EGL_FALSE); @@ -837,7 +837,7 @@ eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, _EGLContext *context = _eglLookupContext(ctx, disp); _EGLSurface *draw_surf = _eglLookupSurface(draw, disp); _EGLSurface *read_surf = _eglLookupSurface(read, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_CONTEXT_KHR, context, EGL_FALSE); @@ -893,7 +893,7 @@ eglQueryContext(EGLDisplay dpy, EGLContext ctx, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLContext *context = _eglLookupContext(ctx, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_CONTEXT_KHR, context, EGL_FALSE); @@ -937,7 +937,7 @@ _eglCreateWindowSurfaceCommon(_EGLDisplay *disp, EGLConfig config, void *native_window, const EGLint *attrib_list) { _EGLConfig *conf = _eglLookupConfig(config, disp); - _EGLDriver *drv; + const _EGLDriver *drv; _EGLSurface *surf; EGLSurface ret; @@ -1067,7 +1067,7 @@ _eglCreatePixmapSurfaceCommon(_EGLDisplay *disp, EGLConfig config, void *native_pixmap, const EGLint *attrib_list) { _EGLConfig *conf = _eglLookupConfig(config, disp); - _EGLDriver *drv; + const _EGLDriver *drv; _EGLSurface *surf; EGLSurface ret; @@ -1160,7 +1160,7 @@ eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLConfig *conf = _eglLookupConfig(config, disp); - _EGLDriver *drv; + const _EGLDriver *drv; _EGLSurface *surf; EGLSurface ret; @@ -1182,7 +1182,7 @@ eglDestroySurface(EGLDisplay dpy, EGLSurface surface) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -1199,7 +1199,7 @@ eglQuerySurface(EGLDisplay dpy, EGLSurface surface, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -1219,7 +1219,7 @@ eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -1236,7 +1236,7 @@ eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -1252,7 +1252,7 @@ eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -1269,7 +1269,7 @@ eglSwapInterval(EGLDisplay dpy, EGLint interval) _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLContext *ctx = _eglGetCurrentContext(); _EGLSurface *surf = ctx ? ctx->DrawSurface : NULL; - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -1312,7 +1312,7 @@ eglSwapBuffers(EGLDisplay dpy, EGLSurface surface) _EGLContext *ctx = _eglGetCurrentContext(); _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -1357,7 +1357,7 @@ _eglSwapBuffersWithDamageCommon(_EGLDisplay *disp, _EGLSurface *surf, const EGLint *rects, EGLint n_rects) { _EGLContext *ctx = _eglGetCurrentContext(); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv); @@ -1441,7 +1441,7 @@ eglSetDamageRegionKHR(EGLDisplay dpy, EGLSurface surface, _EGLSurface *surf = _eglLookupSurface(surface, disp); _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); _EGLContext *ctx = _eglGetCurrentContext(); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv); @@ -1473,7 +1473,7 @@ eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; void *native_pixmap_ptr; @@ -1493,7 +1493,7 @@ _eglWaitClientCommon(void) { _EGLContext *ctx = _eglGetCurrentContext(); _EGLDisplay *disp; - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; if (!ctx) @@ -1536,7 +1536,7 @@ eglWaitNative(EGLint engine) { _EGLContext *ctx = _eglGetCurrentContext(); _EGLDisplay *disp; - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; if (!ctx) @@ -1686,7 +1686,7 @@ eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLConfig *conf = _eglLookupConfig(config, disp); - _EGLDriver *drv; + const _EGLDriver *drv; _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_NO_SURFACE); @@ -1709,7 +1709,7 @@ eglReleaseThread(void) if (ctx) { _EGLDisplay *disp = ctx->Resource.Display; - _EGLDriver *drv; + const _EGLDriver *drv; mtx_lock(&disp->Mutex); drv = disp->Driver; @@ -1729,7 +1729,7 @@ _eglCreateImageCommon(_EGLDisplay *disp, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list) { _EGLContext *context = _eglLookupContext(ctx, disp); - _EGLDriver *drv; + const _EGLDriver *drv; _EGLImage *img; EGLImage ret; @@ -1784,7 +1784,7 @@ eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, static EGLBoolean _eglDestroyImageCommon(_EGLDisplay *disp, _EGLImage *img) { - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv); @@ -1824,7 +1824,7 @@ _eglCreateSync(_EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list, EGLenum invalid_type_error) { _EGLContext *ctx = _eglGetCurrentContext(); - _EGLDriver *drv; + const _EGLDriver *drv; _EGLSync *sync; EGLSync ret; @@ -1937,7 +1937,7 @@ eglCreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list) static EGLBoolean _eglDestroySync(_EGLDisplay *disp, _EGLSync *s) { - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv); @@ -1974,7 +1974,7 @@ static EGLint _eglClientWaitSyncCommon(_EGLDisplay *disp, EGLDisplay dpy, _EGLSync *s, EGLint flags, EGLTime timeout) { - _EGLDriver *drv; + const _EGLDriver *drv; EGLint ret; _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv); @@ -2030,7 +2030,7 @@ static EGLint _eglWaitSyncCommon(_EGLDisplay *disp, _EGLSync *s, EGLint flags) { _EGLContext *ctx = _eglGetCurrentContext(); - _EGLDriver *drv; + const _EGLDriver *drv; EGLint ret; _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv); @@ -2080,7 +2080,7 @@ eglSignalSyncKHR(EGLDisplay dpy, EGLSync sync, EGLenum mode) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSync *s = _eglLookupSync(sync, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SYNC_KHR, s, EGL_FALSE); @@ -2096,7 +2096,7 @@ eglSignalSyncKHR(EGLDisplay dpy, EGLSync sync, EGLenum mode) static EGLBoolean _eglGetSyncAttribCommon(_EGLDisplay *disp, _EGLSync *s, EGLint attribute, EGLAttrib *value) { - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv); @@ -2155,7 +2155,7 @@ eglDupNativeFenceFDANDROID(EGLDisplay dpy, EGLSync sync) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSync *s = _eglLookupSync(sync, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SYNC_KHR, s, EGL_FALSE); @@ -2181,7 +2181,7 @@ eglSwapBuffersRegionNOK(EGLDisplay dpy, EGLSurface surface, _EGLContext *ctx = _eglGetCurrentContext(); _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -2206,7 +2206,7 @@ static EGLImage EGLAPIENTRY eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attr_list) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; _EGLImage *img; EGLImage ret; @@ -2228,7 +2228,7 @@ eglExportDRMImageMESA(EGLDisplay dpy, EGLImage image, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLImage *img = _eglLookupImage(image, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_IMAGE_KHR, img, EGL_FALSE); @@ -2251,7 +2251,7 @@ static EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE); @@ -2271,7 +2271,7 @@ static EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE); @@ -2292,7 +2292,7 @@ eglQueryWaylandBufferWL(EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE); @@ -2314,7 +2314,7 @@ eglCreateWaylandBufferFromImageWL(EGLDisplay dpy, EGLImage image) { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLImage *img; - _EGLDriver *drv; + const _EGLDriver *drv; struct wl_buffer *ret; _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE); @@ -2339,7 +2339,7 @@ eglPostSubBufferNV(EGLDisplay dpy, EGLSurface surface, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -2361,7 +2361,7 @@ eglGetSyncValuesCHROMIUM(EGLDisplay dpy, EGLSurface surface, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLSurface *surf = _eglLookupSurface(surface, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE); @@ -2385,7 +2385,7 @@ eglExportDMABUFImageQueryMESA(EGLDisplay dpy, EGLImage image, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLImage *img = _eglLookupImage(image, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_IMAGE_KHR, img, EGL_FALSE); @@ -2408,7 +2408,7 @@ eglExportDMABUFImageMESA(EGLDisplay dpy, EGLImage image, { _EGLDisplay *disp = _eglLockDisplay(dpy); _EGLImage *img = _eglLookupImage(image, disp); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(disp, EGL_OBJECT_IMAGE_KHR, img, EGL_FALSE); @@ -2576,7 +2576,7 @@ eglQueryDmaBufFormatsEXT(EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(NULL, EGL_NONE, NULL, EGL_FALSE); @@ -2595,7 +2595,7 @@ eglQueryDmaBufModifiersEXT(EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLint *num_modifiers) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; EGLBoolean ret; _EGL_FUNC_START(NULL, EGL_NONE, NULL, EGL_FALSE); @@ -2623,7 +2623,7 @@ eglSetBlobCacheFuncsANDROID(EGLDisplay *dpy, EGLSetBlobFuncANDROID set, return; } - _EGLDriver *drv = _eglCheckDisplay(disp, __func__); + const _EGLDriver *drv = _eglCheckDisplay(disp, __func__); if (!drv) { if (disp) _eglUnlockDisplay(disp); @@ -2700,7 +2700,7 @@ eglQueryDisplayAttribEXT(EGLDisplay dpy, EGLAttrib *value) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; _EGL_FUNC_START(NULL, EGL_NONE, NULL, EGL_FALSE); _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv); @@ -2719,7 +2719,7 @@ static char * EGLAPIENTRY eglGetDisplayDriverConfig(EGLDisplay dpy) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; char *ret; _EGL_FUNC_START(disp, EGL_NONE, NULL, NULL); @@ -2735,7 +2735,7 @@ static const char * EGLAPIENTRY eglGetDisplayDriverName(EGLDisplay dpy) { _EGLDisplay *disp = _eglLockDisplay(dpy); - _EGLDriver *drv; + const _EGLDriver *drv; const char *ret; _EGL_FUNC_START(disp, EGL_NONE, NULL, NULL); @@ -2780,7 +2780,7 @@ eglGetProcAddress(const char *procname) static int _eglLockDisplayInterop(EGLDisplay dpy, EGLContext context, - _EGLDisplay **disp, _EGLDriver **drv, + _EGLDisplay **disp, const _EGLDriver **drv, _EGLContext **ctx) { @@ -2809,7 +2809,7 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, struct mesa_glinterop_device_info *out) { _EGLDisplay *disp; - _EGLDriver *drv; + const _EGLDriver *drv; _EGLContext *ctx; int ret; @@ -2832,7 +2832,7 @@ MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context, struct mesa_glinterop_export_out *out) { _EGLDisplay *disp; - _EGLDriver *drv; + const _EGLDriver *drv; _EGLContext *ctx; int ret; diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c index 0a95e8ee05d..2a59896c2d7 100644 --- a/src/egl/main/eglconfig.c +++ b/src/egl/main/eglconfig.c @@ -790,7 +790,7 @@ _eglFallbackCompare(const _EGLConfig *conf1, const _EGLConfig *conf2, * Typical fallback routine for eglChooseConfig */ EGLBoolean -_eglChooseConfig(_EGLDriver *drv, _EGLDisplay *disp, const EGLint *attrib_list, +_eglChooseConfig(const _EGLDriver *drv, _EGLDisplay *disp, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_configs) { _EGLConfig criteria; @@ -809,7 +809,7 @@ _eglChooseConfig(_EGLDriver *drv, _EGLDisplay *disp, const EGLint *attrib_list, * Fallback for eglGetConfigAttrib. */ EGLBoolean -_eglGetConfigAttrib(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, +_eglGetConfigAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, EGLint attribute, EGLint *value) { if (!_eglIsConfigAttribValid(conf, attribute)) @@ -845,7 +845,7 @@ _eglFlattenConfig(void *elem, void *buffer) * Fallback for eglGetConfigs. */ EGLBoolean -_eglGetConfigs(_EGLDriver *drv, _EGLDisplay *disp, EGLConfig *configs, +_eglGetConfigs(const _EGLDriver *drv, _EGLDisplay *disp, EGLConfig *configs, EGLint config_size, EGLint *num_config) { *num_config = _eglFlattenArray(disp->Configs, (void *) configs, diff --git a/src/egl/main/eglconfig.h b/src/egl/main/eglconfig.h index 605289de536..ebad16125d3 100644 --- a/src/egl/main/eglconfig.h +++ b/src/egl/main/eglconfig.h @@ -224,15 +224,15 @@ _eglFilterConfigArray(_EGLArray *array, EGLConfig *configs, extern EGLBoolean -_eglChooseConfig(_EGLDriver *drv, _EGLDisplay *disp, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); +_eglChooseConfig(const _EGLDriver *drv, _EGLDisplay *disp, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); extern EGLBoolean -_eglGetConfigAttrib(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, EGLint attribute, EGLint *value); +_eglGetConfigAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, EGLint attribute, EGLint *value); extern EGLBoolean -_eglGetConfigs(_EGLDriver *drv, _EGLDisplay *disp, EGLConfig *configs, EGLint config_size, EGLint *num_config); +_eglGetConfigs(const _EGLDriver *drv, _EGLDisplay *disp, EGLConfig *configs, EGLint config_size, EGLint *num_config); #ifdef __cplusplus diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c index bb11b8f9104..63035a3312e 100644 --- a/src/egl/main/eglcontext.c +++ b/src/egl/main/eglcontext.c @@ -671,7 +671,7 @@ _eglQueryContextRenderBuffer(_EGLContext *ctx) EGLBoolean -_eglQueryContext(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *c, +_eglQueryContext(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *c, EGLint attribute, EGLint *value) { (void) drv; diff --git a/src/egl/main/eglcontext.h b/src/egl/main/eglcontext.h index 2c6ebd19cb9..e1d335e7536 100644 --- a/src/egl/main/eglcontext.h +++ b/src/egl/main/eglcontext.h @@ -74,7 +74,7 @@ _eglInitContext(_EGLContext *ctx, _EGLDisplay *disp, extern EGLBoolean -_eglQueryContext(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLint attribute, EGLint *value); +_eglQueryContext(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLint attribute, EGLint *value); extern EGLBoolean diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index 3321d9e412e..6423b3fde12 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -293,7 +293,7 @@ out: * Destroy the contexts and surfaces that are linked to the display. */ void -_eglReleaseDisplayResources(_EGLDriver *drv, _EGLDisplay *display) +_eglReleaseDisplayResources(const _EGLDriver *drv, _EGLDisplay *display) { _EGLResource *list; diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 951679ba0f0..a4f7f42cd43 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -161,7 +161,7 @@ struct _egl_display void *PlatformDisplay; /**< A pointer to the platform display */ _EGLDevice *Device; /**< Device backing the display */ - _EGLDriver *Driver; /**< Matched driver of the display */ + const _EGLDriver *Driver; /**< Matched driver of the display */ EGLBoolean Initialized; /**< True if the display is initialized */ /* options that affect how the driver initializes the display */ @@ -207,7 +207,7 @@ _eglFindDisplay(_EGLPlatformType plat, void *plat_dpy, const EGLAttrib *attr); extern void -_eglReleaseDisplayResources(_EGLDriver *drv, _EGLDisplay *disp); +_eglReleaseDisplayResources(const _EGLDriver *drv, _EGLDisplay *disp); extern void diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 7bbc9470b41..b4930069d9c 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -46,7 +46,7 @@ #include "util/debug.h" -extern _EGLDriver _eglDriver; +extern const _EGLDriver _eglDriver; /** * Initialize the display using the driver's function. diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 36459281071..1741a2000b5 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -85,121 +85,121 @@ struct mesa_glinterop_export_out; struct _egl_driver { /* driver funcs */ - EGLBoolean (*Initialize)(_EGLDriver *, _EGLDisplay *disp); - EGLBoolean (*Terminate)(_EGLDriver *, _EGLDisplay *disp); + EGLBoolean (*Initialize)(const _EGLDriver *, _EGLDisplay *disp); + EGLBoolean (*Terminate)(const _EGLDriver *, _EGLDisplay *disp); const char *(*QueryDriverName)(_EGLDisplay *disp); char *(*QueryDriverConfig)(_EGLDisplay *disp); /* context funcs */ - _EGLContext *(*CreateContext)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLContext *(*CreateContext)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, _EGLContext *share_list, const EGLint *attrib_list); - EGLBoolean (*DestroyContext)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*DestroyContext)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx); /* this is the only function (other than Initialize) that may be called * with an uninitialized display */ - EGLBoolean (*MakeCurrent)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*MakeCurrent)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, _EGLSurface *read, _EGLContext *ctx); /* surface funcs */ - _EGLSurface *(*CreateWindowSurface)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLSurface *(*CreateWindowSurface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, void *native_window, const EGLint *attrib_list); - _EGLSurface *(*CreatePixmapSurface)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLSurface *(*CreatePixmapSurface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, void *native_pixmap, const EGLint *attrib_list); - _EGLSurface *(*CreatePbufferSurface)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLSurface *(*CreatePbufferSurface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, const EGLint *attrib_list); - EGLBoolean (*DestroySurface)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*DestroySurface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface); - EGLBoolean (*QuerySurface)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*QuerySurface)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint attribute, EGLint *value); - EGLBoolean (*BindTexImage)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*BindTexImage)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint buffer); - EGLBoolean (*ReleaseTexImage)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*ReleaseTexImage)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint buffer); - EGLBoolean (*SwapInterval)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*SwapInterval)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval); - EGLBoolean (*SwapBuffers)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*SwapBuffers)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw); - EGLBoolean (*CopyBuffers)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*CopyBuffers)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, void *native_pixmap_target); - EGLBoolean (*SetDamageRegion)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*SetDamageRegion)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint *rects, EGLint n_rects); /* misc functions */ - EGLBoolean (*WaitClient)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*WaitClient)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx); - EGLBoolean (*WaitNative)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*WaitNative)(const _EGLDriver *drv, _EGLDisplay *disp, EGLint engine); /* this function may be called from multiple threads at the same time */ - _EGLProc (*GetProcAddress)(_EGLDriver *drv, const char *procname); + _EGLProc (*GetProcAddress)(const _EGLDriver *drv, const char *procname); - _EGLImage *(*CreateImageKHR)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLImage *(*CreateImageKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list); - EGLBoolean (*DestroyImageKHR)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*DestroyImageKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *image); - _EGLSync *(*CreateSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, EGLenum type, + _EGLSync *(*CreateSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list); - EGLBoolean (*DestroySyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*DestroySyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync); - EGLint (*ClientWaitSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, + EGLint (*ClientWaitSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, EGLint flags, EGLTime timeout); - EGLint (*WaitSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync); - EGLBoolean (*SignalSyncKHR)(_EGLDriver *drv, _EGLDisplay *disp, + EGLint (*WaitSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync); + EGLBoolean (*SignalSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, EGLenum mode); - EGLint (*DupNativeFenceFDANDROID)(_EGLDriver *drv, _EGLDisplay *disp, + EGLint (*DupNativeFenceFDANDROID)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync); - EGLBoolean (*SwapBuffersRegionNOK)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*SwapBuffersRegionNOK)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint numRects, const EGLint *rects); - _EGLImage *(*CreateDRMImageMESA)(_EGLDriver *drv, _EGLDisplay *disp, + _EGLImage *(*CreateDRMImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, const EGLint *attr_list); - EGLBoolean (*ExportDRMImageMESA)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*ExportDRMImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *name, EGLint *handle, EGLint *stride); - EGLBoolean (*BindWaylandDisplayWL)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*BindWaylandDisplayWL)(const _EGLDriver *drv, _EGLDisplay *disp, struct wl_display *display); - EGLBoolean (*UnbindWaylandDisplayWL)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*UnbindWaylandDisplayWL)(const _EGLDriver *drv, _EGLDisplay *disp, struct wl_display *display); - EGLBoolean (*QueryWaylandBufferWL)(_EGLDriver *drv, _EGLDisplay *displ, + EGLBoolean (*QueryWaylandBufferWL)(const _EGLDriver *drv, _EGLDisplay *displ, struct wl_resource *buffer, EGLint attribute, EGLint *value); - struct wl_buffer *(*CreateWaylandBufferFromImageWL)(_EGLDriver *drv, + struct wl_buffer *(*CreateWaylandBufferFromImageWL)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img); - EGLBoolean (*SwapBuffersWithDamageEXT)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*SwapBuffersWithDamageEXT)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, const EGLint *rects, EGLint n_rects); - EGLBoolean (*PostSubBufferNV)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*PostSubBufferNV)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint x, EGLint y, EGLint width, EGLint height); - EGLint (*QueryBufferAge)(_EGLDriver *drv, + EGLint (*QueryBufferAge)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface); EGLBoolean (*GetSyncValuesCHROMIUM)(_EGLDisplay *disp, _EGLSurface *surface, EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc); - EGLBoolean (*ExportDMABUFImageQueryMESA)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*ExportDMABUFImageQueryMESA)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fourcc, EGLint *nplanes, EGLuint64KHR *modifiers); - EGLBoolean (*ExportDMABUFImageMESA)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*ExportDMABUFImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img, EGLint *fds, EGLint *strides, EGLint *offsets); @@ -209,16 +209,16 @@ struct _egl_driver struct mesa_glinterop_export_in *in, struct mesa_glinterop_export_out *out); - EGLBoolean (*QueryDmaBufFormatsEXT)(_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*QueryDmaBufFormatsEXT)(const _EGLDriver *drv, _EGLDisplay *disp, EGLint max_formats, EGLint *formats, EGLint *num_formats); - EGLBoolean (*QueryDmaBufModifiersEXT) (_EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*QueryDmaBufModifiersEXT) (const _EGLDriver *drv, _EGLDisplay *disp, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); - void (*SetBlobCacheFuncsANDROID) (_EGLDriver *drv, _EGLDisplay *disp, + void (*SetBlobCacheFuncsANDROID) (const _EGLDriver *drv, _EGLDisplay *disp, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get); }; diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c index 2024271bee4..f70cbefa5e2 100644 --- a/src/egl/main/eglsurface.c +++ b/src/egl/main/eglsurface.c @@ -429,7 +429,7 @@ _eglInitSurface(_EGLSurface *surf, _EGLDisplay *disp, EGLint type, EGLBoolean -_eglQuerySurface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, +_eglQuerySurface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint attribute, EGLint *value) { switch (attribute) { @@ -593,7 +593,7 @@ _eglQuerySurface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, * Default fallback routine - drivers might override this. */ EGLBoolean -_eglSurfaceAttrib(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, +_eglSurfaceAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint attribute, EGLint value) { EGLint confval; @@ -718,7 +718,7 @@ _eglSurfaceAttrib(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLBoolean -_eglBindTexImage(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, +_eglBindTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, EGLint buffer) { EGLint texture_type = EGL_PBUFFER_BIT; @@ -748,7 +748,7 @@ _eglBindTexImage(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, } EGLBoolean -_eglReleaseTexImage(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +_eglReleaseTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer) { /* Just do basic error checking and return success/fail. @@ -785,7 +785,7 @@ _eglReleaseTexImage(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLBoolean -_eglSwapInterval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, +_eglSwapInterval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { return EGL_TRUE; diff --git a/src/egl/main/eglsurface.h b/src/egl/main/eglsurface.h index 903957a6eb3..c57159e6107 100644 --- a/src/egl/main/eglsurface.h +++ b/src/egl/main/eglsurface.h @@ -182,22 +182,22 @@ _eglInitSurface(_EGLSurface *surf, _EGLDisplay *disp, EGLint type, extern EGLBoolean -_eglQuerySurface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value); +_eglQuerySurface(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value); extern EGLBoolean -_eglSurfaceAttrib(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint value); +_eglSurfaceAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint value); extern EGLBoolean -_eglBindTexImage(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer); +_eglBindTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer); extern EGLBoolean -_eglReleaseTexImage(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer); +_eglReleaseTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer); extern EGLBoolean -_eglSwapInterval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval); +_eglSwapInterval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval); extern EGLBoolean _eglSurfaceHasMutableRenderBuffer(_EGLSurface *surf); diff --git a/src/egl/main/eglsync.c b/src/egl/main/eglsync.c index b903229ce68..d0926fce3bb 100644 --- a/src/egl/main/eglsync.c +++ b/src/egl/main/eglsync.c @@ -120,7 +120,7 @@ _eglInitSync(_EGLSync *sync, _EGLDisplay *disp, EGLenum type, EGLBoolean -_eglGetSyncAttrib(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, +_eglGetSyncAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, EGLint attribute, EGLAttrib *value) { switch (attribute) { diff --git a/src/egl/main/eglsync.h b/src/egl/main/eglsync.h index fdb122beb26..745d5417f2d 100644 --- a/src/egl/main/eglsync.h +++ b/src/egl/main/eglsync.h @@ -58,7 +58,7 @@ _eglInitSync(_EGLSync *sync, _EGLDisplay *disp, EGLenum type, extern EGLBoolean -_eglGetSyncAttrib(_EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, +_eglGetSyncAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync, EGLint attribute, EGLAttrib *value); -- 2.30.2