From 555b22a446362a2b0f9bae3c57cdaa330be89edb Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 19 Aug 2016 04:28:31 -0700 Subject: [PATCH] i965: Move the type_size function declartaions to brw_nir.h Signed-of-by: Jason Ekstrand Reviewed-by: Jordan Justen Reviewed-by: Anuj Phogat --- src/mesa/drivers/dri/i965/brw_nir.h | 9 +++++++-- src/mesa/drivers/dri/i965/brw_shader.h | 6 ------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_nir.h b/src/mesa/drivers/dri/i965/brw_nir.h index dc03c2d9381..12f31db1ac9 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.h +++ b/src/mesa/drivers/dri/i965/brw_nir.h @@ -23,15 +23,20 @@ #pragma once -#include "brw_context.h" #include "brw_reg.h" -#include "brw_shader.h" #include "compiler/nir/nir.h" +#include "brw_compiler.h" #ifdef __cplusplus extern "C" { #endif +int type_size_scalar(const struct glsl_type *type); +int type_size_vec4(const struct glsl_type *type); +int type_size_dvec4(const struct glsl_type *type); +int type_size_vec4_times_4(const struct glsl_type *type); +int type_size_vs_input(const struct glsl_type *type); + static inline int type_size_scalar_bytes(const struct glsl_type *type) { diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index 3b3be07b5ec..2ef9fb7e3b0 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -291,12 +291,6 @@ bool brw_cs_precompile(struct gl_context *ctx, GLboolean brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog); struct gl_linked_shader *brw_new_shader(gl_shader_stage stage); -int type_size_scalar(const struct glsl_type *type); -int type_size_vec4(const struct glsl_type *type); -int type_size_dvec4(const struct glsl_type *type); -int type_size_vec4_times_4(const struct glsl_type *type); -int type_size_vs_input(const struct glsl_type *type); - unsigned tesslevel_outer_components(GLenum tes_primitive_mode); unsigned tesslevel_inner_components(GLenum tes_primitive_mode); unsigned writemask_for_backwards_vector(unsigned mask); -- 2.30.2