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

drm/sw: just s/softpipe_create_screen/gallium_soft_create_screen/ 

This partially reverts commit f87a5f6499.
This commit is contained in:
George Sapountzis 2010-03-21 15:01:36 +02:00
parent f87a5f6499
commit 5d524cce9c
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gallium/winsys/drm/sw/sw_drm_api.c
View File

@ -24,11 +24,9 @@
**********************************************************/ **********************************************************/
#include "pipe/p_screen.h"
#include "util/u_memory.h" #include "util/u_memory.h"
#include "target-helpers/soft_screen.h" #include "target-helpers/soft_screen.h"
#include "state_tracker/sw_winsys.h"
#include "state_tracker/drm_api.h" #include "state_tracker/drm_api.h"
#include "wrapper_sw_winsys.h" #include "wrapper_sw_winsys.h"
#include "sw_drm_api.h" #include "sw_drm_api.h"
@ -43,6 +41,7 @@ struct sw_drm_api
{ {
struct drm_api base; struct drm_api base;
struct drm_api *api; struct drm_api *api;
struct sw_winsys *sw;
}; };
static INLINE struct sw_drm_api * static INLINE struct sw_drm_api *
@ -63,35 +62,14 @@ sw_drm_create_screen(struct drm_api *_api, int drmFD,
{ {
struct sw_drm_api *swapi = sw_drm_api(_api); struct sw_drm_api *swapi = sw_drm_api(_api);
struct drm_api *api = swapi->api; struct drm_api *api = swapi->api;
struct sw_winsys *sww = NULL; struct sw_winsys *sww;
struct pipe_screen *screen = NULL; struct pipe_screen *screen;
struct pipe_screen *soft_screen = NULL;
screen = api->create_screen(api, drmFD, arg); screen = api->create_screen(api, drmFD, arg);
if (screen == NULL)
goto fail;
sww = wrapper_sw_winsys_warp_pipe_screen(screen); sww = wrapper_sw_winsys_warp_pipe_screen(screen);
if (sww == NULL)
goto fail;
soft_screen = gallium_soft_create_screen(sww); return gallium_soft_create_screen(sww);
if (soft_screen == NULL)
goto fail;
return soft_screen;
fail:
if (soft_screen)
soft_screen->destroy(soft_screen);
if (sww)
sww->destroy(sww);
if (screen)
screen->destroy(screen);
return NULL;
} }
static void static void