};
static const __DRIuseInvalidateExtension dri2UseInvalidate = {
- { __DRI_USE_INVALIDATE, __DRI_USE_INVALIDATE_VERSION }
+ .base = { __DRI_USE_INVALIDATE, 1 }
};
_X_HIDDEN void
}
static const struct glx_context_vtable dri2_context_vtable = {
- dri2_destroy_context,
- dri2_bind_context,
- dri2_unbind_context,
- dri2_wait_gl,
- dri2_wait_x,
- DRI_glXUseXFont,
- dri2_bind_tex_image,
- dri2_release_tex_image,
- NULL, /* get_proc_address */
+ .destroy = dri2_destroy_context,
+ .bind = dri2_bind_context,
+ .unbind = dri2_unbind_context,
+ .wait_gl = dri2_wait_gl,
+ .wait_x = dri2_wait_x,
+ .use_x_font = DRI_glXUseXFont,
+ .bind_tex_image = dri2_bind_tex_image,
+ .release_tex_image = dri2_release_tex_image,
+ .get_proc_address = NULL,
};
static void
__glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context");
__glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_profile");
- if ((mask & (1 << __DRI_API_GLES2)) != 0)
- __glXEnableDirectExtension(&psc->base,
- "GLX_EXT_create_context_es2_profile");
+ if ((mask & ((1 << __DRI_API_GLES) |
+ (1 << __DRI_API_GLES2) |
+ (1 << __DRI_API_GLES3))) != 0) {
+ __glXEnableDirectExtension(&psc->base,
+ "GLX_EXT_create_context_es_profile");
+ __glXEnableDirectExtension(&psc->base,
+ "GLX_EXT_create_context_es2_profile");
+ }
}
for (i = 0; extensions[i]; i++) {
}
static const struct glx_screen_vtable dri2_screen_vtable = {
- dri2_create_context,
- dri2_create_context_attribs,
- dri2_query_renderer_integer,
- dri2_query_renderer_string,
+ .create_context = dri2_create_context,
+ .create_context_attribs = dri2_create_context_attribs,
+ .query_renderer_integer = dri2_query_renderer_integer,
+ .query_renderer_string = dri2_query_renderer_string,
};
static struct glx_screen *
return NULL;
}
-#ifdef O_CLOEXEC
- psc->fd = open(deviceName, O_RDWR | O_CLOEXEC);
- if (psc->fd == -1 && errno == EINVAL)
-#endif
- {
- psc->fd = open(deviceName, O_RDWR);
- if (psc->fd != -1)
- fcntl(psc->fd, F_SETFD, fcntl(psc->fd, F_GETFD) | FD_CLOEXEC);
- }
+ psc->fd = loader_open_device(deviceName);
if (psc->fd < 0) {
ErrorMessageF("failed to open drm device: %s\n", strerror(errno));
goto handle_error;
configs = driConvertConfigs(psc->core, psc->base.configs, driver_configs);
visuals = driConvertConfigs(psc->core, psc->base.visuals, driver_configs);
- if (!configs || !visuals)
+ if (!configs || !visuals) {
+ ErrorMessageF("No matching fbConfigs or visuals found\n");
goto handle_error;
+ }
glx_config_destroy_list(psc->base.configs);
psc->base.configs = configs;
__glXEnableDirectExtension(&psc->base, "GLX_OML_sync_control");
}
- /* DRI2 suports SubBuffer through DRI2CopyRegion, so it's always
+ /* DRI2 supports SubBuffer through DRI2CopyRegion, so it's always
* available.*/
psp->copySubBuffer = dri2CopySubBuffer;
__glXEnableDirectExtension(&psc->base, "GLX_MESA_copy_sub_buffer");
if (psc->show_fps_interval < 0)
psc->show_fps_interval = 0;
+ InfoMessageF("Using DRI2 for screen %d\n", screen);
+
return &psc->base;
handle_error: