diff options
| author | Christian König <[email protected]> | 2011-01-08 13:24:36 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-08 13:24:36 +0100 |
| commit | 72e30991559017c16d48569e612dbc0970e3b9ca (patch) | |
| tree | 297326fa77f35b2b6f7d7d80a019562fd0facb06 /src/mesa/main/image.c | |
| parent | ef4def1d9a2a48c7e32ea3e6bf0294470dfbf4c8 (diff) | |
| parent | d8cfe464424b41bd986276e19427f0079778bf8f (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/drivers/r600/eg_asm.c
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/include/pipe/p_format.h
src/gallium/targets/dri-nouveau/Makefile
Diffstat (limited to 'src/mesa/main/image.c')
| -rw-r--r-- | src/mesa/main/image.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index f9f2ed73077..909c18e7e60 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -35,6 +35,8 @@ #include "image.h" #include "imports.h" #include "macros.h" +#include "mfeatures.h" +#include "mtypes.h" /** |