blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: unused args

This commit is contained in:
Campbell Barton 2019-06-23 11:37:45 +10:00
parent 447443e4c4
commit 90d262abe1
1 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
source/blender/draw/engines/gpencil/gpencil_shader_fx.c
View File

@ -771,10 +771,7 @@ void DRW_gpencil_fx_prepare(GPENCIL_e_data *e_data,
}
/* helper to draw one FX pass and do ping-pong copy */
static void gpencil_draw_fx_pass(GPENCIL_e_data *e_data,
GPENCIL_Data *vedata,
DRWShadingGroup *shgrp,
bool blend)
static void gpencil_draw_fx_pass(GPENCIL_Data *vedata, DRWShadingGroup *shgrp, bool blend)
{
if (shgrp == NULL) {
return;
@ -807,9 +804,7 @@ static void gpencil_draw_fx_pass(GPENCIL_e_data *e_data,
}
/* helper to manage gaussian blur passes */
static void draw_gpencil_blur_passes(GPENCIL_e_data *e_data,
GPENCIL_Data *vedata,
BlurShaderFxData *fxd)
static void draw_gpencil_blur_passes(GPENCIL_Data *vedata, BlurShaderFxData *fxd)
{
if (fxd->runtime.fx_sh == NULL) {
return;
@ -833,13 +828,13 @@ static void draw_gpencil_blur_passes(GPENCIL_e_data *e_data,
if (bx > 0) {
fxd->blur[0] = bx;
fxd->blur[1] = 0;
gpencil_draw_fx_pass(e_data, vedata, shgrp, true);
gpencil_draw_fx_pass(vedata, shgrp, true);
}
/* vertical */
if (by > 0) {
fxd->blur[0] = 0;
fxd->blur[1] = by;
gpencil_draw_fx_pass(e_data, vedata, shgrp, true);
gpencil_draw_fx_pass(vedata, shgrp, true);
}
}
}
@ -862,13 +857,8 @@ static void draw_gpencil_midpass_blur(GPENCIL_Data *vedata, ShaderFxData_Runtime
}
/* do blur of mid passes */
static void draw_gpencil_do_blur(GPENCIL_e_data *e_data,
GPENCIL_Data *vedata,
ShaderFxData_Runtime *runtime,
int samples,
int bx,
int by,
int blur[2])
static void draw_gpencil_do_blur(
GPENCIL_Data *vedata, ShaderFxData_Runtime *runtime, int samples, int bx, int by, int blur[2])
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
@ -895,9 +885,7 @@ static void draw_gpencil_do_blur(GPENCIL_e_data *e_data,
}
/* helper to draw RIM passes */
static void draw_gpencil_rim_passes(GPENCIL_e_data *e_data,
GPENCIL_Data *vedata,
RimShaderFxData *fxd)
static void draw_gpencil_rim_passes(GPENCIL_Data *vedata, RimShaderFxData *fxd)
{
if (fxd->runtime.fx_sh_b == NULL) {
return;
@ -916,7 +904,7 @@ static void draw_gpencil_rim_passes(GPENCIL_e_data *e_data,
/* blur rim */
draw_gpencil_do_blur(
e_data, vedata, &fxd->runtime, fxd->samples, fxd->blur[0], fxd->blur[1], &fxd->blur[0]);
vedata, &fxd->runtime, fxd->samples, fxd->blur[0], fxd->blur[1], &fxd->blur[0]);
/* resolve */
GPU_framebuffer_bind(fbl->temp_fb_b);
@ -933,9 +921,7 @@ static void draw_gpencil_rim_passes(GPENCIL_e_data *e_data,
}
/* helper to draw SHADOW passes */
static void draw_gpencil_shadow_passes(GPENCIL_e_data *e_data,
GPENCIL_Data *vedata,
ShadowShaderFxData *fxd)
static void draw_gpencil_shadow_passes(GPENCIL_Data *vedata, ShadowShaderFxData *fxd)
{
if (fxd->runtime.fx_sh_b == NULL) {
return;
@ -953,7 +939,7 @@ static void draw_gpencil_shadow_passes(GPENCIL_e_data *e_data,
/* blur shadow */
draw_gpencil_do_blur(
e_data, vedata, &fxd->runtime, fxd->samples, fxd->blur[0], fxd->blur[1], &fxd->blur[0]);
vedata, &fxd->runtime, fxd->samples, fxd->blur[0], fxd->blur[1], &fxd->blur[0]);
/* resolve */
GPU_framebuffer_bind(fbl->temp_fb_b);
@ -970,9 +956,7 @@ static void draw_gpencil_shadow_passes(GPENCIL_e_data *e_data,
}
/* helper to draw GLOW passes */
static void draw_gpencil_glow_passes(GPENCIL_e_data *e_data,
GPENCIL_Data *vedata,
GlowShaderFxData *fxd)
static void draw_gpencil_glow_passes(GPENCIL_Data *vedata, GlowShaderFxData *fxd)
{
if (fxd->runtime.fx_sh_b == NULL) {
return;
@ -991,7 +975,7 @@ static void draw_gpencil_glow_passes(GPENCIL_e_data *e_data,
/* blur glow */
draw_gpencil_do_blur(
e_data, vedata, &fxd->runtime, fxd->samples, fxd->blur[0], fxd->blur[0], &fxd->blur[0]);
vedata, &fxd->runtime, fxd->samples, fxd->blur[0], fxd->blur[0], &fxd->blur[0]);
/* resolve */
GPU_framebuffer_bind(fbl->temp_fb_b);
@ -1012,7 +996,7 @@ static void draw_gpencil_glow_passes(GPENCIL_e_data *e_data,
}
/* apply all object fx effects */
void DRW_gpencil_fx_draw(GPENCIL_e_data *e_data,
void DRW_gpencil_fx_draw(GPENCIL_e_data *UNUSED(e_data),
GPENCIL_Data *vedata,
tGPencilObjectCache *cache_ob)
{
@ -1025,52 +1009,52 @@ void DRW_gpencil_fx_draw(GPENCIL_e_data *e_data,
case eShaderFxType_Blur: {
BlurShaderFxData *fxd = (BlurShaderFxData *)fx;
draw_gpencil_blur_passes(e_data, vedata, fxd);
draw_gpencil_blur_passes(vedata, fxd);
break;
}
case eShaderFxType_Colorize: {
ColorizeShaderFxData *fxd = (ColorizeShaderFxData *)fx;
gpencil_draw_fx_pass(e_data, vedata, fxd->runtime.fx_sh, false);
gpencil_draw_fx_pass(vedata, fxd->runtime.fx_sh, false);
break;
}
case eShaderFxType_Flip: {
FlipShaderFxData *fxd = (FlipShaderFxData *)fx;
gpencil_draw_fx_pass(e_data, vedata, fxd->runtime.fx_sh, false);
gpencil_draw_fx_pass(vedata, fxd->runtime.fx_sh, false);
break;
}
case eShaderFxType_Light: {
LightShaderFxData *fxd = (LightShaderFxData *)fx;
gpencil_draw_fx_pass(e_data, vedata, fxd->runtime.fx_sh, false);
gpencil_draw_fx_pass(vedata, fxd->runtime.fx_sh, false);
break;
}
case eShaderFxType_Pixel: {
PixelShaderFxData *fxd = (PixelShaderFxData *)fx;
gpencil_draw_fx_pass(e_data, vedata, fxd->runtime.fx_sh, false);
gpencil_draw_fx_pass(vedata, fxd->runtime.fx_sh, false);
break;
}
case eShaderFxType_Rim: {
RimShaderFxData *fxd = (RimShaderFxData *)fx;
draw_gpencil_rim_passes(e_data, vedata, fxd);
draw_gpencil_rim_passes(vedata, fxd);
break;
}
case eShaderFxType_Shadow: {
ShadowShaderFxData *fxd = (ShadowShaderFxData *)fx;
draw_gpencil_shadow_passes(e_data, vedata, fxd);
draw_gpencil_shadow_passes(vedata, fxd);
break;
}
case eShaderFxType_Glow: {
GlowShaderFxData *fxd = (GlowShaderFxData *)fx;
draw_gpencil_glow_passes(e_data, vedata, fxd);
draw_gpencil_glow_passes(vedata, fxd);
break;
}
case eShaderFxType_Swirl: {
SwirlShaderFxData *fxd = (SwirlShaderFxData *)fx;
gpencil_draw_fx_pass(e_data, vedata, fxd->runtime.fx_sh, false);
gpencil_draw_fx_pass(vedata, fxd->runtime.fx_sh, false);
break;
}
case eShaderFxType_Wave: {
WaveShaderFxData *fxd = (WaveShaderFxData *)fx;
gpencil_draw_fx_pass(e_data, vedata, fxd->runtime.fx_sh, false);
gpencil_draw_fx_pass(vedata, fxd->runtime.fx_sh, false);
break;
}
default: