mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create video_driver_cached_frame_has_valid_fb

Browse Source
This commit is contained in:
twinaphex 2015-05-20 21:29:23 +02:00
parent ac8d58b7bb
commit 63aa834414
3 changed files with 61 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gfx/video_driver.c
View File

@ -895,6 +895,25 @@ void video_driver_cached_frame(void)
driver->recording_data = recording;
}
bool video_driver_cached_frame_has_valid_fb(void)
{
global_t *global = global_get_ptr();
if (!global || global->frame_cache.data)
return false;
return (global->frame_cache.data == RETRO_HW_FRAME_BUFFER_VALID);
}
void video_driver_cached_frame_set_ptr(const void *data)
{
global_t *global = global_get_ptr();
if (!global || !data)
return;
global->frame_cache.data = data;
}
void video_driver_cached_frame_set(const void *data, unsigned width,
unsigned height, size_t pitch)
{
@ -904,11 +923,26 @@ void video_driver_cached_frame_set(const void *data, unsigned width,
return;
global->frame_cache.data = data;
global->frame_cache.width = width;
global->frame_cache.height = height;
global->frame_cache.pitch = pitch;
}
void video_driver_cached_frame_get(const void *data, unsigned *width,
unsigned *height, size_t *pitch)
{
global_t *global = global_get_ptr();
if (!global)
return;
data = global->frame_cache.data;
*width = global->frame_cache.width;
*height = global->frame_cache.height;
*pitch = global->frame_cache.pitch;
}
void video_driver_get_size(unsigned *width, unsigned *height)
{
if (width)

7
gfx/video_driver.h
View File

@ -384,6 +384,13 @@ void video_driver_cached_frame(void);
void video_driver_cached_frame_set(const void *data, unsigned width,
unsigned height, size_t pitch);
void video_driver_cached_frame_set_ptr(const void *data);
void video_driver_cached_frame_get(const void *data, unsigned *width,
unsigned *height, size_t *pitch);
bool video_driver_cached_frame_has_valid_fb(void);
#ifdef __cplusplus
}
#endif

38
screenshot.c
View File

@ -220,14 +220,15 @@ done:
static bool take_screenshot_raw(void)
{
unsigned width, height;
size_t pitch;
char screenshot_path[PATH_MAX_LENGTH];
global_t *global = global_get_ptr();
const void *data = global->frame_cache.data;
unsigned width = global->frame_cache.width;
unsigned height = global->frame_cache.height;
int pitch = global->frame_cache.pitch;
const void *data = NULL;
settings_t *settings = config_get_ptr();
const char *screenshot_dir = NULL;
video_driver_cached_frame_get(data, &width, &height, &pitch);
screenshot_dir = settings->screenshot_directory;
@ -283,32 +284,33 @@ bool take_screenshot(void)
if (viewport_read)
ret = take_screenshot_viewport();
else if (global->frame_cache.data &&
(global->frame_cache.data != RETRO_HW_FRAME_BUFFER_VALID))
else if (!video_driver_cached_frame_has_valid_fb())
ret = take_screenshot_raw();
else if (driver->video->read_frame_raw)
{
const void* old_data = global->frame_cache.data;
unsigned old_width = global->frame_cache.width;
unsigned old_height = global->frame_cache.height;
size_t old_pitch = global->frame_cache.pitch;
unsigned old_width, old_height;
size_t old_pitch;
const void* old_data = NULL;
video_driver_cached_frame_get(old_data, &old_width, &old_height,
&old_pitch);
void* frame_data = video_driver_read_frame_raw(
&global->frame_cache.width,
&global->frame_cache.height,
&global->frame_cache.pitch);
&old_width,
&old_height,
&old_pitch);
video_driver_cached_frame_set(old_data, old_width, old_height,
old_pitch);
if (frame_data)
{
global->frame_cache.data = frame_data;
video_driver_cached_frame_set_ptr(frame_data);
ret = take_screenshot_raw();
free(frame_data);
}
else
ret = false;
video_driver_cached_frame_set(old_data,
old_width, old_height, old_pitch);
}
else
{