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;
+ unsigned int red, green, blue, alpha;
+ 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_dpy->core->getConfigAttrib(config, __DRI_ATTRIB_RED_MASK, &red);
+ dri2_dpy->core->getConfigAttrib(config, __DRI_ATTRIB_GREEN_MASK, &green);
+ dri2_dpy->core->getConfigAttrib(config, __DRI_ATTRIB_BLUE_MASK, &blue);
+ dri2_dpy->core->getConfigAttrib(config, __DRI_ATTRIB_ALPHA_MASK, &alpha);
+
+ 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 (red != visual->rgba_masks[0] ||
+ green != visual->rgba_masks[1] ||
+ blue != visual->rgba_masks[2] ||
+ (alpha && visual->rgba_masks[3] && alpha != visual->rgba_masks[3])) {
+ 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))
+ if (!dri2_init_surface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf,
+ attrib_list, false))
goto cleanup_surf;
- switch (type) {
- case EGL_WINDOW_BIT:
- if (!window) {
- _eglError(EGL_BAD_NATIVE_WINDOW, "dri2_create_surface");
- goto cleanup_surf;
- }
+ config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
+ dri2_surf->base.GLColorspace);
- 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_drm_config_is_compatible(dri2_dpy, config, surface)) {
+ _eglError(EGL_BAD_MATCH, "EGL config not compatible with GBM format");
goto cleanup_surf;
}
- config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
- dri2_surf->base.GLColorspace);
+ 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_dpy->dri2) {
dri2_surf->dri_drawable =
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,
gbm_bo_destroy(dri2_surf->color_buffers[i].bo);
}
- for (unsigned 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;
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;
for (i = 0, j = 0; i < 2 * count; i += 2, j++) {
+ __DRIbuffer *local;
+
assert(attachments[i] < __DRI_BUFFER_COUNT);
assert(j < ARRAY_SIZE(dri2_surf->buffers));
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;
}
}
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 },
- };
-
- unsigned int format_count[ARRAY_SIZE(visuals)] = { 0 };
+ 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++) {
- unsigned int red, alpha;
+ unsigned int red, green, blue, 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_GREEN_MASK, &green);
+ dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[i],
+ __DRI_ATTRIB_BLUE_MASK, &blue);
dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[i],
__DRI_ATTRIB_ALPHA_MASK, &alpha);
- for (unsigned j = 0; j < ARRAY_SIZE(visuals); j++) {
+ 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_masks[0] != red ||
+ visuals[j].rgba_masks[1] != green ||
+ visuals[j].rgba_masks[2] != blue ||
+ visuals[j].rgba_masks[3] != alpha)
continue;
const EGLint attr_list[] = {
- EGL_NATIVE_VISUAL_ID, visuals[j].format,
+ EGL_NATIVE_VISUAL_ID, visuals[j].gbm_format,
EGL_NONE,
};
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);
+ visuals[i].gbm_format);
}
}
.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,
struct gbm_device *gbm;
const char *err;
+ /* Not supported yet */
+ if (disp->Options.ForceSoftware)
+ return EGL_FALSE;
+
loader_set_logger(_eglLog);
dri2_dpy = calloc(1, sizeof *dri2_dpy);
int n = snprintf(buf, sizeof(buf), DRM_DEV_NAME, DRM_DIR_NAME, 0);
if (n != -1 && n < sizeof(buf))
dri2_dpy->fd = loader_open_device(buf);
- if (dri2_dpy->fd < 0)
- dri2_dpy->fd = loader_open_device("/dev/dri/card0");
gbm = gbm_create_device(dri2_dpy->fd);
if (gbm == NULL) {
err = "DRI2: failed to create gbm device";
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);
+}