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/vulkan/anv_meta.c | |
| 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/vulkan/anv_meta.c')
| -rw-r--r-- | src/vulkan/anv_meta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index b40151c2be6..72a927a08ee 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -29,7 +29,7 @@ #include "anv_meta.h" #include "anv_private.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" struct anv_render_pass anv_meta_dummy_renderpass = {0}; |