diff options
| author | George Sapountzis <[email protected]> | 2010-03-21 19:33:17 +0200 |
|---|---|---|
| committer | George Sapountzis <[email protected]> | 2010-03-21 19:33:17 +0200 |
| commit | 15c7fa460b93039a1676cc08a218101f92681190 (patch) | |
| tree | 2a4c4575736e8b51df0650154a2cce2640c777e1 /src/gallium/winsys | |
| parent | f9c0cbd1ad0c5948ea577edb5c76b0c45976a285 (diff) | |
Revert "gallium: add soft screen helper"
This reverts commit f87a5f6499f51f651c2a9f2d4682875b22926905.
Diffstat (limited to 'src/gallium/winsys')
| -rw-r--r-- | src/gallium/winsys/drm/sw/Makefile | 3 | ||||
| l--------- | src/gallium/winsys/drm/sw/soft_screen.c | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/sw/sw_drm_api.c | 32 |
3 files changed, 5 insertions, 31 deletions
diff --git a/src/gallium/winsys/drm/sw/Makefile b/src/gallium/winsys/drm/sw/Makefile index 12b20cbd454..5f3c3ec325d 100644 --- a/src/gallium/winsys/drm/sw/Makefile +++ b/src/gallium/winsys/drm/sw/Makefile @@ -4,12 +4,11 @@ include $(TOP)/configs/current LIBNAME = swdrm C_SOURCES = \ - soft_screen.c \ wrapper_sw_winsys.c \ sw_drm_api.c LIBRARY_INCLUDES = -LIBRARY_DEFINES = -DGALLIUM_SOFTPIPE +LIBRARY_DEFINES = include ../../../Makefile.template diff --git a/src/gallium/winsys/drm/sw/soft_screen.c b/src/gallium/winsys/drm/sw/soft_screen.c deleted file mode 120000 index 423597ba31f..00000000000 --- a/src/gallium/winsys/drm/sw/soft_screen.c +++ /dev/null @@ -1 +0,0 @@ -../../../auxiliary/target-helpers/soft_screen.c
\ No newline at end of file diff --git a/src/gallium/winsys/drm/sw/sw_drm_api.c b/src/gallium/winsys/drm/sw/sw_drm_api.c index ed3ce146eb1..9c5933c73af 100644 --- a/src/gallium/winsys/drm/sw/sw_drm_api.c +++ b/src/gallium/winsys/drm/sw/sw_drm_api.c @@ -24,11 +24,8 @@ **********************************************************/ -#include "pipe/p_screen.h" #include "util/u_memory.h" -#include "target-helpers/soft_screen.h" - -#include "state_tracker/sw_winsys.h" +#include "softpipe/sp_public.h" #include "state_tracker/drm_api.h" #include "wrapper_sw_winsys.h" #include "sw_drm_api.h" @@ -63,35 +60,14 @@ sw_drm_create_screen(struct drm_api *_api, int drmFD, { struct sw_drm_api *swapi = sw_drm_api(_api); struct drm_api *api = swapi->api; - struct sw_winsys *sww = NULL; - struct pipe_screen *screen = NULL; - struct pipe_screen *soft_screen = NULL; + struct sw_winsys *sww; + struct pipe_screen *screen; screen = api->create_screen(api, drmFD, arg); - if (screen == NULL) - goto fail; sww = wrapper_sw_winsys_warp_pipe_screen(screen); - if (sww == NULL) - goto fail; - - soft_screen = 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; + return softpipe_create_screen(sww); } static void |