mirror of
https://github.com/CTCaer/RetroArch.git
synced 2025-03-05 18:07:01 +00:00
(360) Have 360 use HAVE_GRIFFIN_OVERRIDE_VIDEO_FRAME_FUNC too
This commit is contained in:
parent
cf5fb8baaa
commit
23f9cf8618
@ -15,6 +15,8 @@
|
||||
* You should have received a copy of the GNU General Public License along with SSNES.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef FILEBROWSER_H_
|
||||
#define FILEBROWSER_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -40,4 +42,6 @@ void filebrowser_new(filebrowser_t * filebrowser, const char * start_dir, const
|
||||
void filebrowser_parse_directory(filebrowser_t * filebrowser, const char * path, const char *extensions);
|
||||
void filebrowser_push_directory(filebrowser_t * filebrowser, const char * path, bool with_extension);
|
||||
|
||||
#define FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(filebrowser) (filebrowser.dir[filebrowser.directory_stack_size])
|
||||
#define FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(filebrowser) (filebrowser.dir[filebrowser.directory_stack_size])
|
||||
|
||||
#endif
|
@ -524,7 +524,9 @@ void menu_loop(void)
|
||||
{
|
||||
g_frame_count++;
|
||||
if(g_console.emulator_initialized)
|
||||
{
|
||||
ssnes_render_cached_frame();
|
||||
}
|
||||
else
|
||||
D3DDevice_Clear(vid->xdk360_render_device, 0, NULL,
|
||||
D3DCLEAR_TARGET, D3DCOLOR_ARGB(255, 32, 32, 64), 1.0, 0, FALSE);
|
||||
|
@ -210,6 +210,12 @@ static void xa_free(void *data)
|
||||
delete xa;
|
||||
}
|
||||
|
||||
static bool xa_use_float(void *data)
|
||||
{
|
||||
(void)data;
|
||||
return false;
|
||||
}
|
||||
|
||||
const audio_driver_t audio_xdk360 = {
|
||||
xa_init,
|
||||
xa_write,
|
||||
@ -217,6 +223,6 @@ const audio_driver_t audio_xdk360 = {
|
||||
xa_start,
|
||||
xa_set_nonblock_state,
|
||||
xa_free,
|
||||
NULL,
|
||||
xa_use_float,
|
||||
"xdk360"
|
||||
};
|
||||
|
@ -19,13 +19,12 @@
|
||||
#define _FUNC_HOOKS_H
|
||||
|
||||
/*============================================================
|
||||
PLAYSTATION3
|
||||
GENERAL
|
||||
============================================================ */
|
||||
#define HAVE_GRIFFIN_OVERRIDE_VIDEO_FRAME_FUNC 1
|
||||
|
||||
#ifdef __CELLOS_LV2__
|
||||
#define ssnes_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, lines_to_pitch(g_extern.frame_cache.height), msg);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifdef __CELLOS_LV2__
|
||||
|
||||
#define HAVE_GRIFFIN_OVERRIDE_AUDIO_FLUSH_FUNC 1
|
||||
#define HAVE_GRIFFIN_OVERRIDE_VIDEO_FRAME_FUNC 1
|
||||
|
||||
static bool audio_flush(const int16_t *data, size_t samples)
|
||||
{
|
||||
|
@ -347,7 +347,6 @@
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\360\menu.cpp" />
|
||||
<ClCompile Include="..\..\console\griffin\griffin.c" />
|
||||
<ClCompile Include="..\..\console\szlib\szlib.c">
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
|
||||
|
@ -15,9 +15,6 @@
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\360">
|
||||
<UniqueIdentifier>{b9371e8d-2e72-4ced-8bf6-6ee6a77a1f78}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Header Files\conf">
|
||||
<UniqueIdentifier>{755ce6db-d242-40fb-9c8b-c14154fc94e1}</UniqueIdentifier>
|
||||
</Filter>
|
||||
@ -41,9 +38,6 @@
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\360\menu.cpp">
|
||||
<Filter>Source Files\360</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\console\szlib\szlib.c">
|
||||
<Filter>Source Files\console\szlib</Filter>
|
||||
</ClCompile>
|
||||
|
Loading…
x
Reference in New Issue
Block a user