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/main/uniforms.h | |
| 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/main/uniforms.h')
| -rw-r--r-- | src/mesa/main/uniforms.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 2f88b65043d..88fe9580167 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -27,8 +27,8 @@ #define UNIFORMS_H #include "main/glheader.h" -#include "glsl/nir/glsl_types.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl_types.h" +#include "compiler/glsl/ir_uniform.h" #include "program/prog_parameter.h" #ifdef __cplusplus |