mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Libretro SDK) Simplify scaler_ctx_scale somewhat - also only call function callback

Browse Source 
if it is bound
This commit is contained in:
twinaphex 2014-10-30 07:12:44 +01:00
parent 0e0d62a97b
commit d3a7b69f84
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libretro-sdk/gfx/scaler/scaler.c
View File

@ -274,28 +274,36 @@ void scaler_ctx_scale(struct scaler_ctx *ctx,
} }
else else
{ {
bool inp_fmt_is_not_argb8888 = (ctx->in_fmt != SCALER_FMT_ARGB8888);
const void *inp_fmt_frame = inp_fmt_is_not_argb8888 ? ctx->input.frame : input;
int inp_fmt_stride = inp_fmt_is_not_argb8888 ? ctx->input.stride : ctx->in_stride;
bool out_fmt_is_not_argb8888 = (ctx->out_fmt != SCALER_FMT_ARGB8888);
void *out_fmt_frame = out_fmt_is_not_argb8888 ? ctx->output.frame : output;
int out_fmt_stride = out_fmt_is_not_argb8888 ? ctx->output.stride : ctx->out_stride;
/* Take generic filter path. */ /* Take generic filter path. */
if (ctx->in_fmt != SCALER_FMT_ARGB8888) if (inp_fmt_is_not_argb8888)
{ {
ctx->in_pixconv(ctx->input.frame, input, if (ctx->in_pixconv)
ctx->in_width, ctx->in_height, ctx->in_pixconv(ctx->input.frame, input,
ctx->input.stride, ctx->in_stride); ctx->in_width, ctx->in_height,
ctx->input.stride, ctx->in_stride);
ctx->scaler_horiz(ctx, ctx->input.frame, ctx->input.stride);
} }
else
ctx->scaler_horiz(ctx, input, ctx->in_stride);
if (ctx->out_fmt != SCALER_FMT_ARGB8888) if (ctx->scaler_horiz)
ctx->scaler_horiz(ctx, inp_fmt_frame, inp_fmt_stride);
if (ctx->scaler_vert)
ctx->scaler_vert(ctx, out_fmt_frame, out_fmt_stride);
if (out_fmt_is_not_argb8888)
{ {
ctx->scaler_vert(ctx, ctx->output.frame, ctx->output.stride); if (ctx->out_pixconv)
ctx->out_pixconv(output, ctx->output.frame,
ctx->out_pixconv(output, ctx->output.frame, ctx->out_width, ctx->out_height,
ctx->out_width, ctx->out_height, ctx->out_stride, ctx->output.stride);
ctx->out_stride, ctx->output.stride);
} }
else
ctx->scaler_vert(ctx, output, ctx->out_stride);
} }
} }