diff options
| author | Christian König <[email protected]> | 2010-11-11 21:07:42 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-11-11 21:07:42 +0100 |
| commit | 195bbe8ce218533569dde1368d04da0fd229913d (patch) | |
| tree | 29d3db04673f59dcfd6663c524a5c1343d5cbee6 /src/mesa/program/sampler.cpp | |
| parent | 99b57bc20e839043ec6160502814085a0976fccc (diff) | |
| parent | d67df5dd9db1cede92f1b177c890f83809bb4582 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/mesa/program/sampler.cpp')
| -rw-r--r-- | src/mesa/program/sampler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp index 0e58aef9c95..9a813c87955 100644 --- a/src/mesa/program/sampler.cpp +++ b/src/mesa/program/sampler.cpp @@ -23,15 +23,15 @@ * DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> +#include <cstdio> +#include "ir.h" +#include "glsl_types.h" +#include "ir_visitor.h" extern "C" { #include "main/compiler.h" #include "main/mtypes.h" #include "program/prog_parameter.h" -#include "ir.h" -#include "ir_visitor.h" -#include "glsl_types.h" } static void fail_link(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3); |