Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6133>
static EGLBoolean
droid_load_driver(_EGLDisplay *disp, bool swrast)
{
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);
const char *err;
dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd);
static bool
device_probe_device(_EGLDisplay *disp)
{
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)
bool request_software = env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
if (request_software)
static bool
device_probe_device_sw(_EGLDisplay *disp)
{
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");
dri2_dpy->fd = -1;
dri2_dpy->driver_name = strdup("swrast");
{
#define MAX_DRM_DEVICES 64
const unsigned node_type = swrast ? DRM_NODE_PRIMARY : DRM_NODE_RENDER;
{
#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;
drmDevicePtr device, devices[MAX_DRM_DEVICES] = { NULL };
int i, num_devices;
static bool
surfaceless_probe_device_sw(_EGLDisplay *disp)
{
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);
dri2_dpy->fd = -1;
disp->Device = _eglAddDevice(dri2_dpy->fd, true);