dri2_dpy->image->destroyImage(dri2_surf->front);
dri2_surf->front = NULL;
}
+
+ free(dri2_surf->swrast_device_buffer);
+ dri2_surf->swrast_device_buffer = NULL;
}
static int
return NULL;
}
- if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list, false))
+ if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list,
+ false, NULL))
goto cleanup_surface;
config = dri2_get_dri_config(dri2_conf, type,
goto cleanup_surface;
}
- dri2_surf->dri_drawable =
- dri2_dpy->image_driver->createNewDrawable(dri2_dpy->dri_screen, config,
- dri2_surf);
- if (dri2_surf->dri_drawable == NULL) {
- _eglError(EGL_BAD_ALLOC, "image->createNewDrawable");
+ dri2_surf->visual = dri2_image_format_for_pbuffer_config(dri2_dpy, config);
+ if (dri2_surf->visual == __DRI_IMAGE_FORMAT_NONE)
goto cleanup_surface;
- }
- if (conf->RedSize == 5)
- dri2_surf->visual = __DRI_IMAGE_FORMAT_RGB565;
- else if (conf->AlphaSize == 0)
- dri2_surf->visual = __DRI_IMAGE_FORMAT_XRGB8888;
- else
- dri2_surf->visual = __DRI_IMAGE_FORMAT_ARGB8888;
+ if (!dri2_create_drawable(dri2_dpy, config, dri2_surf, dri2_surf))
+ goto cleanup_surface;
return &dri2_surf->base;
attrib_list);
}
-static EGLBoolean
-surfaceless_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp)
-{
- struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
- static const struct {
- const char *format_name;
- unsigned int rgba_masks[4];
- } visuals[] = {
- { "ARGB8888", { 0xff0000, 0xff00, 0xff, 0xff000000 } },
- { "RGB888", { 0xff0000, 0xff00, 0xff, 0x0 } },
- { "RGB565", { 0x00f800, 0x07e0, 0x1f, 0x0 } },
- };
- unsigned int format_count[ARRAY_SIZE(visuals)] = { 0 };
- unsigned int config_count = 0;
-
- for (unsigned i = 0; dri2_dpy->driver_configs[i] != NULL; i++) {
- for (unsigned j = 0; j < ARRAY_SIZE(visuals); j++) {
- struct dri2_egl_config *dri2_conf;
-
- dri2_conf = dri2_add_config(disp, dri2_dpy->driver_configs[i],
- config_count + 1, EGL_PBUFFER_BIT, NULL,
- visuals[j].rgba_masks);
-
- if (dri2_conf) {
- if (dri2_conf->base.ConfigID == config_count + 1)
- config_count++;
- format_count[j]++;
- }
- }
- }
-
- for (unsigned i = 0; i < ARRAY_SIZE(format_count); i++) {
- if (!format_count[i]) {
- _eglLog(_EGL_DEBUG, "No DRI config supports native format %s",
- visuals[i].format_name);
- }
- }
-
- return (config_count != 0);
-}
-
static const struct dri2_egl_display_vtbl dri2_surfaceless_display_vtbl = {
.create_pixmap_surface = dri2_fallback_create_pixmap_surface,
.create_pbuffer_surface = dri2_surfaceless_create_pbuffer_surface,
.destroy_surface = surfaceless_destroy_surface,
.create_image = dri2_create_image_khr,
.swap_buffers_region = dri2_fallback_swap_buffers_region,
- .set_damage_region = dri2_fallback_set_damage_region,
.post_sub_buffer = dri2_fallback_post_sub_buffer,
.copy_buffers = dri2_fallback_copy_buffers,
.query_buffer_age = dri2_fallback_query_buffer_age,
{
}
+static unsigned
+surfaceless_get_capability(void *loaderPrivate, enum dri_loader_cap cap)
+{
+ /* Note: loaderPrivate is _EGLDisplay* */
+ switch (cap) {
+ case DRI_LOADER_CAP_FP16:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
static const __DRIimageLoaderExtension image_loader_extension = {
- .base = { __DRI_IMAGE_LOADER, 1 },
+ .base = { __DRI_IMAGE_LOADER, 2 },
.getBuffers = surfaceless_image_get_buffers,
.flushFrontBuffer = surfaceless_flush_front_buffer,
+ .getCapability = surfaceless_get_capability,
};
-static const __DRIswrastLoaderExtension swrast_loader_extension = {
- .base = { __DRI_SWRAST_LOADER, 1 },
- .getDrawableInfo = NULL,
- .putImage = NULL,
- .getImage = NULL,
-};
-
-#define DRM_RENDER_DEV_NAME "%s/renderD%d"
-
static const __DRIextension *image_loader_extensions[] = {
&image_loader_extension.base,
&image_lookup_extension.base,
};
static const __DRIextension *swrast_loader_extensions[] = {
- &swrast_loader_extension.base,
+ &swrast_pbuffer_loader_extension.base,
&image_loader_extension.base,
&image_lookup_extension.base,
&use_invalidate.base,
static bool
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;
- const int limit = 64;
- const int base = 128;
- int fd;
- int i;
-
- /* Attempt to find DRM device. */
- for (i = 0; i < limit; ++i) {
- char *card_path;
- if (asprintf(&card_path, DRM_RENDER_DEV_NAME, DRM_DIR_NAME, base + i) < 0)
+ drmDevicePtr device, devices[MAX_DRM_DEVICES] = { NULL };
+ int i, num_devices;
+
+ num_devices = drmGetDevices2(0, devices, ARRAY_SIZE(devices));
+ if (num_devices < 0)
+ return false;
+
+ for (i = 0; i < num_devices; ++i) {
+ device = devices[i];
+
+ if (!(device->available_nodes & (1 << node_type)))
continue;
- fd = loader_open_device(card_path);
- free(card_path);
- if (fd < 0)
+ dri2_dpy->fd = loader_open_device(device->nodes[node_type]);
+ if (dri2_dpy->fd < 0)
continue;
- if (swrast) {
- dri2_dpy->driver_name = strdup("kms_swrast");
- dri2_dpy->loader_extensions = swrast_loader_extensions;
- } else {
- dri2_dpy->driver_name = loader_get_driver_for_fd(fd);
- dri2_dpy->loader_extensions = image_loader_extensions;
- }
- if (!dri2_dpy->driver_name) {
- close(fd);
+ disp->Device = _eglAddDevice(dri2_dpy->fd, swrast);
+ if (!disp->Device) {
+ close(dri2_dpy->fd);
+ dri2_dpy->fd = -1;
continue;
}
- dri2_dpy->fd = fd;
- if (dri2_load_driver_dri3(disp)) {
- _EGLDevice *dev = _eglAddDevice(dri2_dpy->fd, swrast);
- if (!dev) {
- dlclose(dri2_dpy->driver);
- _eglLog(_EGL_WARNING, "DRI2: failed to find EGLDevice");
- continue;
- }
- disp->Device = dev;
- return true;
+ char *driver_name = loader_get_driver_for_fd(dri2_dpy->fd);
+ if (swrast) {
+ /* Use kms swrast only with vgem / virtio_gpu.
+ * virtio-gpu fallbacks to software rendering when 3D features
+ * are unavailable since 6c5ab, and kms_swrast is more
+ * feature complete than swrast.
+ */
+ if (driver_name &&
+ (strcmp(driver_name, "vgem") == 0 ||
+ strcmp(driver_name, "virtio_gpu") == 0))
+ dri2_dpy->driver_name = strdup("kms_swrast");
+ free(driver_name);
+ } else {
+ /* Use the given hardware driver */
+ dri2_dpy->driver_name = driver_name;
}
- close(fd);
- dri2_dpy->fd = -1;
+ if (dri2_dpy->driver_name && dri2_load_driver_dri3(disp))
+ break;
+
free(dri2_dpy->driver_name);
dri2_dpy->driver_name = NULL;
- dri2_dpy->loader_extensions = NULL;
+ close(dri2_dpy->fd);
+ dri2_dpy->fd = -1;
}
+ drmFreeDevices(devices, num_devices);
- return false;
+ if (i == num_devices)
+ return false;
+
+ if (swrast)
+ dri2_dpy->loader_extensions = swrast_loader_extensions;
+ else
+ dri2_dpy->loader_extensions = image_loader_extensions;
+
+ return true;
}
static bool
}
dri2_setup_screen(disp);
+#ifdef HAVE_WAYLAND_PLATFORM
+ dri2_dpy->device_name = loader_get_device_name_for_fd(dri2_dpy->fd);
+#endif
+ dri2_set_WL_bind_wayland_display(drv, disp);
- if (!surfaceless_add_configs_for_visuals(drv, disp)) {
+ if (!dri2_add_pbuffer_configs_for_visuals(drv, disp)) {
err = "DRI2: failed to add configs";
goto cleanup;
}
projects / mesa.git / blobdiff