mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 11:43:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3/360) Get rid of Griffin override for rarch_render_cached_frame

Browse Source
This commit is contained in:
Twinaphex 2012-06-20 07:39:20 +02:00
parent 0ff97b4213
commit 8bd85e1bfe
3 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
console/griffin/func_hooks.h
View File

@ -1,30 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
* Copyright (C) 2011-2012 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _FUNC_HOOKS_H
#define _FUNC_HOOKS_H
/*============================================================
GENERAL
============================================================ */
#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(GEKKO) || defined(ANDROID)
#define HAVE_GRIFFIN_OVERRIDE_VIDEO_FRAME_FUNC 1
#endif
#define rarch_render_cached_frame() \
const char *msg = msg_queue_pull(g_extern.msg_queue); \
video_frame_func(g_extern.frame_cache.data, g_extern.frame_cache.width, g_extern.frame_cache.height, g_extern.frame_cache.pitch, msg);
#endif

2
console/griffin/griffin.c
View File

@ -46,8 +46,6 @@ CONFIG FILE
#include "../../conf/config_file.c"
#endif
#include "func_hooks.h"
/*============================================================
VIDEO CONTEXT
============================================================ */

6
retroarch.c
View File

@ -259,7 +259,6 @@ static void video_frame(const void *data, unsigned width, unsigned height, size_
#include "console/griffin/rarch_func_hooks.h"
#endif
#ifndef HAVE_GRIFFIN_OVERRIDE_VIDEO_FRAME_FUNC
void rarch_render_cached_frame(void)
{
#ifdef HAVE_FFMPEG
@ -271,19 +270,18 @@ void rarch_render_cached_frame(void)
// Not 100% safe, since the library might have
// freed the memory, but no known implementations do this :D
// It would be really stupid at any rate ...
#ifndef RARCH_CONSOLE
if (g_extern.frame_cache.data)
{
#endif
video_frame(g_extern.frame_cache.data,
g_extern.frame_cache.width,
g_extern.frame_cache.height,
g_extern.frame_cache.pitch);
}
#ifdef HAVE_FFMPEG
g_extern.recording = recording;
#endif
}
#endif
#ifndef HAVE_GRIFFIN_OVERRIDE_AUDIO_FLUSH_FUNC
static bool audio_flush(const int16_t *data, size_t samples)