---
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 6185310..8e73c64 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 e61c080..3435b1f 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.5.0.400.gff86faf
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
