From c1476044b5525994cc317c81a5cb9da60d58755d Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 10 Sep 2019 14:18:47 +0100 Subject: [PATCH] egl: consistently use dri2_egl_display() helper macro Signed-off-by: Eric Engestrom Reviewed-by: Frank Binns Reviewed-by: Emil Velikov Part-of: --- src/egl/drivers/dri2/platform_android.c | 2 +- src/egl/drivers/dri2/platform_device.c | 4 ++-- src/egl/drivers/dri2/platform_surfaceless.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index ecf0efc..8b3d26e 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1388,7 +1388,7 @@ static const __DRIextension *droid_image_loader_extensions[] = { static EGLBoolean droid_load_driver(_EGLDisplay *disp, bool swrast) { - struct dri2_egl_display *dri2_dpy = disp->DriverData; + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); const char *err; dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd); diff --git a/src/egl/drivers/dri2/platform_device.c b/src/egl/drivers/dri2/platform_device.c index d17aee5..90df073 100644 --- a/src/egl/drivers/dri2/platform_device.c +++ b/src/egl/drivers/dri2/platform_device.c @@ -252,7 +252,7 @@ device_get_fd(_EGLDisplay *disp, _EGLDevice *dev) static bool device_probe_device(_EGLDisplay *disp) { - struct dri2_egl_display *dri2_dpy = disp->DriverData; + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); bool request_software = env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false); if (request_software) @@ -298,7 +298,7 @@ err_name: static bool device_probe_device_sw(_EGLDisplay *disp) { - struct dri2_egl_display *dri2_dpy = disp->DriverData; + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); dri2_dpy->fd = -1; dri2_dpy->driver_name = strdup("swrast"); diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index f0d5e04..679099e 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -226,7 +226,7 @@ surfaceless_probe_device(_EGLDisplay *disp, bool swrast) { #define MAX_DRM_DEVICES 64 const unsigned node_type = swrast ? DRM_NODE_PRIMARY : DRM_NODE_RENDER; - struct dri2_egl_display *dri2_dpy = disp->DriverData; + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); drmDevicePtr device, devices[MAX_DRM_DEVICES] = { NULL }; int i, num_devices; @@ -292,7 +292,7 @@ surfaceless_probe_device(_EGLDisplay *disp, bool swrast) static bool surfaceless_probe_device_sw(_EGLDisplay *disp) { - struct dri2_egl_display *dri2_dpy = disp->DriverData; + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); dri2_dpy->fd = -1; disp->Device = _eglAddDevice(dri2_dpy->fd, true); -- 2.7.4