static struct gbm_bo *
lock_front_buffer(struct gbm_surface *_surf)
{
- struct gbm_dri_surface *surf = (struct gbm_dri_surface *) _surf;
+ struct gbm_dri_surface *surf = gbm_dri_surface(_surf);
struct dri2_egl_surface *dri2_surf = surf->dri_private;
- struct gbm_dri_device *device = (struct gbm_dri_device *) _surf->gbm;
+ struct gbm_dri_device *device = gbm_dri_device(_surf->gbm);
struct gbm_bo *bo;
if (dri2_surf->current == NULL) {
bo = dri2_surf->current->bo;
if (device->dri2) {
- dri2_surf->current->locked = 1;
+ dri2_surf->current->locked = true;
dri2_surf->current = NULL;
}
static void
release_buffer(struct gbm_surface *_surf, struct gbm_bo *bo)
{
- struct gbm_dri_surface *surf = (struct gbm_dri_surface *) _surf;
+ struct gbm_dri_surface *surf = gbm_dri_surface(_surf);
struct dri2_egl_surface *dri2_surf = surf->dri_private;
- unsigned i;
- for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
+ for (unsigned i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
if (dri2_surf->color_buffers[i].bo == bo) {
- dri2_surf->color_buffers[i].locked = 0;
+ dri2_surf->color_buffers[i].locked = false;
+ break;
}
}
}
static int
has_free_buffers(struct gbm_surface *_surf)
{
- struct gbm_dri_surface *surf = (struct gbm_dri_surface *) _surf;
+ struct gbm_dri_surface *surf = gbm_dri_surface(_surf);
struct dri2_egl_surface *dri2_surf = surf->dri_private;
- unsigned i;
- for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++)
+ for (unsigned i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++)
if (!dri2_surf->color_buffers[i].locked)
return 1;
return 0;
}
+static bool
+dri2_drm_config_is_compatible(struct dri2_egl_display *dri2_dpy,
+ const __DRIconfig *config,
+ struct gbm_surface *surface)
+{
+ const struct gbm_dri_visual *visual = NULL;
+ int shifts[4];
+ unsigned int sizes[4];
+ bool is_float;
+ int i;
+
+ /* Check that the EGLConfig being used to render to the surface is
+ * compatible with the surface format. Since mixing ARGB and XRGB of
+ * otherwise-compatible formats is relatively common, explicitly allow
+ * this.
+ */
+ dri2_get_shifts_and_sizes(dri2_dpy->core, config, shifts, sizes);
+
+ dri2_get_render_type_float(dri2_dpy->core, config, &is_float);
+
+ for (i = 0; i < dri2_dpy->gbm_dri->num_visuals; i++) {
+ visual = &dri2_dpy->gbm_dri->visual_table[i];
+ if (visual->gbm_format == surface->format)
+ break;
+ }
+
+ if (i == dri2_dpy->gbm_dri->num_visuals)
+ return false;
+
+ if (shifts[0] != visual->rgba_shifts.red ||
+ shifts[1] != visual->rgba_shifts.green ||
+ shifts[2] != visual->rgba_shifts.blue ||
+ (shifts[3] > -1 && visual->rgba_shifts.alpha > -1 &&
+ shifts[3] != visual->rgba_shifts.alpha) ||
+ sizes[0] != visual->rgba_sizes.red ||
+ sizes[1] != visual->rgba_sizes.green ||
+ sizes[2] != visual->rgba_sizes.blue ||
+ (sizes[3] > 0 && visual->rgba_sizes.alpha > 0 &&
+ sizes[3] != visual->rgba_sizes.alpha) ||
+ is_float != visual->is_float) {
+ return false;
+ }
+
+ return true;
+}
+
static _EGLSurface *
-dri2_drm_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
- _EGLConfig *conf, void *native_window,
- const EGLint *attrib_list)
+dri2_drm_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
+ _EGLConfig *conf, void *native_surface,
+ const EGLint *attrib_list)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
struct dri2_egl_surface *dri2_surf;
- struct gbm_surface *window = native_window;
+ struct gbm_surface *surface = native_surface;
struct gbm_dri_surface *surf;
const __DRIconfig *config;
return NULL;
}
- if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list))
- goto cleanup_surf;
-
- switch (type) {
- case EGL_WINDOW_BIT:
- if (!window) {
- _eglError(EGL_BAD_NATIVE_WINDOW, "dri2_create_surface");
- goto cleanup_surf;
- }
-
- surf = gbm_dri_surface(window);
- dri2_surf->gbm_surf = surf;
- dri2_surf->base.Width = surf->base.width;
- dri2_surf->base.Height = surf->base.height;
- surf->dri_private = dri2_surf;
- break;
- default:
+ if (!dri2_init_surface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf,
+ attrib_list, false, native_surface))
goto cleanup_surf;
- }
config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
dri2_surf->base.GLColorspace);
- if (dri2_dpy->dri2) {
- dri2_surf->dri_drawable =
- dri2_dpy->dri2->createNewDrawable(dri2_dpy->dri_screen, config,
- dri2_surf->gbm_surf);
+ if (!config) {
+ _eglError(EGL_BAD_MATCH, "Unsupported surfacetype/colorspace configuration");
+ goto cleanup_surf;
+ }
- } else {
- assert(dri2_dpy->swrast != NULL);
+ if (!dri2_drm_config_is_compatible(dri2_dpy, config, surface)) {
+ _eglError(EGL_BAD_MATCH, "EGL config not compatible with GBM format");
+ goto cleanup_surf;
+ }
- dri2_surf->dri_drawable =
- dri2_dpy->swrast->createNewDrawable(dri2_dpy->dri_screen, config,
- dri2_surf->gbm_surf);
+ surf = gbm_dri_surface(surface);
+ dri2_surf->gbm_surf = surf;
+ dri2_surf->base.Width = surf->base.width;
+ dri2_surf->base.Height = surf->base.height;
+ surf->dri_private = dri2_surf;
- }
- if (dri2_surf->dri_drawable == NULL) {
- _eglError(EGL_BAD_ALLOC, "createNewDrawable()");
+ if (!dri2_create_drawable(dri2_dpy, config, dri2_surf, dri2_surf->gbm_surf))
goto cleanup_surf;
- }
return &dri2_surf->base;
return NULL;
}
-static _EGLSurface *
-dri2_drm_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
- _EGLConfig *conf, void *native_window,
- const EGLint *attrib_list)
-{
- return dri2_drm_create_surface(drv, disp, EGL_WINDOW_BIT, conf,
- native_window, attrib_list);
-}
-
static _EGLSurface *
dri2_drm_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp,
_EGLConfig *conf, void *native_window,
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
- unsigned i;
dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable);
- for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
+ for (unsigned i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
if (dri2_surf->color_buffers[i].bo)
gbm_bo_destroy(dri2_surf->color_buffers[i].bo);
}
- for (i = 0; i < __DRI_BUFFER_COUNT; i++) {
- if (dri2_surf->dri_buffers[i])
- dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen,
- dri2_surf->dri_buffers[i]);
- }
+ dri2_egl_surface_free_local_buffers(dri2_surf);
+ dri2_fini_surface(surf);
free(surf);
return EGL_TRUE;
dri2_egl_display(dri2_surf->base.Resource.Display);
struct gbm_dri_surface *surf = dri2_surf->gbm_surf;
int age = 0;
- unsigned i;
if (dri2_surf->back == NULL) {
- for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
+ for (unsigned i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
if (!dri2_surf->color_buffers[i].locked &&
dri2_surf->color_buffers[i].age >= age) {
dri2_surf->back = &dri2_surf->color_buffers[i];
if (dri2_surf->back == NULL)
return -1;
- if (dri2_surf->back->bo == NULL)
- dri2_surf->back->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base.base,
- surf->base.width, surf->base.height,
- surf->base.format, surf->base.flags);
+ if (dri2_surf->back->bo == NULL) {
+ if (surf->base.modifiers)
+ dri2_surf->back->bo = gbm_bo_create_with_modifiers(&dri2_dpy->gbm_dri->base,
+ surf->base.width,
+ surf->base.height,
+ surf->base.format,
+ surf->base.modifiers,
+ surf->base.count);
+ else
+ dri2_surf->back->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base,
+ surf->base.width,
+ surf->base.height,
+ surf->base.format,
+ surf->base.flags);
+
+ }
if (dri2_surf->back->bo == NULL)
return -1;
}
if (dri2_surf->current->bo == NULL)
- dri2_surf->current->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base.base,
+ dri2_surf->current->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base,
surf->base.width, surf->base.height,
surf->base.format, surf->base.flags);
if (dri2_surf->current->bo == NULL)
struct gbm_dri_bo *bo;
int name, pitch;
- bo = (struct gbm_dri_bo *) dri2_surf->back->bo;
+ bo = gbm_dri_bo(dri2_surf->back->bo);
dri2_dpy->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_NAME, &name);
dri2_dpy->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_STRIDE, &pitch);
buffer->flags = 0;
}
-static int
-get_aux_bo(struct dri2_egl_surface *dri2_surf,
- unsigned int attachment, unsigned int format, __DRIbuffer *buffer)
-{
- struct dri2_egl_display *dri2_dpy =
- dri2_egl_display(dri2_surf->base.Resource.Display);
- __DRIbuffer *b = dri2_surf->dri_buffers[attachment];
-
- if (b == NULL) {
- b = dri2_dpy->dri2->allocateBuffer(dri2_dpy->dri_screen,
- attachment, format,
- dri2_surf->base.Width,
- dri2_surf->base.Height);
- dri2_surf->dri_buffers[attachment] = b;
- }
- if (b == NULL)
- return -1;
-
- memcpy(buffer, b, sizeof *buffer);
-
- return 0;
-}
-
static __DRIbuffer *
dri2_drm_get_buffers_with_format(__DRIdrawable *driDrawable,
- int *width, int *height,
- unsigned int *attachments, int count,
- int *out_count, void *loaderPrivate)
+ int *width, int *height,
+ unsigned int *attachments, int count,
+ int *out_count, void *loaderPrivate)
{
struct dri2_egl_surface *dri2_surf = loaderPrivate;
int i, j;
- dri2_surf->buffer_count = 0;
for (i = 0, j = 0; i < 2 * count; i += 2, j++) {
+ __DRIbuffer *local;
+
assert(attachments[i] < __DRI_BUFFER_COUNT);
- assert(dri2_surf->buffer_count < 5);
+ assert(j < ARRAY_SIZE(dri2_surf->buffers));
switch (attachments[i]) {
case __DRI_BUFFER_BACK_LEFT:
back_bo_to_dri_buffer(dri2_surf, &dri2_surf->buffers[j]);
break;
default:
- if (get_aux_bo(dri2_surf, attachments[i], attachments[i + 1],
- &dri2_surf->buffers[j]) < 0) {
- _eglError(EGL_BAD_ALLOC, "failed to allocate aux buffer");
+ local = dri2_egl_surface_alloc_local_buffer(dri2_surf, attachments[i],
+ attachments[i + 1]);
+
+ if (!local) {
+ _eglError(EGL_BAD_ALLOC, "failed to allocate local buffer");
return NULL;
}
+ dri2_surf->buffers[j] = *local;
break;
}
}
unsigned int *attachments_with_format;
__DRIbuffer *buffer;
const unsigned int format = 32;
- int i;
attachments_with_format = calloc(count, 2 * sizeof(unsigned int));
if (!attachments_with_format) {
return NULL;
}
- for (i = 0; i < count; ++i) {
+ for (int i = 0; i < count; ++i) {
attachments_with_format[2*i] = attachments[i];
attachments_with_format[2*i + 1] = format;
}
if (get_back_bo(dri2_surf) < 0)
return 0;
- bo = (struct gbm_dri_bo *) dri2_surf->back->bo;
+ bo = gbm_dri_bo(dri2_surf->back->bo);
buffers->image_mask = __DRI_IMAGE_BUFFER_BACK;
buffers->back = bo->image;
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
- unsigned i;
- if (dri2_dpy->swrast) {
+ if (!dri2_dpy->flush) {
dri2_dpy->core->swapBuffers(dri2_surf->dri_drawable);
- } else {
- if (dri2_surf->base.Type == EGL_WINDOW_BIT) {
- if (dri2_surf->current)
- _eglError(EGL_BAD_SURFACE, "dri2_swap_buffers");
- for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++)
- if (dri2_surf->color_buffers[i].age > 0)
- dri2_surf->color_buffers[i].age++;
-
- /* Make sure we have a back buffer in case we're swapping without
- * ever rendering. */
- if (get_back_bo(dri2_surf) < 0) {
- _eglError(EGL_BAD_ALLOC, "dri2_swap_buffers");
- return EGL_FALSE;
- }
+ return EGL_TRUE;
+ }
- dri2_surf->current = dri2_surf->back;
- dri2_surf->current->age = 1;
- dri2_surf->back = NULL;
- }
+ if (dri2_surf->current)
+ _eglError(EGL_BAD_SURFACE, "dri2_swap_buffers");
+ for (unsigned i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++)
+ if (dri2_surf->color_buffers[i].age > 0)
+ dri2_surf->color_buffers[i].age++;
- dri2_flush_drawable_for_swapbuffers(disp, draw);
- dri2_dpy->flush->invalidate(dri2_surf->dri_drawable);
- }
+ /* Make sure we have a back buffer in case we're swapping without
+ * ever rendering. */
+ if (get_back_bo(dri2_surf) < 0)
+ return _eglError(EGL_BAD_ALLOC, "dri2_swap_buffers");
+
+ dri2_surf->current = dri2_surf->back;
+ dri2_surf->current->age = 1;
+ dri2_surf->back = NULL;
+
+ dri2_flush_drawable_for_swapbuffers(disp, draw);
+ dri2_dpy->flush->invalidate(dri2_surf->dri_drawable);
return EGL_TRUE;
}
if (get_back_bo(dri2_surf) < 0) {
_eglError(EGL_BAD_ALLOC, "dri2_query_buffer_age");
- return 0;
+ return -1;
}
return dri2_surf->back->age;
return NULL;
}
- if (!_eglInitImage(&dri2_img->base, disp)) {
- free(dri2_img);
- return NULL;
- }
+ _eglInitImage(&dri2_img->base, disp);
dri2_img->dri_image = dri2_dpy->image->dupImage(dri_bo->image, dri2_img);
if (dri2_img->dri_image == NULL) {
void *loaderPrivate)
{
struct dri2_egl_surface *dri2_surf = loaderPrivate;
- int internal_stride, i;
+ int internal_stride;
struct gbm_dri_bo *bo;
+ uint32_t bpp;
+ int x_bytes, width_bytes;
+ char *src, *dst;
if (op != __DRI_SWRAST_IMAGE_OP_DRAW &&
op != __DRI_SWRAST_IMAGE_OP_SWAP)
return;
bo = gbm_dri_bo(dri2_surf->current->bo);
+
+ bpp = gbm_bo_get_bpp(&bo->base);
+ if (bpp == 0)
+ return;
+
+ x_bytes = x * (bpp >> 3);
+ width_bytes = width * (bpp >> 3);
+
if (gbm_dri_bo_map_dumb(bo) == NULL)
return;
- internal_stride = bo->base.base.stride;
+ internal_stride = bo->base.stride;
+
+ dst = bo->map + x_bytes + (y * internal_stride);
+ src = data;
- for (i = 0; i < height; i++) {
- memcpy(bo->map + (x + i) * internal_stride + y,
- data + i * stride, stride);
+ for (int i = 0; i < height; i++) {
+ memcpy(dst, src, width_bytes);
+ dst += internal_stride;
+ src += stride;
}
gbm_dri_bo_unmap_dumb(bo);
void *loaderPrivate)
{
struct dri2_egl_surface *dri2_surf = loaderPrivate;
- int internal_stride, stride, i;
+ int internal_stride, stride;
struct gbm_dri_bo *bo;
+ uint32_t bpp;
+ int x_bytes, width_bytes;
+ char *src, *dst;
if (get_swrast_front_bo(dri2_surf) < 0)
return;
bo = gbm_dri_bo(dri2_surf->current->bo);
+
+ bpp = gbm_bo_get_bpp(&bo->base);
+ if (bpp == 0)
+ return;
+
+ x_bytes = x * (bpp >> 3);
+ width_bytes = width * (bpp >> 3);
+
+ internal_stride = bo->base.stride;
+ stride = width_bytes;
+
if (gbm_dri_bo_map_dumb(bo) == NULL)
return;
- internal_stride = bo->base.base.stride;
- stride = width * 4;
+ dst = data;
+ src = bo->map + x_bytes + (y * internal_stride);
- for (i = 0; i < height; i++) {
- memcpy(data + i * stride,
- bo->map + (x + i) * internal_stride + y, stride);
+ for (int i = 0; i < height; i++) {
+ memcpy(dst, src, width_bytes);
+ dst += stride;
+ src += internal_stride;
}
gbm_dri_bo_unmap_dumb(bo);
drm_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
- static const struct {
- int format;
- unsigned int red_mask;
- unsigned int alpha_mask;
- } visuals[] = {
- { GBM_FORMAT_XRGB2101010, 0x3ff00000, 0x00000000 },
- { GBM_FORMAT_ARGB2101010, 0x3ff00000, 0xc0000000 },
- { GBM_FORMAT_XRGB8888, 0x00ff0000, 0x00000000 },
- { GBM_FORMAT_ARGB8888, 0x00ff0000, 0xff000000 },
- { GBM_FORMAT_RGB565, 0x0000f800, 0x00000000 },
- };
- EGLint attr_list[] = {
- EGL_NATIVE_VISUAL_ID, 0,
- EGL_NONE,
- };
- unsigned int format_count[ARRAY_SIZE(visuals)] = { 0 };
- unsigned int count, i, j;
-
- count = 0;
- for (i = 0; dri2_dpy->driver_configs[i]; i++) {
- unsigned int red, alpha;
-
- dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[i],
- __DRI_ATTRIB_RED_MASK, &red);
- dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[i],
- __DRI_ATTRIB_ALPHA_MASK, &alpha);
-
- for (j = 0; j < ARRAY_SIZE(visuals); j++) {
+ const struct gbm_dri_visual *visuals = dri2_dpy->gbm_dri->visual_table;
+ int num_visuals = dri2_dpy->gbm_dri->num_visuals;
+ unsigned int format_count[num_visuals];
+ unsigned int config_count = 0;
+
+ memset(format_count, 0, num_visuals * sizeof(unsigned int));
+
+ for (unsigned i = 0; dri2_dpy->driver_configs[i]; i++) {
+ const __DRIconfig *config = dri2_dpy->driver_configs[i];
+ int shifts[4];
+ unsigned int sizes[4];
+ bool is_float;
+
+ dri2_get_shifts_and_sizes(dri2_dpy->core, config, shifts, sizes);
+
+ dri2_get_render_type_float(dri2_dpy->core, config, &is_float);
+
+ for (unsigned j = 0; j < num_visuals; j++) {
struct dri2_egl_config *dri2_conf;
- if (visuals[j].red_mask != red || visuals[j].alpha_mask != alpha)
+ if (visuals[j].rgba_shifts.red != shifts[0] ||
+ visuals[j].rgba_shifts.green != shifts[1] ||
+ visuals[j].rgba_shifts.blue != shifts[2] ||
+ visuals[j].rgba_shifts.alpha != shifts[3] ||
+ visuals[j].rgba_sizes.red != sizes[0] ||
+ visuals[j].rgba_sizes.green != sizes[1] ||
+ visuals[j].rgba_sizes.blue != sizes[2] ||
+ visuals[j].rgba_sizes.alpha != sizes[3] ||
+ visuals[j].is_float != is_float)
continue;
- attr_list[1] = visuals[j].format;
+ const EGLint attr_list[] = {
+ EGL_NATIVE_VISUAL_ID, visuals[j].gbm_format,
+ EGL_NONE,
+ };
dri2_conf = dri2_add_config(disp, dri2_dpy->driver_configs[i],
- count + 1, EGL_WINDOW_BIT, attr_list, NULL);
+ config_count + 1, EGL_WINDOW_BIT, attr_list, NULL, NULL);
if (dri2_conf) {
- count++;
+ if (dri2_conf->base.ConfigID == config_count + 1)
+ config_count++;
format_count[j]++;
}
}
}
- for (i = 0; i < ARRAY_SIZE(format_count); i++) {
+ for (unsigned i = 0; i < ARRAY_SIZE(format_count); i++) {
if (!format_count[i]) {
- _eglLog(_EGL_DEBUG, "No DRI config supports native format 0x%x",
- visuals[i].format);
+ struct gbm_format_name_desc desc;
+ _eglLog(_EGL_DEBUG, "No DRI config supports native format %s",
+ gbm_format_get_name(visuals[i].gbm_format, &desc));
}
}
- return (count != 0);
+ return (config_count != 0);
}
-static struct dri2_egl_display_vtbl dri2_drm_display_vtbl = {
+static const struct dri2_egl_display_vtbl dri2_drm_display_vtbl = {
.authenticate = dri2_drm_authenticate,
.create_window_surface = dri2_drm_create_window_surface,
.create_pixmap_surface = dri2_drm_create_pixmap_surface,
.create_pbuffer_surface = dri2_fallback_create_pbuffer_surface,
.destroy_surface = dri2_drm_destroy_surface,
.create_image = dri2_drm_create_image_khr,
- .swap_interval = dri2_fallback_swap_interval,
.swap_buffers = dri2_drm_swap_buffers,
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage,
.swap_buffers_region = dri2_fallback_swap_buffers_region,
EGLBoolean
dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
{
+ _EGLDevice *dev;
struct dri2_egl_display *dri2_dpy;
struct gbm_device *gbm;
const char *err;
- int fd = -1;
- loader_set_logger(_eglLog);
+ /* Not supported yet */
+ if (disp->Options.ForceSoftware)
+ return EGL_FALSE;
dri2_dpy = calloc(1, sizeof *dri2_dpy);
if (!dri2_dpy)
return _eglError(EGL_BAD_ALLOC, "eglInitialize");
+ dri2_dpy->fd = -1;
disp->DriverData = (void *) dri2_dpy;
gbm = disp->PlatformDisplay;
char buf[64];
int n = snprintf(buf, sizeof(buf), DRM_DEV_NAME, DRM_DIR_NAME, 0);
if (n != -1 && n < sizeof(buf))
- fd = loader_open_device(buf);
- if (fd < 0)
- fd = loader_open_device("/dev/dri/card0");
- dri2_dpy->own_device = 1;
- gbm = gbm_create_device(fd);
+ dri2_dpy->fd = loader_open_device(buf);
+ gbm = gbm_create_device(dri2_dpy->fd);
if (gbm == NULL) {
err = "DRI2: failed to create gbm device";
goto cleanup;
}
+ dri2_dpy->own_device = true;
} else {
- fd = fcntl(gbm_device_get_fd(gbm), F_DUPFD_CLOEXEC, 3);
- if (fd < 0) {
+ dri2_dpy->fd = fcntl(gbm_device_get_fd(gbm), F_DUPFD_CLOEXEC, 3);
+ if (dri2_dpy->fd < 0) {
err = "DRI2: failed to fcntl() existing gbm device";
goto cleanup;
}
}
+ dri2_dpy->gbm_dri = gbm_dri_device(gbm);
if (strcmp(gbm_device_get_backend_name(gbm), "drm") != 0) {
err = "DRI2: gbm device using incorrect/incompatible backend";
goto cleanup;
}
- dri2_dpy->gbm_dri = gbm_dri_device(gbm);
- if (dri2_dpy->gbm_dri->base.type != GBM_DRM_DRIVER_TYPE_DRI) {
- err = "DRI2: gbm device using incorrect/incompatible type";
+ dev = _eglAddDevice(dri2_dpy->fd, false);
+ if (!dev) {
+ err = "DRI2: failed to find EGLDevice";
goto cleanup;
}
- dri2_dpy->fd = fd;
- dri2_dpy->driver_name = strdup(dri2_dpy->gbm_dri->base.driver_name);
+ disp->Device = dev;
+
+ dri2_dpy->driver_name = strdup(dri2_dpy->gbm_dri->driver_name);
+ dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER;
+
+ /* render nodes cannot use Gem names, and thus do not support
+ * the __DRI_DRI2_LOADER extension */
+ if (!dri2_dpy->is_render_node) {
+ if (!dri2_load_driver(disp)) {
+ err = "DRI2: failed to load driver";
+ goto cleanup;
+ }
+ } else {
+ if (!dri2_load_driver_dri3(disp)) {
+ err = "DRI3: failed to load driver";
+ goto cleanup;
+ }
+ }
dri2_dpy->dri_screen = dri2_dpy->gbm_dri->screen;
dri2_dpy->core = dri2_dpy->gbm_dri->core;
dri2_dpy->dri2 = dri2_dpy->gbm_dri->dri2;
- dri2_dpy->fence = dri2_dpy->gbm_dri->fence;
- dri2_dpy->image = dri2_dpy->gbm_dri->image;
- dri2_dpy->flush = dri2_dpy->gbm_dri->flush;
dri2_dpy->swrast = dri2_dpy->gbm_dri->swrast;
dri2_dpy->driver_configs = dri2_dpy->gbm_dri->driver_configs;
- dri2_dpy->interop = dri2_dpy->gbm_dri->interop;
dri2_dpy->gbm_dri->lookup_image = dri2_lookup_egl_image;
dri2_dpy->gbm_dri->lookup_user_data = disp;
dri2_dpy->gbm_dri->swrast_put_image2 = swrast_put_image2;
dri2_dpy->gbm_dri->swrast_get_image = swrast_get_image;
- dri2_dpy->gbm_dri->base.base.surface_lock_front_buffer = lock_front_buffer;
- dri2_dpy->gbm_dri->base.base.surface_release_buffer = release_buffer;
- dri2_dpy->gbm_dri->base.base.surface_has_free_buffers = has_free_buffers;
+ dri2_dpy->gbm_dri->base.surface_lock_front_buffer = lock_front_buffer;
+ dri2_dpy->gbm_dri->base.surface_release_buffer = release_buffer;
+ dri2_dpy->gbm_dri->base.surface_has_free_buffers = has_free_buffers;
+
+ if (!dri2_setup_extensions(disp)) {
+ err = "DRI2: failed to find required DRI extensions";
+ goto cleanup;
+ }
dri2_setup_screen(disp);
return EGL_TRUE;
cleanup:
- if (fd >= 0)
- close(fd);
-
- free(dri2_dpy);
- disp->DriverData = NULL;
+ dri2_display_destroy(disp);
return _eglError(EGL_NOT_INITIALIZED, err);
}
+
+void
+dri2_teardown_drm(struct dri2_egl_display *dri2_dpy)
+{
+ if (dri2_dpy->own_device)
+ gbm_device_destroy(&dri2_dpy->gbm_dri->base);
+}
projects / mesa.git / blobdiff