From ffeb73811245243fca45b241ae1b0d4b63153130 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 28 Feb 2017 18:11:33 -0800 Subject: [PATCH] i965: Move brw_register_blocks to brw_fs.cpp Its one and only caller is brw_compile_fs which lives there. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_context.h | 11 ----------- src/mesa/drivers/dri/i965/brw_fs.cpp | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 3845927..7132eae 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1543,17 +1543,6 @@ brw_program_const(const struct gl_program *p) return (const struct brw_program *) p; } -/** - * Pre-gen6, the register file of the EUs was shared between threads, - * and each thread used some subset allocated on a 16-register block - * granularity. The unit states wanted these block counts. - */ -static inline int -brw_register_blocks(int reg_count) -{ - return ALIGN(reg_count, 16) / 16 - 1; -} - static inline uint32_t brw_program_reloc(struct brw_context *brw, uint32_t state_offset, uint32_t prog_offset) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index bbeddca..67bdb7a 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -6392,6 +6392,17 @@ demote_sample_qualifiers(nir_shader *nir) } } +/** + * Pre-gen6, the register file of the EUs was shared between threads, + * and each thread used some subset allocated on a 16-register block + * granularity. The unit states wanted these block counts. + */ +static inline int +brw_register_blocks(int reg_count) +{ + return ALIGN(reg_count, 16) / 16 - 1; +} + const unsigned * brw_compile_fs(const struct brw_compiler *compiler, void *log_data, void *mem_ctx, -- 2.7.4