From a6c489b5533eec666f1685421cbe03f04b0f6ffe Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Mon, 22 Mar 2021 10:44:11 -0400 Subject: [PATCH] tex_unit code refactoring --- hw/rtl/tex_unit/VX_tex_bilerp.v | 13 ++++++------- hw/rtl/tex_unit/VX_tex_sampler.v | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/rtl/tex_unit/VX_tex_bilerp.v b/hw/rtl/tex_unit/VX_tex_bilerp.v index 35370669..1c0dbb53 100644 --- a/hw/rtl/tex_unit/VX_tex_bilerp.v +++ b/hw/rtl/tex_unit/VX_tex_bilerp.v @@ -12,29 +12,28 @@ module VX_tex_bilerp #( output wire [31:0] sampled_data ); `UNUSED_PARAM (CORE_ID) - `UNUSED_VAR(color_enable) wire [63:0] UL_lerp; wire [63:0] UH_lerp; wire [63:0] V_lerp; reg [31:0] sampled_r; - VX_lerp_64 #( - ) UL_lerp ( + VX_tex_lerp #( + ) tex_lerp_UL ( .blend(blendU), .in_texels({texels[1], texels[0]}), .lerp_texel(UL_lerp) ); - VX_lerp_64 #( - ) UH_lerp ( + VX_tex_lerp #( + ) tex_lerp_UH ( .blend(blendU), .in_texels({texels[3], texels[2]}), .lerp_texel(UH_lerp) ); - VX_lerp_64 #( - ) V_lerp ( + VX_tex_lerp #( + ) tex_lerp_V ( .blend(blendV), .in_texels({UH_lerp, UL_lerp}), .lerp_texel(V_lerp) diff --git a/hw/rtl/tex_unit/VX_tex_sampler.v b/hw/rtl/tex_unit/VX_tex_sampler.v index 51c42543..43cd4f5f 100644 --- a/hw/rtl/tex_unit/VX_tex_sampler.v +++ b/hw/rtl/tex_unit/VX_tex_sampler.v @@ -66,7 +66,7 @@ module VX_tex_sampler #( assign blendU = req_u[i][`BLEND_FRAC_64-1:0]; assign blendV = req_v[i][`BLEND_FRAC_64-1:0]; - VX_bilerp #( + VX_tex_bilerp #( .CORE_ID (CORE_ID) ) tex_bilerp ( .blendU(blendU), //blendU