diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-10-06 23:04:22 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-11-21 12:52:17 +0000 |
| commit | f9c9471b768593d61c486f7a9c0dac52e22fff65 (patch) | |
| tree | fb732abe9b641c1c1a63c2e94b1b0b3a02193a2b | |
| parent | 6bcd5f0d02fff2db0c330af7d139d7a60b59e0e2 (diff) | |
targets/nine: use the existing sw_screen_wrap() over our custom version
Cc: Axel Davy <axel.davy@ens.fr>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
| -rw-r--r-- | src/gallium/auxiliary/target-helpers/inline_sw_helper.h | 27 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/drm.c | 4 |
3 files changed, 2 insertions, 30 deletions
diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h index f3693fb1f39..7e10c28f542 100644 --- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h @@ -104,33 +104,6 @@ drisw_create_screen(struct drisw_loader_funcs *lf) } #endif // DRI_TARGET -#if defined(NINE_TARGET) -#include "sw/wrapper/wrapper_sw_winsys.h" -#include "target-helpers/inline_debug_helper.h" - -extern struct pipe_screen *ninesw_create_screen(struct pipe_screen *screen); - -inline struct pipe_screen * -ninesw_create_screen(struct pipe_screen *pscreen) -{ - struct sw_winsys *winsys = NULL; - struct pipe_screen *screen = NULL; - - winsys = wrapper_sw_winsys_wrap_pipe_screen(pscreen); - if (winsys == NULL) - return NULL; - - screen = sw_screen_create(winsys); - if (screen == NULL) { - winsys->destroy(winsys); - return NULL; - } - - screen = debug_screen_wrap(screen); - return screen; -} -#endif // NINE_TARGET - #endif // GALLIUM_SOFTPIPE diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index d36a8b80b74..7ec5c834419 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -36,7 +36,6 @@ AM_CFLAGS = \ if HAVE_GALLIUM_STATIC_TARGETS AM_CPPFLAGS = \ - -DNINE_TARGET \ -DGALLIUM_STATIC_TARGETS=1 else diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c index fabc820f268..89789fa3da9 100644 --- a/src/gallium/targets/d3dadapter9/drm.c +++ b/src/gallium/targets/d3dadapter9/drm.c @@ -30,7 +30,7 @@ #include "pipe/p_state.h" #include "target-helpers/inline_drm_helper.h" -#include "target-helpers/inline_sw_helper.h" +#include "target-helpers/inline_wrapper_sw_helper.h" #include "state_tracker/drm_driver.h" #include "d3dadapter/d3dadapter9.h" @@ -309,7 +309,7 @@ drm_create_adapter( int fd, driDestroyOptionInfo(&defaultInitOptions); #if GALLIUM_STATIC_TARGETS - ctx->base.ref = ninesw_create_screen(ctx->base.hal); + ctx->base.ref = sw_screen_wrap(ctx->base.hal); #else /* wrap it to create a software screen that can share resources */ if (pipe_loader_sw_probe_wrapped(&ctx->swdev, ctx->base.hal)) { |