mirror of
https://github.com/libretro/RetroArch
synced 2025-01-30 12:32:52 +00:00
Fix some PS3 derps
This commit is contained in:
parent
dcf818b40b
commit
cad2eee9e0
@ -52,7 +52,7 @@ static void event_loop(uint64_t data)
|
|||||||
sys_event_queue_t id;
|
sys_event_queue_t id;
|
||||||
sys_ipc_key_t key;
|
sys_ipc_key_t key;
|
||||||
sys_event_t event;
|
sys_event_t event;
|
||||||
ps3_audio_t *aud = data;
|
ps3_audio_t *aud = (ps3_audio_t*)data;
|
||||||
|
|
||||||
cellAudioCreateNotifyEventQueue(&id, &key);
|
cellAudioCreateNotifyEventQueue(&id, &key);
|
||||||
cellAudioSetNotifyEventQueue(key);
|
cellAudioSetNotifyEventQueue(key);
|
||||||
|
@ -709,7 +709,7 @@ void gl_deinit_fbo(gl_t *gl)
|
|||||||
glDeleteTextures(1, &gl->fbo_feedback_texture);
|
glDeleteTextures(1, &gl->fbo_feedback_texture);
|
||||||
|
|
||||||
gl->fbo_feedback_enable = false;
|
gl->fbo_feedback_enable = false;
|
||||||
gl->fbo_feedback_pass = -1;
|
gl->fbo_feedback_pass = -1; /* TODO: this member is unsigned, figure out what it should be */
|
||||||
gl->fbo_feedback_texture = 0;
|
gl->fbo_feedback_texture = 0;
|
||||||
gl->fbo_feedback = 0;
|
gl->fbo_feedback = 0;
|
||||||
}
|
}
|
||||||
|
@ -123,6 +123,49 @@ static bool core_does_not_need_content = false;
|
|||||||
static uint32_t content_crc = 0;
|
static uint32_t content_crc = 0;
|
||||||
|
|
||||||
#ifdef HAVE_COMPRESSION
|
#ifdef HAVE_COMPRESSION
|
||||||
|
/**
|
||||||
|
* filename_split_archive:
|
||||||
|
* @str : filename to turn into a string list
|
||||||
|
*
|
||||||
|
* Creates a new string list based on filename @path, delimited by a hash (#).
|
||||||
|
*
|
||||||
|
* Returns: new string list if successful, otherwise NULL.
|
||||||
|
*/
|
||||||
|
static struct string_list *filename_split_archive(const char *path)
|
||||||
|
{
|
||||||
|
union string_list_elem_attr attr;
|
||||||
|
struct string_list *list = string_list_new();
|
||||||
|
const char *delim = NULL;
|
||||||
|
|
||||||
|
memset(&attr, 0, sizeof(attr));
|
||||||
|
|
||||||
|
delim = path_get_archive_delim(path);
|
||||||
|
|
||||||
|
if (delim)
|
||||||
|
{
|
||||||
|
/* add archive path to list first */
|
||||||
|
if (!string_list_append_n(list, path, delim - path, attr))
|
||||||
|
goto error;
|
||||||
|
|
||||||
|
/* now add the path within the archive */
|
||||||
|
delim++;
|
||||||
|
|
||||||
|
if (*delim)
|
||||||
|
{
|
||||||
|
if (!string_list_append(list, delim, attr))
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if (!string_list_append(list, path, attr))
|
||||||
|
goto error;
|
||||||
|
|
||||||
|
return list;
|
||||||
|
|
||||||
|
error:
|
||||||
|
string_list_free(list);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef HAVE_7ZIP
|
#ifdef HAVE_7ZIP
|
||||||
static bool utf16_to_char(uint8_t **utf_data,
|
static bool utf16_to_char(uint8_t **utf_data,
|
||||||
@ -312,56 +355,6 @@ static int content_7zip_file_read(
|
|||||||
return outsize;
|
return outsize;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_COMPRESSION
|
|
||||||
/**
|
|
||||||
* filename_split_archive:
|
|
||||||
* @str : filename to turn into a string list
|
|
||||||
*
|
|
||||||
* Creates a new string list based on filename @path, delimited by a hash (#).
|
|
||||||
*
|
|
||||||
* Returns: new string list if successful, otherwise NULL.
|
|
||||||
*/
|
|
||||||
static struct string_list *filename_split_archive(const char *path)
|
|
||||||
{
|
|
||||||
union string_list_elem_attr attr;
|
|
||||||
struct string_list *list = string_list_new();
|
|
||||||
#ifdef HAVE_COMPRESSION
|
|
||||||
const char *delim = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
memset(&attr, 0, sizeof(attr));
|
|
||||||
|
|
||||||
#ifdef HAVE_COMPRESSION
|
|
||||||
delim = path_get_archive_delim(path);
|
|
||||||
|
|
||||||
if (delim)
|
|
||||||
{
|
|
||||||
/* add archive path to list first */
|
|
||||||
if (!string_list_append_n(list, path, delim - path, attr))
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
/* now add the path within the archive */
|
|
||||||
delim++;
|
|
||||||
|
|
||||||
if (*delim)
|
|
||||||
{
|
|
||||||
if (!string_list_append(list, delim, attr))
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
if (!string_list_append(list, path, attr))
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
return list;
|
|
||||||
|
|
||||||
error:
|
|
||||||
string_list_free(list);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static struct string_list *compressed_7zip_file_list_new(
|
static struct string_list *compressed_7zip_file_list_new(
|
||||||
const char *path, const char* ext)
|
const char *path, const char* ext)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user