diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-23 17:08:24 -0700 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-23 17:23:14 -0700 |
| commit | 2cb3d2b7a0d8f505131e98053d3e19982012fccd (patch) | |
| tree | da9a95967c877f4b71c40dcdea681480f2e75cf2 /src/mesa/drivers/dri/intel | |
| parent | 9e7c0724bbc62c86dc302a9fe76b3e4288fc4461 (diff) | |
| parent | ec76910187adc88fc54907ffa3506309ee2abcf3 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/glapi/glapi_getproc.c
src/mesa/main/image.c
src/mesa/shader/slang/slang_link.c
Diffstat (limited to 'src/mesa/drivers/dri/intel')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel_draw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c b/src/mesa/drivers/dri/intel/intel_pixel_draw.c index 0ddc3aa30d..be213e7b96 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_draw.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c @@ -32,8 +32,10 @@ #include "main/macros.h" #include "main/bufferobj.h" #include "main/teximage.h" +#include "main/texenv.h" #include "main/texobj.h" #include "main/texstate.h" +#include "main/texparam.h" #include "main/matrix.h" #include "main/varray.h" #include "main/attrib.h" |