mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make some pixel converter functions static

Browse Source
This commit is contained in:
twinaphex 2015-11-23 13:05:50 +01:00
parent beceaf4a8c
commit 1bd2f2eb8a
2 changed files with 71 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
gfx/video_driver.c
View File

@ -486,6 +486,25 @@ static void video_monitor_compute_fps_statistics(void)
}
}
static void deinit_pixel_converter(void)
{
if (!scaler_ptr)
return;
scaler_ctx_gen_reset(scaler_ptr->scaler);
if (scaler_ptr->scaler)
free(scaler_ptr->scaler);
if (scaler_ptr->scaler_out)
free(scaler_ptr->scaler_out);
if (scaler_ptr)
free(scaler_ptr);
scaler_ptr->scaler = NULL;
scaler_ptr->scaler_out = NULL;
scaler_ptr = NULL;
}
static bool uninit_video_input(void)
{
driver_t *driver = driver_get_ptr();
@ -516,6 +535,58 @@ static bool uninit_video_input(void)
return true;
}
static bool init_video_pixel_converter(unsigned size)
{
/* This function can be called multiple times
* without deiniting first on consoles. */
deinit_pixel_converter();
/* If pixel format is not 0RGB1555, we don't need to do
* any internal pixel conversion. */
if (video_driver_get_pixel_format() != RETRO_PIXEL_FORMAT_0RGB1555)
return true;
RARCH_WARN("0RGB1555 pixel format is deprecated, and will be slower. For 15/16-bit, RGB565 format is preferred.\n");
scaler_ptr = (video_pixel_scaler_t*)calloc(1, sizeof(*scaler_ptr));
if (!scaler_ptr)
goto error;
scaler_ptr->scaler = (struct scaler_ctx*)calloc(1, sizeof(*scaler_ptr->scaler));
if (!scaler_ptr->scaler)
goto error;
scaler_ptr->scaler->scaler_type = SCALER_TYPE_POINT;
scaler_ptr->scaler->in_fmt = SCALER_FMT_0RGB1555;
/* TODO: Pick either ARGB8888 or RGB565 depending on driver. */
scaler_ptr->scaler->out_fmt = SCALER_FMT_RGB565;
if (!scaler_ctx_gen_filter(scaler_ptr->scaler))
goto error;
scaler_ptr->scaler_out = calloc(sizeof(uint16_t), size * size);
if (!scaler_ptr->scaler_out)
goto error;
return true;
error:
if (scaler_ptr->scaler_out)
free(scaler_ptr->scaler_out);
if (scaler_ptr->scaler)
free(scaler_ptr->scaler);
if (scaler_ptr)
free(scaler_ptr);
scaler_ptr = NULL;
return false;
}
static bool init_video(void)
{
unsigned max_dim, scale, width, height;
@ -1646,77 +1717,6 @@ struct video_viewport *video_viewport_get_custom(void)
return &settings->video_viewport_custom;
}
void deinit_pixel_converter(void)
{
if (!scaler_ptr)
return;
scaler_ctx_gen_reset(scaler_ptr->scaler);
if (scaler_ptr->scaler)
free(scaler_ptr->scaler);
if (scaler_ptr->scaler_out)
free(scaler_ptr->scaler_out);
if (scaler_ptr)
free(scaler_ptr);
scaler_ptr->scaler = NULL;
scaler_ptr->scaler_out = NULL;
scaler_ptr = NULL;
}
bool init_video_pixel_converter(unsigned size)
{
/* This function can be called multiple times
* without deiniting first on consoles. */
deinit_pixel_converter();
/* If pixel format is not 0RGB1555, we don't need to do
* any internal pixel conversion. */
if (video_driver_get_pixel_format() != RETRO_PIXEL_FORMAT_0RGB1555)
return true;
RARCH_WARN("0RGB1555 pixel format is deprecated, and will be slower. For 15/16-bit, RGB565 format is preferred.\n");
scaler_ptr = (video_pixel_scaler_t*)calloc(1, sizeof(*scaler_ptr));
if (!scaler_ptr)
goto error;
scaler_ptr->scaler = (struct scaler_ctx*)calloc(1, sizeof(*scaler_ptr->scaler));
if (!scaler_ptr->scaler)
goto error;
scaler_ptr->scaler->scaler_type = SCALER_TYPE_POINT;
scaler_ptr->scaler->in_fmt = SCALER_FMT_0RGB1555;
/* TODO: Pick either ARGB8888 or RGB565 depending on driver. */
scaler_ptr->scaler->out_fmt = SCALER_FMT_RGB565;
if (!scaler_ctx_gen_filter(scaler_ptr->scaler))
goto error;
scaler_ptr->scaler_out = calloc(sizeof(uint16_t), size * size);
if (!scaler_ptr->scaler_out)
goto error;
return true;
error:
if (scaler_ptr->scaler_out)
free(scaler_ptr->scaler_out);
if (scaler_ptr->scaler)
free(scaler_ptr->scaler);
if (scaler_ptr)
free(scaler_ptr);
scaler_ptr = NULL;
return false;
}
unsigned video_pixel_get_alignment(unsigned pitch)
{
if (pitch & 1)

4
gfx/video_driver.h
View File

@ -504,10 +504,6 @@ bool video_monitor_fps_statistics(double *refresh_rate,
bool video_monitor_get_fps(char *buf, size_t size,
char *buf_fps, size_t size_fps);
void deinit_pixel_converter(void);
bool init_video_pixel_converter(unsigned size);
unsigned video_pixel_get_alignment(unsigned pitch);
bool video_pixel_frame_scale(const void *data,