diff options
author | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
commit | 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 (patch) | |
tree | 087318efba7eb0fb5e1c1d8422eca611abdee3e7 /src/gallium/winsys/drm/i965/dri/Makefile | |
parent | 6420aca08ba6910dce22ab9f813cc57d611b0aa8 (diff) | |
parent | e0ce4a4a0994211ead8e5a77cccdd2a084e8a288 (diff) |
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
Diffstat (limited to 'src/gallium/winsys/drm/i965/dri/Makefile')
-rw-r--r-- | src/gallium/winsys/drm/i965/dri/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/winsys/drm/i965/dri/Makefile b/src/gallium/winsys/drm/i965/dri/Makefile index f7e81eed87..56690769fc 100644 --- a/src/gallium/winsys/drm/i965/dri/Makefile +++ b/src/gallium/winsys/drm/i965/dri/Makefile @@ -7,6 +7,7 @@ PIPE_DRIVERS = \ $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \ $(TOP)/src/gallium/winsys/drm/i965/gem/libi965drm.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ + $(TOP)/src/gallium/winsys/drm/sw/libswdrm.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/drivers/identity/libidentity.a \ $(TOP)/src/gallium/drivers/i965/libi965.a |