diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-30 08:11:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-30 08:11:58 +0200 |
| commit | ccddacee74b1f043b146265297c8abbde6317df7 (patch) | |
| tree | d6ddca10b5d19de1f14e56d7013a8591f4bfe658 /mesalib/src/mesa/sources.mak | |
| parent | 52a690f156b6388c2219610d4e9cd88b79d24203 (diff) | |
| parent | 82ce0534a7bc89f1ed93b4b952b30ceb3d94210d (diff) | |
| download | vcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.tar.gz vcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.tar.bz2 vcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/SConscript
mesalib/src/mesa/drivers/common/driverfuncs.c
mesalib/src/mesa/drivers/dri/common/texmem.c
mesalib/src/mesa/main/context.c
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/debug.h
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/formats.h
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/sources.mak
mesalib/src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'mesalib/src/mesa/sources.mak')
| -rw-r--r-- | mesalib/src/mesa/sources.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak index e0548178e..0ff16d662 100644 --- a/mesalib/src/mesa/sources.mak +++ b/mesalib/src/mesa/sources.mak @@ -145,6 +145,7 @@ SWRAST_SOURCES = \ swrast/s_texcombine.c \
swrast/s_texfilter.c \
swrast/s_texrender.c \
+ swrast/s_texture.c \
swrast/s_triangle.c \
swrast/s_zoom.c
|