From e01a028e244f9b29e17c32f1a878ebf0ca014691 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 17 May 2018 17:25:46 +0200 Subject: [PATCH] Move add_lut_internal to d3d9_renderchain.h --- gfx/drivers_renderchain/d3d9_cg_renderchain.c | 18 ++---------------- .../d3d9_hlsl_renderchain.c | 4 ++-- gfx/drivers_renderchain/d3d9_renderchain.h | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c index d9aedd96b8..8b17ee79bc 100644 --- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c @@ -504,20 +504,6 @@ static void d3d9_cg_renderchain_bind_prev(cg_renderchain_t *chain, } } -static void d3d9_cg_renderchain_add_lut_internal( - cg_renderchain_t *chain, - unsigned index, unsigned i) -{ - d3d9_set_texture(chain->chain.dev, index, chain->chain.luts->data[i].tex); - d3d9_set_sampler_magfilter(chain->chain.dev, index, - d3d_translate_filter(chain->chain.luts->data[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST)); - d3d9_set_sampler_minfilter(chain->chain.dev, index, - d3d_translate_filter(chain->chain.luts->data[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST)); - d3d9_set_sampler_address_u(chain->chain.dev, index, D3DTADDRESS_BORDER); - d3d9_set_sampler_address_v(chain->chain.dev, index, D3DTADDRESS_BORDER); - unsigned_vector_list_append(chain->chain.bound_tex, index); -} - static void d3d9_cg_renderchain_bind_pass( cg_renderchain_t *chain, struct shader_pass *pass, unsigned pass_index) @@ -1214,7 +1200,7 @@ static void cg_d3d9_renderchain_render_pass( unsigned index = cgGetParameterResourceIndex(fparam); bound_index = index; - d3d9_cg_renderchain_add_lut_internal(chain, index, i); + d3d9_cg_renderchain_add_lut_internal(&chain->chain, index, i); } vparam = cgGetNamedParameter(pass->vprg, @@ -1224,7 +1210,7 @@ static void cg_d3d9_renderchain_render_pass( { unsigned index = cgGetParameterResourceIndex(vparam); if (index != (unsigned)bound_index) - d3d9_cg_renderchain_add_lut_internal(chain, index, i); + d3d9_cg_renderchain_add_lut_internal(&chain->chain, index, i); } } diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c index 3b8f3752fb..fa7ac0465a 100644 --- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c @@ -1032,7 +1032,7 @@ static void hlsl_d3d9_renderchain_render_pass( unsigned index = cgGetParameterResourceIndex(fparam); bound_index = index; - d3d9_cg_renderchain_add_lut_internal(chain, index, i); + d3d9_cg_renderchain_add_lut_internal(&chain->chain, index, i); } vparam = cgGetNamedParameter(pass->vPrg, chain->chain.luts->data[i].id); @@ -1041,7 +1041,7 @@ static void hlsl_d3d9_renderchain_render_pass( { unsigned index = cgGetParameterResourceIndex(vparam); if (index != (unsigned)bound_index) - d3d9_cg_renderchain_add_lut_internal(chain, index, i); + d3d9_cg_renderchain_add_lut_internal(&chain->chain, index, i); } } diff --git a/gfx/drivers_renderchain/d3d9_renderchain.h b/gfx/drivers_renderchain/d3d9_renderchain.h index 2168032888..b245a438b8 100644 --- a/gfx/drivers_renderchain/d3d9_renderchain.h +++ b/gfx/drivers_renderchain/d3d9_renderchain.h @@ -140,6 +140,20 @@ static INLINE bool d3d9_renderchain_add_lut(d3d9_renderchain_t *chain, return true; } +static INLINE void d3d9_cg_renderchain_add_lut_internal( + d3d9_renderchain_t *chain, + unsigned index, unsigned i) +{ + d3d9_set_texture(chain->dev, index, chain->luts->data[i].tex); + d3d9_set_sampler_magfilter(chain->dev, index, + d3d_translate_filter(chain->luts->data[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST)); + d3d9_set_sampler_minfilter(chain->dev, index, + d3d_translate_filter(chain->luts->data[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST)); + d3d9_set_sampler_address_u(chain->dev, index, D3DTADDRESS_BORDER); + d3d9_set_sampler_address_v(chain->dev, index, D3DTADDRESS_BORDER); + unsigned_vector_list_append(chain->bound_tex, index); +} + static INLINE void d3d9_init_renderchain(d3d9_renderchain_t *chain) { chain->passes = shader_pass_vector_list_new();