ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change function prototype for scissor_end

This commit is contained in:
twinaphex 2018-09-28 22:52:00 +02:00
parent 4a305a8652
commit b0dd64c9f3
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers_display/menu_display_gl.c
View File

@ -257,7 +257,7 @@ static void menu_display_gl_scissor_begin(video_frame_info_t *video_info, int x,
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
} }
static void menu_display_gl_scissor_end(void) static void menu_display_gl_scissor_end(video_frame_info_t *video_info)
{ {
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
} }

12
menu/drivers_display/menu_display_vulkan.c
View File

@ -360,9 +360,17 @@ static void menu_display_vk_scissor_begin(video_frame_info_t *video_info,
vkCmdSetScissor (vk->cmd, 0, 1, &sci); vkCmdSetScissor (vk->cmd, 0, 1, &sci);
} }
static void menu_display_vk_scissor_end(void) static void menu_display_vk_scissor_end(video_frame_info_t *video_info)
{ {
/* Can remain a stub for Vulkan */ VkRect2D sci;
vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL;
sci.offset.x = 0;
sci.offset.y = 0;
sci.extent.width = video_info->width;
sci.extent.height = video_info->height;
vkCmdSetScissor (vk->cmd, 0, 1, &sci);
} }
menu_display_ctx_driver_t menu_display_ctx_vulkan = { menu_display_ctx_driver_t menu_display_ctx_vulkan = {

2
menu/drivers_display/menu_display_wiiu.c
View File

@ -334,7 +334,7 @@ static void menu_display_wiiu_scissor_begin(video_frame_info_t *video_info, int
GX2SetScissor(max(x, 0), max(video_info->height - y - height, 0), min(width, video_info->width), min(height, video_info->height)); GX2SetScissor(max(x, 0), max(video_info->height - y - height, 0), min(width, video_info->width), min(height, video_info->height));
} }
static void menu_display_wiiu_scissor_end(void) static void menu_display_wiiu_scissor_end(video_frame_info_t *video_info)
{ {
GX2SetScissor(0, 0, video_info->width, video_info->height); GX2SetScissor(0, 0, video_info->width, video_info->height);
} }

4
menu/menu_driver.c
View File

@ -393,10 +393,10 @@ void menu_display_scissor_begin(video_frame_info_t *video_info, int x, int y, un
} }
/* End scissoring operation */ /* End scissoring operation */
void menu_display_scissor_end() void menu_display_scissor_end(video_frame_info_t *video_info)
{ {
if (menu_disp && menu_disp->scissor_end) if (menu_disp && menu_disp->scissor_end)
menu_disp->scissor_end(); menu_disp->scissor_end(video_info);
} }
/* Teardown; deinitializes and frees all /* Teardown; deinitializes and frees all

4
menu/menu_driver.h
View File

@ -379,7 +379,7 @@ typedef struct menu_display_ctx_driver
bool handles_transform; bool handles_transform;
/* Enables and disables scissoring */ /* Enables and disables scissoring */
void (*scissor_begin)(video_frame_info_t *video_info, int x, int y, unsigned width, unsigned height); void (*scissor_begin)(video_frame_info_t *video_info, int x, int y, unsigned width, unsigned height);
void (*scissor_end)(void); void (*scissor_end)(video_frame_info_t *video_info);
} menu_display_ctx_driver_t; } menu_display_ctx_driver_t;
@ -686,7 +686,7 @@ void menu_display_blend_begin(video_frame_info_t *video_info);
void menu_display_blend_end(video_frame_info_t *video_info); void menu_display_blend_end(video_frame_info_t *video_info);
void menu_display_scissor_begin(video_frame_info_t *video_info, int x, int y, unsigned width, unsigned height); void menu_display_scissor_begin(video_frame_info_t *video_info, int x, int y, unsigned width, unsigned height);
void menu_display_scissor_end(void); void menu_display_scissor_end(video_frame_info_t *video_info);
void menu_display_font_free(font_data_t *font); void menu_display_font_free(font_data_t *font);