[Mesa-dev] [PATCH] st/mesa: add compiler/nir/ prefix for nir includes

Bas Nieuwenhuizen bas at basnieuwenhuizen.nl
Tue Mar 20 12:14:16 UTC 2018


is compiler/nir/nir.h the preferred way?

I checked src/amd and we are using "nir/nir.h" all the time.

On Tue, Mar 20, 2018 at 12:41 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> Stay consistent with the rest of the codebase, effectively fixing the
> autotools build.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105621
> Fixes: ffa4bbe4665 ("st/nir/radeonsi: move nir_lower_uniforms_to_ubo()
> to the state tracker")
> Cc: Timothy Arceri <tarceri at itsqueeze.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c b/src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c
> index e2a477ecc74..b2f8f833bbb 100644
> --- a/src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c
> +++ b/src/mesa/state_tracker/st_nir_lower_uniforms_to_ubo.c
> @@ -29,8 +29,8 @@
>   * point by 1.
>   */
>
> -#include "nir.h"
> -#include "nir_builder.h"
> +#include "compiler/nir/nir.h"
> +#include "compiler/nir/nir_builder.h"
>  #include "st_nir.h"
>
>  #include "program/prog_parameter.h"
> --
> 2.16.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list