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

Merge pull request #13061 from libretro/put-back-scaler-object

Browse Source 
Put scaler_ctx back in screenshot_state
This commit is contained in:
Autechre 2021-10-02 05:18:38 +02:00 committed by GitHub
commit 24484e72d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tasks/task_screenshot.c
View File

@ -29,7 +29,6 @@
#include <file/file_path.h>
#include <compat/strl.h>
#include <string/stdstring.h>
#include <gfx/scaler/scaler.h>
#include <gfx/video_frame.h>
#ifdef HAVE_RBMP
@ -59,26 +58,26 @@
static bool screenshot_dump_direct(screenshot_task_state_t *state)
{
struct scaler_ctx scaler;
bool ret = false;
struct scaler_ctx *scaler = (struct scaler_ctx*)&state->scaler;
bool ret = false;
#if defined(HAVE_RPNG)
if (state->bgr24)
scaler.in_fmt = SCALER_FMT_BGR24;
scaler->in_fmt = SCALER_FMT_BGR24;
else if (state->pixel_format_type == RETRO_PIXEL_FORMAT_XRGB8888)
scaler.in_fmt = SCALER_FMT_ARGB8888;
scaler->in_fmt = SCALER_FMT_ARGB8888;
else
scaler.in_fmt = SCALER_FMT_RGB565;
scaler->in_fmt = SCALER_FMT_RGB565;
video_frame_convert_to_bgr24(
&scaler,
scaler,
state->out_buffer,
(const uint8_t*)state->frame + ((int)state->height - 1)
* state->pitch,
state->width, state->height,
-state->pitch);
scaler_ctx_gen_reset(&scaler);
scaler_ctx_gen_reset(&state->scaler);
ret = rpng_save_image_bgr24(
state->filename,

2
tasks/tasks_internal.h
View File

@ -23,6 +23,7 @@
#include <retro_miscellaneous.h>
#include <queues/task_queue.h>
#include <gfx/scaler/scaler.h>
#ifdef HAVE_CONFIG_H
#include "../config.h"
@ -210,6 +211,7 @@ typedef struct screenshot_task_state screenshot_task_state_t;
struct screenshot_task_state
{
struct scaler_ctx scaler;
uint8_t *out_buffer;
const void *frame;
void *userbuf;