diff options
author | marha <marha@users.sourceforge.net> | 2011-02-14 14:46:43 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-02-14 14:46:43 +0000 |
commit | 0f63823d473bf956ec5bddf06da6e4b591e994f8 (patch) | |
tree | c8fa2b17686616a7443c583e09bbf6eceec883c2 /mesalib/src/mesa/drivers/windows/gldirect | |
parent | 9acb2b3cd11b530debce5008074fa03587ac3331 (diff) | |
parent | 026b85e62b3d8812afb5f04df29aeac28c52b331 (diff) | |
download | vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.tar.gz vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.tar.bz2 vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/drivers/windows/gldirect')
-rw-r--r-- | mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c | 1 | ||||
-rw-r--r-- | mesalib/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c index aaed87028..256ffcc38 100644 --- a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c +++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c @@ -62,7 +62,6 @@ #include "swrast/s_depth.h"
#include "swrast/s_lines.h"
#include "swrast/s_triangle.h"
-#include "swrast/s_trispan.h"
#include "tnl/tnl.h"
#include "tnl/t_context.h"
#include "tnl/t_pipeline.h"
diff --git a/mesalib/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c b/mesalib/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c index 36ebe9f31..02f0dfacd 100644 --- a/mesalib/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c +++ b/mesalib/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c @@ -61,7 +61,6 @@ #include "swrast/s_depth.h"
#include "swrast/s_lines.h"
#include "swrast/s_triangle.h"
-#include "swrast/s_trispan.h"
#include "tnl/tnl.h"
#include "tnl/t_context.h"
#include "tnl/t_pipeline.h"
|