mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move get_proc_address/get_current_framebuffer to gfx/video_driver.c

Browse Source
This commit is contained in:
twinaphex 2015-01-19 04:19:30 +01:00
parent 3ec9005c5c
commit bb481a158c
5 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
driver.c
View File

@ -261,32 +261,6 @@ void driver_set_nonblock_state(bool enable)
g_extern.audio_data.block_chunk_size; g_extern.audio_data.block_chunk_size;
} }
/**
* driver_get_current_framebuffer:
*
* Gets pointer to current hardware renderer framebuffer object.
* Used by RETRO_ENVIRONMENT_SET_HW_RENDER.
*
* Returns: pointer to hardware framebuffer object, otherwise 0.
**/
uintptr_t driver_get_current_framebuffer(void)
{
#ifdef HAVE_FBO
if (driver.video_poke && driver.video_poke->get_current_framebuffer)
return driver.video_poke->get_current_framebuffer(driver.video_data);
#endif
return 0;
}
retro_proc_address_t driver_get_proc_address(const char *sym)
{
#ifdef HAVE_FBO
if (driver.video_poke && driver.video_poke->get_proc_address)
return driver.video_poke->get_proc_address(driver.video_data, sym);
#endif
return NULL;
}
/** /**
* driver_update_system_av_info: * driver_update_system_av_info:
* @info : pointer to new A/V info * @info : pointer to new A/V info

12
driver.h
View File

@ -368,18 +368,6 @@ void driver_set_nonblock_state(bool enable);
**/ **/
void driver_set_refresh_rate(float hz); void driver_set_refresh_rate(float hz);
/**
* driver_get_current_framebuffer:
*
* Gets pointer to current hardware renderer framebuffer object.
* Used by RETRO_ENVIRONMENT_SET_HW_RENDER.
*
* Returns: pointer to hardware framebuffer object, otherwise 0.
**/
uintptr_t driver_get_current_framebuffer(void);
retro_proc_address_t driver_get_proc_address(const char *sym);
/** /**
* driver_update_system_av_info: * driver_update_system_av_info:
* @info : pointer to new A/V info * @info : pointer to new A/V info

4
dynamic.c
View File

@ -933,8 +933,8 @@ bool rarch_environment_cb(unsigned cmd, void *data)
RARCH_LOG("Requesting unknown context.\n"); RARCH_LOG("Requesting unknown context.\n");
return false; return false;
} }
cb->get_current_framebuffer = driver_get_current_framebuffer; cb->get_current_framebuffer = video_driver_get_current_framebuffer;
cb->get_proc_address = driver_get_proc_address; cb->get_proc_address = video_driver_get_proc_address;
if (cmd & RETRO_ENVIRONMENT_EXPERIMENTAL) /* Old ABI. Don't copy garbage. */ if (cmd & RETRO_ENVIRONMENT_EXPERIMENTAL) /* Old ABI. Don't copy garbage. */
memcpy(&g_extern.system.hw_render_callback, memcpy(&g_extern.system.hw_render_callback,

26
gfx/video_driver.c
View File

@ -188,3 +188,29 @@ void *driver_video_resolve(const video_driver_t **drv)
return driver.video_data; return driver.video_data;
} }
/**
* video_driver_get_current_framebuffer:
*
* Gets pointer to current hardware renderer framebuffer object.
* Used by RETRO_ENVIRONMENT_SET_HW_RENDER.
*
* Returns: pointer to hardware framebuffer object, otherwise 0.
**/
uintptr_t video_driver_get_current_framebuffer(void)
{
#ifdef HAVE_FBO
if (driver.video_poke && driver.video_poke->get_current_framebuffer)
return driver.video_poke->get_current_framebuffer(driver.video_data);
#endif
return 0;
}
retro_proc_address_t video_driver_get_proc_address(const char *sym)
{
#ifdef HAVE_FBO
if (driver.video_poke && driver.video_poke->get_proc_address)
return driver.video_poke->get_proc_address(driver.video_data, sym);
#endif
return NULL;
}

12
gfx/video_driver.h
View File

@ -228,6 +228,18 @@ void find_video_driver(void);
**/ **/
void *driver_video_resolve(const video_driver_t **drv); void *driver_video_resolve(const video_driver_t **drv);
/**
* video_driver_get_current_framebuffer:
*
* Gets pointer to current hardware renderer framebuffer object.
* Used by RETRO_ENVIRONMENT_SET_HW_RENDER.
*
* Returns: pointer to hardware framebuffer object, otherwise 0.
**/
uintptr_t video_driver_get_current_framebuffer(void);
retro_proc_address_t video_driver_get_proc_address(const char *sym);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif