diff options
author | Keith Whitwell <keithw@vmware.com> | 2010-03-15 09:44:52 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2010-03-15 09:44:52 +0000 |
commit | 42910ebe7b9748c0ecb6a597bae3e7d43c7e170f (patch) | |
tree | b2b9c72dc47a0473304dc2db1b078d13b658df34 /src/mesa/drivers/dri/swrast/Makefile | |
parent | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (diff) | |
parent | 68e58a96e80865878e6881dc4d34fcc3ec24eb19 (diff) |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/drivers/nv30/nv30_context.h
src/gallium/drivers/nv30/nv30_state.c
src/gallium/drivers/nv40/nv40_context.h
src/gallium/drivers/nv40/nv40_state.c
src/gallium/drivers/r300/r300_emit.c
Diffstat (limited to 'src/mesa/drivers/dri/swrast/Makefile')
-rw-r--r-- | src/mesa/drivers/dri/swrast/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/swrast/Makefile b/src/mesa/drivers/dri/swrast/Makefile index 771169c1ff..cc59eefdb2 100644 --- a/src/mesa/drivers/dri/swrast/Makefile +++ b/src/mesa/drivers/dri/swrast/Makefile @@ -17,7 +17,8 @@ ASM_SOURCES = SWRAST_COMMON_SOURCES = \ ../../common/driverfuncs.c \ - ../common/utils.c + ../common/utils.c \ + ../common/dri_sw.c include ../Makefile.template |