goto cleanup_surface;
dri2_surf->dri_drawable =
- (*dri2_dpy->dri2->createNewDrawable)(dri2_dpy->dri_screen, config,
- dri2_surf);
+ dri2_dpy->image_driver->createNewDrawable(dri2_dpy->dri_screen, config,
+ dri2_surf);
if (dri2_surf->dri_drawable == NULL) {
- _eglError(EGL_BAD_ALLOC, "dri2->createNewDrawable");
+ _eglError(EGL_BAD_ALLOC, "image->createNewDrawable");
goto cleanup_surface;
}
surfaceless_free_images(dri2_surf);
- (*dri2_dpy->core->destroyDrawable)(dri2_surf->dri_drawable);
+ dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable);
free(dri2_surf);
return EGL_TRUE;
}
static EGLBoolean
-surfaceless_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *dpy)
+surfaceless_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
{
+ assert(!surf || surf->Type == EGL_PBUFFER_BIT);
- struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
+ /* From the EGL 1.5 spec:
+ * If surface is a [...] pbuffer surface, eglSwapBuffers has no effect.
+ */
+ return EGL_TRUE;
+}
- unsigned int visuals[3][4] = {
- { 0xff0000, 0xff00, 0xff, 0xff000000 }, // ARGB8888
- { 0xff0000, 0xff00, 0xff, 0x0 }, // RGB888
- { 0xf800, 0x7e0, 0x1f, 0x0 }, // RGB565
+static EGLBoolean
+surfaceless_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *dpy)
+{
+ struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
+ 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;
- int count, i, j;
- unsigned int r, b, g, a;
-
- count = 0;
- for (i = 0; i < ARRAY_SIZE(visuals); i++) {
- for (j = 0; dri2_dpy->driver_configs[j]; j++) {
- const EGLint surface_type = EGL_PBUFFER_BIT;
+ 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;
- /* Determine driver supported masks */
- dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[j],
- __DRI_ATTRIB_RED_MASK, &r);
- dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[j],
- __DRI_ATTRIB_BLUE_MASK, &b);
- dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[j],
- __DRI_ATTRIB_GREEN_MASK, &g);
- dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[j],
- __DRI_ATTRIB_ALPHA_MASK, &a);
-
- /* Compare with advertised visuals */
- if (r ^ visuals[i][0] || g ^ visuals[i][1]
- || b ^ visuals[i][2] || a ^ visuals[i][3])
- continue;
-
- dri2_conf = dri2_add_config(dpy, dri2_dpy->driver_configs[j],
- count + 1, surface_type, NULL, visuals[i]);
-
- if (dri2_conf)
- count++;
+ dri2_conf = dri2_add_config(dpy, 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]++;
+ }
}
}
- if (!count)
- _eglLog(_EGL_DEBUG, "Can't create surfaceless visuals");
+ 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 (count != 0);
+ return (config_count != 0);
}
-static struct dri2_egl_display_vtbl dri2_surfaceless_display_vtbl = {
+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_interval = dri2_fallback_swap_interval,
+ .swap_buffers = surfaceless_swap_buffers,
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage,
.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 __DRIbuffer *
-surfaceless_get_buffers_with_format(__DRIdrawable * driDrawable,
- int *width, int *height,
- unsigned int *attachments, int count,
- int *out_count, void *loaderPrivate)
-{
- struct dri2_egl_surface *dri2_surf = loaderPrivate;
-
- dri2_surf->buffer_count = 1;
- if (width)
- *width = dri2_surf->base.Width;
- if (height)
- *height = dri2_surf->base.Height;
- *out_count = dri2_surf->buffer_count;
- return dri2_surf->buffers;
-}
-
-static const __DRIdri2LoaderExtension droid_dri2_loader_extension = {
- .base = { __DRI_DRI2_LOADER, 3 },
-
- .getBuffers = NULL,
- .flushFrontBuffer = droid_flush_front_buffer,
- .getBuffersWithFormat = droid_get_buffers_with_format,
-};
-
static const __DRIimageLoaderExtension image_loader_extension = {
.base = { __DRI_IMAGE_LOADER, 1 },
.getBuffers = surfaceless_image_get_buffers,
#define DRM_RENDER_DEV_NAME "%s/renderD%d"
+static const __DRIextension *image_loader_extensions[] = {
+ &image_loader_extension.base,
+ &image_lookup_extension.base,
+ &use_invalidate.base,
+ NULL,
+};
+
EGLBoolean
dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy;
const char* err;
- int i;
int driver_loaded = 0;
loader_set_logger(_eglLog);
if (!dri2_dpy)
return _eglError(EGL_BAD_ALLOC, "eglInitialize");
+ dri2_dpy->fd = -1;
disp->DriverData = (void *) dri2_dpy;
const int limit = 64;
const int base = 128;
- for (i = 0; i < limit; ++i) {
+ for (int i = 0; i < limit; ++i) {
char *card_path;
if (asprintf(&card_path, DRM_RENDER_DEV_NAME, DRM_DIR_NAME, base + i) < 0)
continue;
if (dri2_dpy->fd < 0)
continue;
- dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd, 0);
+ dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd);
if (dri2_dpy->driver_name) {
- if (dri2_load_driver(disp)) {
+ if (dri2_load_driver_dri3(disp)) {
driver_loaded = 1;
break;
}
free(dri2_dpy->driver_name);
+ dri2_dpy->driver_name = NULL;
}
close(dri2_dpy->fd);
+ dri2_dpy->fd = -1;
}
if (!driver_loaded) {
err = "DRI2: failed to load driver";
- goto cleanup_display;
+ goto cleanup;
}
- dri2_dpy->dri2_loader_extension.base.name = __DRI_DRI2_LOADER;
- dri2_dpy->dri2_loader_extension.base.version = 3;
- dri2_dpy->dri2_loader_extension.getBuffers = NULL;
- dri2_dpy->dri2_loader_extension.flushFrontBuffer =
- surfaceless_flush_front_buffer;
- dri2_dpy->dri2_loader_extension.getBuffersWithFormat =
- surfaceless_get_buffers_with_format;
-
- dri2_dpy->extensions[0] = &image_loader_extension.base;
- dri2_dpy->extensions[1] = &image_lookup_extension.base;
- dri2_dpy->extensions[2] = &use_invalidate.base;
- dri2_dpy->extensions[3] = NULL;
+ dri2_dpy->loader_extensions = image_loader_extensions;
if (!dri2_create_screen(disp)) {
err = "DRI2: failed to create screen";
- goto cleanup_driver;
+ goto cleanup;
+ }
+
+ if (!dri2_setup_extensions(disp)) {
+ err = "DRI2: failed to find required DRI extensions";
+ goto cleanup;
}
+ dri2_setup_screen(disp);
+
if (!surfaceless_add_configs_for_visuals(drv, disp)) {
err = "DRI2: failed to add configs";
- goto cleanup_screen;
+ goto cleanup;
}
- disp->Extensions.KHR_image_base = EGL_TRUE;
-
/* Fill vtbl last to prevent accidentally calling virtual function during
* initialization.
*/
return EGL_TRUE;
-cleanup_screen:
- dri2_dpy->core->destroyScreen(dri2_dpy->dri_screen);
-
-cleanup_driver:
- dlclose(dri2_dpy->driver);
- free(dri2_dpy->driver_name);
- close(dri2_dpy->fd);
-cleanup_display:
- free(dri2_dpy);
- disp->DriverData = NULL;
-
+cleanup:
+ dri2_display_destroy(disp);
return _eglError(EGL_NOT_INITIALIZED, err);
}
projects / mesa.git / blobdiff