diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2010-12-15 12:13:54 +0100 |
---|---|---|
committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-12-16 08:53:26 +0100 |
commit | f75549a9d8860c3711615483fa64c7cc0f2e87b3 (patch) | |
tree | 07fec7aaed102ed79b1f3d490b0359b671e46ae0 /src/gallium/targets | |
parent | 0967d77a9a2a2d1e178e2b747747ba9f9caee3c2 (diff) |
svga: Add Galahad and Softpipe to scons build
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/dri-vmwgfx/SConscript | 6 | ||||
-rw-r--r-- | src/gallium/targets/dri-vmwgfx/target.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/targets/dri-vmwgfx/SConscript b/src/gallium/targets/dri-vmwgfx/SConscript index 7888e4f2c8..e05ced9867 100644 --- a/src/gallium/targets/dri-vmwgfx/SConscript +++ b/src/gallium/targets/dri-vmwgfx/SConscript @@ -2,14 +2,14 @@ Import('*') env = drienv.Clone() -env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE']) +if True: + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [trace, rbug, galahad, softpipe, ws_wrapper]) env.Prepend(LIBS = [ st_dri, svgadrm, svga, - trace, - rbug, mesa, glsl, gallium, diff --git a/src/gallium/targets/dri-vmwgfx/target.c b/src/gallium/targets/dri-vmwgfx/target.c index 15089d6db2..1362851d6b 100644 --- a/src/gallium/targets/dri-vmwgfx/target.c +++ b/src/gallium/targets/dri-vmwgfx/target.c @@ -1,4 +1,5 @@ +#include "target-helpers/inline_wrapper_sw_helper.h" #include "target-helpers/inline_debug_helper.h" #include "state_tracker/drm_driver.h" #include "svga/drm/svga_drm_public.h" @@ -18,6 +19,8 @@ create_screen(int fd) if (!screen) return NULL; + screen = sw_screen_wrap(screen); + screen = debug_screen_wrap(screen); return screen; |