diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:45:45 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:45:45 +0000 |
| commit | 4f769fe90ef512d98c1f2e61964eb52b41f785a2 (patch) | |
| tree | be23b9c2d07f468e09b5b409221ee55a30ab8616 /lib/mesa/src/gallium | |
| parent | fd509fe9c794932f461419091dcc98c91f443a3e (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/gallium')
| -rw-r--r-- | lib/mesa/src/gallium/targets/graw-gdi/SConscript | 4 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/targets/graw-xlib/SConscript | 6 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/targets/haiku-softpipe/SConscript | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/lib/mesa/src/gallium/targets/graw-gdi/SConscript b/lib/mesa/src/gallium/targets/graw-gdi/SConscript index e59127cc2..67d437374 100644 --- a/lib/mesa/src/gallium/targets/graw-gdi/SConscript +++ b/lib/mesa/src/gallium/targets/graw-gdi/SConscript @@ -23,8 +23,8 @@ sources = [ ] if True: - env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE']) - env.Prepend(LIBS = [softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [trace, rbug, softpipe]) if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') diff --git a/lib/mesa/src/gallium/targets/graw-xlib/SConscript b/lib/mesa/src/gallium/targets/graw-xlib/SConscript index 3c6a856e3..bf9cf72c6 100644 --- a/lib/mesa/src/gallium/targets/graw-xlib/SConscript +++ b/lib/mesa/src/gallium/targets/graw-xlib/SConscript @@ -20,14 +20,16 @@ env.Append(CPPPATH = [ '#src/gallium/winsys', ]) +env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE']) + sources = [ 'graw_xlib.c', graw_util ] if True: - env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE']) - env.Prepend(LIBS = [softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [trace, rbug, softpipe]) if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') diff --git a/lib/mesa/src/gallium/targets/haiku-softpipe/SConscript b/lib/mesa/src/gallium/targets/haiku-softpipe/SConscript index ff5adc131..210721c42 100644 --- a/lib/mesa/src/gallium/targets/haiku-softpipe/SConscript +++ b/lib/mesa/src/gallium/targets/haiku-softpipe/SConscript @@ -3,18 +3,19 @@ Import('*') env.Prepend(LIBS = [ ws_haiku, st_haiku, + trace, + rbug, mesautil, - compiler, mesa, glsl, - nir, - spirv, gallium ]) if True: env.Append(CPPDEFINES = [ 'GALLIUM_SOFTPIPE', + 'GALLIUM_RBUG', + 'GALLIUM_TRACE', ]) env.Prepend(LIBS = [softpipe]) |