egl: inline _EGLAPI into _EGLDriver
_EGLDriver was an empty wrapper around _EGLAPI, so let's only keep one
of them. "driver" represents better what's being accessed, so that's the
one we're keeping.
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5987>
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
index ee92abe..52ab9dc 100644
--- a/src/egl/drivers/haiku/egl_haiku.cpp
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
@@ -73,7 +73,7 @@
/**
- * Called via eglCreateWindowSurface(), drv->API.CreateWindowSurface().
+ * Called via eglCreateWindowSurface(), drv->CreateWindowSurface().
*/
static _EGLSurface *
haiku_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
@@ -321,17 +321,17 @@
{
CALLED();
- driver->API.Initialize = init_haiku;
- driver->API.Terminate = haiku_terminate;
- driver->API.CreateContext = haiku_create_context;
- driver->API.DestroyContext = haiku_destroy_context;
- driver->API.MakeCurrent = haiku_make_current;
- driver->API.CreateWindowSurface = haiku_create_window_surface;
- driver->API.CreatePixmapSurface = haiku_create_pixmap_surface;
- driver->API.CreatePbufferSurface = haiku_create_pbuffer_surface;
- driver->API.DestroySurface = haiku_destroy_surface;
+ driver->Initialize = init_haiku;
+ driver->Terminate = haiku_terminate;
+ driver->CreateContext = haiku_create_context;
+ driver->DestroyContext = haiku_destroy_context;
+ driver->MakeCurrent = haiku_make_current;
+ driver->CreateWindowSurface = haiku_create_window_surface;
+ driver->CreatePixmapSurface = haiku_create_pixmap_surface;
+ driver->CreatePbufferSurface = haiku_create_pbuffer_surface;
+ driver->DestroySurface = haiku_destroy_surface;
- driver->API.SwapBuffers = haiku_swap_buffers;
+ driver->SwapBuffers = haiku_swap_buffers;
TRACE("API Calls defined\n");
}