Module: Mesa Branch: master Commit: fbc6447c3d06d85a862df67aadb68333e2ea2431 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fbc6447c3d06d85a862df67aadb68333e2ea2431
Author: Emil Velikov <[email protected]> Date: Mon Nov 23 11:26:39 2015 +0000 target-hepers: add non inline sw helpers Feeling rather dirty copying the inline ones, yet we need the inline ones for swrast only targets like libgl-xlib, osmesa. Cc: "11.1" <[email protected]> Cc: Ilia Mirkin <[email protected]> Cc: Edward O'Callaghan <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Tested-by: Oded Gabbay <[email protected]> Tested-by: Nick Sarnie <[email protected]> --- src/gallium/auxiliary/target-helpers/sw_helper.h | 73 ++++++++++++++++++++ .../auxiliary/target-helpers/sw_helper_public.h | 10 +++ 2 files changed, 83 insertions(+) diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h new file mode 100644 index 0000000..ae5f3de --- /dev/null +++ b/src/gallium/auxiliary/target-helpers/sw_helper.h @@ -0,0 +1,73 @@ + +#ifndef SW_HELPER_H +#define SW_HELPER_H + +#include "pipe/p_compiler.h" +#include "util/u_debug.h" +#include "target-helpers/sw_helper_public.h" +#include "state_tracker/sw_winsys.h" + + +/* Helper function to choose and instantiate one of the software rasterizers: + * llvmpipe, softpipe. + */ + +#ifdef GALLIUM_SOFTPIPE +#include "softpipe/sp_public.h" +#endif + +#ifdef GALLIUM_LLVMPIPE +#include "llvmpipe/lp_public.h" +#endif + +#ifdef GALLIUM_VIRGL +#include "virgl/virgl_public.h" +#include "virgl/vtest/virgl_vtest_public.h" +#endif + +static inline struct pipe_screen * +sw_screen_create_named(struct sw_winsys *winsys, const char *driver) +{ + struct pipe_screen *screen = NULL; + +#if defined(GALLIUM_LLVMPIPE) + if (screen == NULL && strcmp(driver, "llvmpipe") == 0) + screen = llvmpipe_create_screen(winsys); +#endif + +#if defined(GALLIUM_VIRGL) + if (screen == NULL && strcmp(driver, "virpipe") == 0) { + struct virgl_winsys *vws; + vws = virgl_vtest_winsys_wrap(winsys); + screen = virgl_create_screen(vws); + } +#endif + +#if defined(GALLIUM_SOFTPIPE) + if (screen == NULL) + screen = softpipe_create_screen(winsys); +#endif + + return screen; +} + + +struct pipe_screen * +sw_screen_create(struct sw_winsys *winsys) +{ + const char *default_driver; + const char *driver; + +#if defined(GALLIUM_LLVMPIPE) + default_driver = "llvmpipe"; +#elif defined(GALLIUM_SOFTPIPE) + default_driver = "softpipe"; +#else + default_driver = ""; +#endif + + driver = debug_get_option("GALLIUM_DRIVER", default_driver); + return sw_screen_create_named(winsys, driver); +} + +#endif diff --git a/src/gallium/auxiliary/target-helpers/sw_helper_public.h b/src/gallium/auxiliary/target-helpers/sw_helper_public.h new file mode 100644 index 0000000..12b301b --- /dev/null +++ b/src/gallium/auxiliary/target-helpers/sw_helper_public.h @@ -0,0 +1,10 @@ +#ifndef _SW_HELPER_PUBLIC_H +#define _SW_HELPER_PUBLIC_H + +struct pipe_screen; +struct sw_winsys; + +struct pipe_screen * +sw_screen_create(struct sw_winsys *winsys); + +#endif /* _SW_HELPER_PUBLIC_H */ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
