diff options
author | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
---|---|---|
committer | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
commit | a96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b (patch) | |
tree | d106cfea4baa1a9071b42d0e9bc922fad7502ed5 /src/mesa/program | |
parent | 7965e2fc16853ae0ed0a9cde77346c25feb19b6e (diff) | |
parent | cc0f604241ee7b536f4c9867573024b8673b0998 (diff) |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/mesa/program')
-rw-r--r-- | src/mesa/program/program.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 9ffa49bb013..52254e9365f 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -32,6 +32,7 @@ #include "main/glheader.h" #include "main/context.h" #include "main/hash.h" +#include "main/mfeatures.h" #include "program.h" #include "prog_cache.h" #include "prog_parameter.h" |