diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-05 15:03:04 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-05 15:03:44 -0800 |
| commit | 741744f691d6ef63e9f9a4c03136f969f2ffb0bf (patch) | |
| tree | 7c9192a0648c2d90bb08efbc21ebcb7a6e2b873a /src/mesa/program/sampler.cpp | |
| parent | 9645b8eb1f1b79e537ad8ddb683507df7bc9da58 (diff) | |
| parent | eb63640c1d38a200a7b1540405051d3ff79d0d8a (diff) | |
Merge commit mesa-public/master into vulkan
This pulls in the patches that move all of the compiler stuff around
Diffstat (limited to 'src/mesa/program/sampler.cpp')
| -rw-r--r-- | src/mesa/program/sampler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp index 84e2504baba..f118552d64e 100644 --- a/src/mesa/program/sampler.cpp +++ b/src/mesa/program/sampler.cpp @@ -24,11 +24,11 @@ */ #include "main/mtypes.h" -#include "glsl/nir/glsl_types.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/ir_visitor.h" -#include "glsl/program.h" +#include "compiler/glsl_types.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/ir_visitor.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" #include "program/prog_parameter.h" #include "program/program.h" |