diff options
| author | Christian König <[email protected]> | 2011-07-11 10:48:59 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-07-11 10:48:59 +0200 |
| commit | f919547f3785b1d8839b9fc5c00ac397e30896a1 (patch) | |
| tree | 910cd4fd7ffcd2781a303bb79395a0ee3c044c7d /src/gallium/drivers/i915/SConscript | |
| parent | cd4f18089e44872ce9e3c04ac5e808a7204ffc49 (diff) | |
| parent | 12265d26ddc72f62de927ac24e12ab41fcd8d1c5 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state_inlines.h
Diffstat (limited to 'src/gallium/drivers/i915/SConscript')
| -rw-r--r-- | src/gallium/drivers/i915/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/i915/SConscript b/src/gallium/drivers/i915/SConscript index 98370601b7f..76f597001fe 100644 --- a/src/gallium/drivers/i915/SConscript +++ b/src/gallium/drivers/i915/SConscript @@ -14,6 +14,7 @@ i915 = env.ConvenienceLibrary( 'i915_flush.c', 'i915_fpc_emit.c', 'i915_fpc_translate.c', + 'i915_fpc_optimize.c', 'i915_prim_emit.c', 'i915_prim_vbuf.c', 'i915_query.c', |