From 86a2447eec7e87e46e842ca7a3ad5cd9fadb1ca5 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 25 May 2016 17:26:42 -0700 Subject: [PATCH] i965/nir: Move the type_size_*_bytes functions to brw_nir.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Emil Velikov Reviewed-by: Kristian Høgsberg --- src/mesa/drivers/dri/i965/brw_nir.c | 12 ------------ src/mesa/drivers/dri/i965/brw_nir.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 45551a1c460..62ed0e8e1d4 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -337,18 +337,6 @@ brw_nir_lower_fs_outputs(nir_shader *nir) nir_lower_io(nir, nir_var_shader_out, type_size_scalar); } -static int -type_size_scalar_bytes(const struct glsl_type *type) -{ - return type_size_scalar(type) * 4; -} - -static int -type_size_vec4_bytes(const struct glsl_type *type) -{ - return type_size_vec4(type) * 16; -} - static void brw_nir_lower_uniforms(nir_shader *nir, bool is_scalar) { diff --git a/src/mesa/drivers/dri/i965/brw_nir.h b/src/mesa/drivers/dri/i965/brw_nir.h index 2711606511d..041f337667f 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.h +++ b/src/mesa/drivers/dri/i965/brw_nir.h @@ -25,12 +25,25 @@ #include "brw_context.h" #include "brw_reg.h" +#include "brw_shader.h" #include "compiler/nir/nir.h" #ifdef __cplusplus extern "C" { #endif +static inline int +type_size_scalar_bytes(const struct glsl_type *type) +{ + return type_size_scalar(type) * 4; +} + +static inline int +type_size_vec4_bytes(const struct glsl_type *type) +{ + return type_size_vec4(type) * 16; +} + /* Flags set in the instr->pass_flags field by i965 analysis passes */ enum { BRW_NIR_NON_BOOLEAN = 0x0, -- 2.30.2