diff options
Diffstat (limited to 'src/vulkan')
| -rw-r--r-- | src/vulkan/Makefile.am | 4 | ||||
| -rw-r--r-- | src/vulkan/anv_meta.c | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_meta_clear.c | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_meta_resolve.c | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_nir.h | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_nir_apply_dynamic_offsets.c | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_nir_apply_pipeline_layout.c | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_pipeline.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index 06f67cfd5f8..58668c7cf88 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -54,7 +54,7 @@ AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/glsl/nir \ + -I$(top_srcdir)/src/compiler \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ @@ -63,7 +63,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/isl/ \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/glsl/nir \ + -I$(top_builddir)/src/compiler \ -I$(top_builddir)/src/vulkan libvulkan_la_CFLAGS = $(CFLAGS) -Wno-override-init 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}; diff --git a/src/vulkan/anv_meta_clear.c b/src/vulkan/anv_meta_clear.c index 027217b88dc..15e24a32a75 100644 --- a/src/vulkan/anv_meta_clear.c +++ b/src/vulkan/anv_meta_clear.c @@ -23,7 +23,7 @@ #include "anv_meta.h" #include "anv_private.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" /** Vertex attributes for color clears. */ struct color_clear_vattrs { diff --git a/src/vulkan/anv_meta_resolve.c b/src/vulkan/anv_meta_resolve.c index 2107a758fde..f1c985e04cf 100644 --- a/src/vulkan/anv_meta_resolve.c +++ b/src/vulkan/anv_meta_resolve.c @@ -26,7 +26,7 @@ #include "anv_meta.h" #include "anv_private.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" /** * Vertex attributes used by all pipelines. diff --git a/src/vulkan/anv_nir.h b/src/vulkan/anv_nir.h index 9a7a76fe216..c76314d9df6 100644 --- a/src/vulkan/anv_nir.h +++ b/src/vulkan/anv_nir.h @@ -23,7 +23,7 @@ #pragma once -#include "glsl/nir/nir.h" +#include "nir/nir.h" #include "anv_private.h" #ifdef __cplusplus diff --git a/src/vulkan/anv_nir_apply_dynamic_offsets.c b/src/vulkan/anv_nir_apply_dynamic_offsets.c index 6837a80460d..a5e3238a36a 100644 --- a/src/vulkan/anv_nir_apply_dynamic_offsets.c +++ b/src/vulkan/anv_nir_apply_dynamic_offsets.c @@ -22,7 +22,7 @@ */ #include "anv_nir.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" struct apply_dynamic_offsets_state { nir_shader *shader; diff --git a/src/vulkan/anv_nir_apply_pipeline_layout.c b/src/vulkan/anv_nir_apply_pipeline_layout.c index b7b8bd18ef9..00ed7766acb 100644 --- a/src/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/vulkan/anv_nir_apply_pipeline_layout.c @@ -23,7 +23,7 @@ #include "anv_nir.h" #include "program/prog_parameter.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" struct apply_pipeline_layout_state { nir_shader *shader; diff --git a/src/vulkan/anv_pipeline.c b/src/vulkan/anv_pipeline.c index 106b9221dd7..3c5072ba924 100644 --- a/src/vulkan/anv_pipeline.c +++ b/src/vulkan/anv_pipeline.c @@ -30,7 +30,7 @@ #include "anv_private.h" #include "brw_nir.h" #include "anv_nir.h" -#include "glsl/nir/spirv/nir_spirv.h" +#include "nir/spirv/nir_spirv.h" /* Needed for SWIZZLE macros */ #include "program/prog_instruction.h" |