AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/dri: Refactor init code a bit

Browse Source 
Reviewed-by: George Sapountzis <gsapountzis@gmail.com>
This commit is contained in:
Jakob Bornecrantz
2010-04-14 21:28:12 +01:00
parent 6c954dd128
commit 39c81dada0
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/dri/common/dri_screen.c
+2 -2
View File
@@ -327,10 +327,10 @@ dri_destroy_screen(__DRIscreen * sPriv)
const __DRIconfig **
dri_init_screen_helper(struct dri_screen *screen,
struct drm_create_screen_arg *arg,
struct pipe_screen *pscreen,
unsigned pixel_bits)
{
screen->pipe_screen = screen->api->create_screen(screen->api, screen->fd, arg);
screen->pipe_screen = pscreen;
if (!screen->pipe_screen) {
debug_printf("%s: failed to create pipe_screen\n", __FUNCTION__);
return NULL;
src/gallium/state_trackers/dri/common/dri_screen.h
+1 -1
View File
@@ -104,7 +104,7 @@ dri_fill_st_visual(struct st_visual *stvis, struct dri_screen *screen,
const __DRIconfig **
dri_init_screen_helper(struct dri_screen *screen,
struct drm_create_screen_arg *arg,
struct pipe_screen *pscreen,
unsigned pixel_bits);
void
src/gallium/state_trackers/dri/drm/dri1.c
+5 -1
View File
@@ -469,6 +469,7 @@ const __DRIconfig **
dri1_init_screen(__DRIscreen * sPriv)
{
const __DRIconfig **configs;
struct pipe_screen *pscreen;
struct dri_screen *screen;
struct dri1_create_screen_arg arg;
@@ -500,7 +501,10 @@ dri1_init_screen(__DRIscreen * sPriv)
* using.
*/
configs = dri_init_screen_helper(screen, &arg.base, sPriv->fbBPP);
pscreen = screen->api->create_screen(screen->api, screen->fd, &arg.base);
/* dri_init_screen_helper checks pscreen for us */
configs = dri_init_screen_helper(screen, pscreen, sPriv->fbBPP);
if (!configs)
goto fail;
src/gallium/state_trackers/dri/drm/dri2.c
+4 -3
View File
@@ -499,7 +499,7 @@ dri2_init_screen(__DRIscreen * sPriv)
{
const __DRIconfig **configs;
struct dri_screen *screen;
struct drm_create_screen_arg arg;
struct pipe_screen *pscreen;
screen = CALLOC_STRUCT(dri_screen);
if (!screen)
@@ -512,9 +512,10 @@ dri2_init_screen(__DRIscreen * sPriv)
sPriv->private = (void *)screen;
sPriv->extensions = dri_screen_extensions;
arg.mode = DRM_CREATE_NORMAL;
pscreen = screen->api->create_screen(screen->api, screen->fd, NULL);
/* dri_init_screen_helper checks pscreen for us */
configs = dri_init_screen_helper(screen, &arg, 32);
configs = dri_init_screen_helper(screen, pscreen, 32);
if (!configs)
goto fail;
src/gallium/state_trackers/dri/sw/drisw.c
+6 -2
View File
@@ -261,13 +261,14 @@ drisw_init_screen(__DRIscreen * sPriv)
{
const __DRIconfig **configs;
struct dri_screen *screen;
struct pipe_screen *pscreen;
struct drisw_create_screen_arg arg;
screen = CALLOC_STRUCT(dri_screen);
if (!screen)
return NULL;
screen->api = drm_api_create();
screen->api = NULL; /* not needed */
screen->sPriv = sPriv;
screen->fd = -1;
@@ -277,7 +278,10 @@ drisw_init_screen(__DRIscreen * sPriv)
arg.base.mode = DRM_CREATE_DRISW;
arg.lf = &drisw_lf;
configs = dri_init_screen_helper(screen, &arg.base, 32);
pscreen = screen->api->create_screen(screen->api, screen->fd, &arg.base);
/* dri_init_screen_helper checks pscreen for us */
configs = dri_init_screen_helper(screen, pscreen, 32);
if (!configs)
goto fail;