diff options
author | George Sapountzis <gsapountzis@gmail.com> | 2010-03-26 18:44:39 +0200 |
---|---|---|
committer | George Sapountzis <gsapountzis@gmail.com> | 2010-03-26 18:44:39 +0200 |
commit | 5b07257fdbb5a93f432b8eaf3a41f39b26bdb1f3 (patch) | |
tree | 83a9e7a596607f8600017bc88e05028df3c56700 /src/gallium/state_trackers/dri/drm/dri2.c | |
parent | 1fbfc22d8560c9d900832147f504ff64c64358de (diff) |
st/dri: factor out common init_screen code
Diffstat (limited to 'src/gallium/state_trackers/dri/drm/dri2.c')
-rw-r--r-- | src/gallium/state_trackers/dri/drm/dri2.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c index 854801d1ea..c632f0fe4f 100644 --- a/src/gallium/state_trackers/dri/drm/dri2.c +++ b/src/gallium/state_trackers/dri/drm/dri2.c @@ -375,6 +375,7 @@ static const __DRIextension *dri_screen_extensions[] = { const __DRIconfig ** dri2_init_screen(__DRIscreen * sPriv) { + const __DRIconfig **configs; struct dri_screen *screen; struct drm_create_screen_arg arg; @@ -385,28 +386,22 @@ dri2_init_screen(__DRIscreen * sPriv) screen->api = drm_api_create(); screen->sPriv = sPriv; screen->fd = sPriv->fd; + sPriv->private = (void *)screen; sPriv->extensions = dri_screen_extensions; - arg.mode = DRM_CREATE_NORMAL; - screen->pipe_screen = screen->api->create_screen(screen->api, screen->fd, &arg); - if (!screen->pipe_screen) { - debug_printf("%s: failed to create pipe_screen\n", __FUNCTION__); - goto fail; - } + arg.mode = DRM_CREATE_NORMAL; - screen->smapi = dri_create_st_manager(screen); - if (!screen->smapi) + configs = dri_init_screen_helper(screen, &arg, 32); + if (!configs) goto fail; - driParseOptionInfo(&screen->optionCache, - __driConfigOptions, __driNConfigOptions); - screen->auto_fake_front = dri_with_format(sPriv); - return dri_fill_in_modes(screen, 32); + return configs; fail: - dri_destroy_screen(sPriv); + dri_destroy_screen_helper(screen); + FREE(screen); return NULL; } |