mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 18:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
big performance regression

This reverts commit d3a7b69f840550d1d7447b073602dac5ef6a049e.
This commit is contained in:
twinaphex 2014-11-01 09:39:53 +01:00
parent 003ee30f93
commit 8e0d1ed70f
1 changed files with 16 additions and 24 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,36 +274,28 @@ void scaler_ctx_scale(struct scaler_ctx *ctx,
}
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. */
if (inp_fmt_is_not_argb8888)
if (ctx->in_fmt != SCALER_FMT_ARGB8888)
{
if (ctx->in_pixconv)
ctx->in_pixconv(ctx->input.frame, input,
ctx->in_width, ctx->in_height,
ctx->input.stride, ctx->in_stride);
ctx->in_pixconv(ctx->input.frame, input,
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->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)
if (ctx->out_fmt != SCALER_FMT_ARGB8888)
{
if (ctx->out_pixconv)
ctx->out_pixconv(output, ctx->output.frame,
ctx->out_width, ctx->out_height,
ctx->out_stride, ctx->output.stride);
ctx->scaler_vert(ctx, ctx->output.frame, ctx->output.stride);
ctx->out_pixconv(output, ctx->output.frame,
ctx->out_width, ctx->out_height,
ctx->out_stride, ctx->output.stride);
}
else
ctx->scaler_vert(ctx, output, ctx->out_stride);
}
}