mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Gfx display driver) Get rid of unused restore_clear_color/clear_color

Browse Source
This commit is contained in:
twinaphex 2020-09-22 04:03:19 +02:00
parent 02985900c8
commit bde4abfe8b
17 changed files with 0 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gfx/drivers_display/gfx_display_ctr.c
View File

@ -137,26 +137,6 @@ static void gfx_display_ctr_draw(gfx_display_ctx_draw_t *draw,
static void gfx_display_ctr_draw_pipeline(gfx_display_ctx_draw_t *draw,
void *data, unsigned video_width, unsigned video_height) { }
static void gfx_display_ctr_restore_clear_color(void)
{
#if 0
ctr_set_clear_color(RGBA8(0x00, 0x00, 0x00, 0xFF));
#endif
}
static void gfx_display_ctr_clear_color(gfx_display_ctx_clearcolor_t *clearcolor, void *data)
{
if (!clearcolor)
return;
#if 0
ctr_set_clear_color(RGBA8((int)(clearcolor->r*255.f),
(int)(clearcolor->g*255.f),
(int)(clearcolor->b*255.f),
(int)(clearcolor->a*255.f)));
ctr_clear_screen();
#endif
}
static bool gfx_display_ctr_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float font_size,
@ -176,8 +156,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_ctr = {
gfx_display_ctr_viewport,
gfx_display_ctr_blend_begin,
gfx_display_ctr_blend_end,
gfx_display_ctr_restore_clear_color,
gfx_display_ctr_clear_color,
gfx_display_ctr_get_default_mvp,
gfx_display_ctr_get_default_vertices,
gfx_display_ctr_get_default_tex_coords,

16
gfx/drivers_display/gfx_display_d3d10.c
View File

@ -237,20 +237,6 @@ static void gfx_display_d3d10_draw_pipeline(gfx_display_ctx_draw_t* draw,
}
}
static void gfx_display_d3d10_restore_clear_color(void) {}
static void gfx_display_d3d10_clear_color(
gfx_display_ctx_clearcolor_t* clearcolor, void *data)
{
d3d10_video_t* d3d10 = (d3d10_video_t*)data;
if (!d3d10 || !clearcolor)
return;
D3D10ClearRenderTargetView(d3d10->device,
d3d10->renderTargetView, (float*)clearcolor);
}
static bool gfx_display_d3d10_font_init_first(
void** font_handle,
void* video_data,
@ -309,8 +295,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d10 = {
gfx_display_d3d10_viewport,
gfx_display_d3d10_blend_begin,
gfx_display_d3d10_blend_end,
gfx_display_d3d10_restore_clear_color,
gfx_display_d3d10_clear_color,
gfx_display_d3d10_get_default_mvp,
gfx_display_d3d10_get_default_vertices,
gfx_display_d3d10_get_default_tex_coords,

17
gfx/drivers_display/gfx_display_d3d11.c
View File

@ -236,21 +236,6 @@ static void gfx_display_d3d11_draw_pipeline(gfx_display_ctx_draw_t *draw,
}
}
static void gfx_display_d3d11_restore_clear_color(void) {}
static void gfx_display_d3d11_clear_color(
gfx_display_ctx_clearcolor_t* clearcolor,
void *data)
{
d3d11_video_t *d3d11 = (d3d11_video_t*)data;
if (!d3d11 || !clearcolor)
return;
D3D11ClearRenderTargetView(d3d11->context,
d3d11->renderTargetView, (float*)clearcolor);
}
static bool gfx_display_d3d11_font_init_first(
void** font_handle,
void* video_data,
@ -311,8 +296,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d11 = {
gfx_display_d3d11_viewport,
gfx_display_d3d11_blend_begin,
gfx_display_d3d11_blend_end,
gfx_display_d3d11_restore_clear_color,
gfx_display_d3d11_clear_color,
gfx_display_d3d11_get_default_mvp,
gfx_display_d3d11_get_default_vertices,
gfx_display_d3d11_get_default_tex_coords,

17
gfx/drivers_display/gfx_display_d3d12.c
View File

@ -258,21 +258,6 @@ static void gfx_display_d3d12_draw_pipeline(gfx_display_ctx_draw_t *draw,
d3d12->queue.cmd, ROOT_ID_UBO, d3d12->ubo_view.BufferLocation);
}
static void gfx_display_d3d12_restore_clear_color(void) {}
static void gfx_display_d3d12_clear_color(
gfx_display_ctx_clearcolor_t* clearcolor, void *data)
{
d3d12_video_t *d3d12 = (d3d12_video_t*)data;
if (!d3d12 || !clearcolor)
return;
D3D12ClearRenderTargetView(
d3d12->queue.cmd, d3d12->chain.desc_handles[d3d12->chain.frame_index], (float*)clearcolor,
0, NULL);
}
static bool gfx_display_d3d12_font_init_first(
void** font_handle,
void* video_data,
@ -331,8 +316,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d12 = {
gfx_display_d3d12_viewport,
gfx_display_d3d12_blend_begin,
gfx_display_d3d12_blend_end,
gfx_display_d3d12_restore_clear_color,
gfx_display_d3d12_clear_color,
gfx_display_d3d12_get_default_mvp,
gfx_display_d3d12_get_default_vertices,
gfx_display_d3d12_get_default_tex_coords,

22
gfx/drivers_display/gfx_display_d3d8.c
View File

@ -222,26 +222,6 @@ static void gfx_display_d3d8_draw(gfx_display_ctx_draw_t *draw,
static void gfx_display_d3d8_draw_pipeline(gfx_display_ctx_draw_t *draw,
void *data, unsigned video_width, unsigned video_height) { }
static void gfx_display_d3d8_restore_clear_color(void) { }
static void gfx_display_d3d8_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor, void *data)
{
DWORD clear_color = 0;
d3d8_video_t *d3d = (d3d8_video_t*)data;
if (!d3d || !clearcolor)
return;
clear_color = D3DCOLOR_ARGB(
BYTE_CLAMP(clearcolor->a * 255.0f), /* A */
BYTE_CLAMP(clearcolor->r * 255.0f), /* R */
BYTE_CLAMP(clearcolor->g * 255.0f), /* G */
BYTE_CLAMP(clearcolor->b * 255.0f) /* B */
);
d3d8_clear(d3d->dev, 0, NULL, D3D_COMM_CLEAR_TARGET, clear_color, 0, 0);
}
static bool gfx_display_d3d8_font_init_first(
void **font_handle, void *video_data,
@ -263,8 +243,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d8 = {
gfx_display_d3d8_viewport,
gfx_display_d3d8_blend_begin,
gfx_display_d3d8_blend_end,
gfx_display_d3d8_restore_clear_color,
gfx_display_d3d8_clear_color,
gfx_display_d3d8_get_default_mvp,
gfx_display_d3d8_get_default_vertices,
gfx_display_d3d8_get_default_tex_coords,

30
gfx/drivers_display/gfx_display_d3d9.c
View File

@ -258,34 +258,6 @@ static void gfx_display_d3d9_draw_pipeline(gfx_display_ctx_draw_t *draw,
#endif
}
static void gfx_display_d3d9_restore_clear_color(void)
{
/* not needed */
}
static void gfx_display_d3d9_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor,
void *data)
{
LPDIRECT3DDEVICE9 dev;
DWORD clear_color = 0;
d3d9_video_t *d3d = (d3d9_video_t*)data;
if (!d3d || !clearcolor)
return;
dev = (LPDIRECT3DDEVICE9)d3d->dev;
clear_color = D3DCOLOR_ARGB(
BYTE_CLAMP(clearcolor->a * 255.0f), /* A */
BYTE_CLAMP(clearcolor->r * 255.0f), /* R */
BYTE_CLAMP(clearcolor->g * 255.0f), /* G */
BYTE_CLAMP(clearcolor->b * 255.0f) /* B */
);
d3d9_clear(dev, 0, NULL, D3D_COMM_CLEAR_TARGET, clear_color, 0, 0);
}
static bool gfx_display_d3d9_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float menu_font_size,
@ -342,8 +314,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d9 = {
gfx_display_d3d9_viewport,
gfx_display_d3d9_blend_begin,
gfx_display_d3d9_blend_end,
gfx_display_d3d9_restore_clear_color,
gfx_display_d3d9_clear_color,
gfx_display_d3d9_get_default_mvp,
gfx_display_d3d9_get_default_vertices,
gfx_display_d3d9_get_default_tex_coords,

12
gfx/drivers_display/gfx_display_gdi.c
View File

@ -109,16 +109,6 @@ static void gfx_display_gdi_draw(gfx_display_ctx_draw_t *draw,
static void gfx_display_gdi_draw_pipeline(gfx_display_ctx_draw_t *draw,
void *data, unsigned video_width, unsigned video_height) { }
static void gfx_display_gdi_viewport(gfx_display_ctx_draw_t *draw, void *data) { }
static void gfx_display_gdi_restore_clear_color(void) { }
static void gfx_display_gdi_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor,
void *data)
{
(void)clearcolor;
gfx_display_gdi_restore_clear_color();
}
static bool gfx_display_gdi_font_init_first(
void **font_handle, void *video_data,
@ -152,8 +142,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_gdi = {
gfx_display_gdi_viewport,
gfx_display_gdi_blend_begin,
gfx_display_gdi_blend_end,
gfx_display_gdi_restore_clear_color,
gfx_display_gdi_clear_color,
gfx_display_gdi_get_default_mvp,
gfx_display_gdi_get_default_vertices,
gfx_display_gdi_get_default_tex_coords,

19
gfx/drivers_display/gfx_display_gl.c
View File

@ -337,23 +337,6 @@ static void gfx_display_gl_draw_pipeline(
#endif
}
static void gfx_display_gl_restore_clear_color(void)
{
glClearColor(0.0f, 0.0f, 0.0f, 0.00f);
}
static void gfx_display_gl_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor,
void *data)
{
if (!clearcolor)
return;
glClearColor(clearcolor->r,
clearcolor->g, clearcolor->b, clearcolor->a);
glClear(GL_COLOR_BUFFER_BIT);
}
static bool gfx_display_gl_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float menu_font_size,
@ -408,8 +391,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_gl = {
gfx_display_gl_viewport,
gfx_display_gl_blend_begin,
gfx_display_gl_blend_end,
gfx_display_gl_restore_clear_color,
gfx_display_gl_clear_color,
gfx_display_gl_get_default_mvp,
gfx_display_gl_get_default_vertices,
gfx_display_gl_get_default_tex_coords,

19
gfx/drivers_display/gfx_display_gl1.c
View File

@ -174,23 +174,6 @@ static void gfx_display_gl1_draw(gfx_display_ctx_draw_t *draw,
gl1->coords.color = gl1->white_color_ptr;
}
static void gfx_display_gl1_restore_clear_color(void)
{
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
}
static void gfx_display_gl1_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor,
void *data)
{
if (!clearcolor)
return;
glClearColor(clearcolor->r,
clearcolor->g, clearcolor->b, clearcolor->a);
glClear(GL_COLOR_BUFFER_BIT);
}
static bool gfx_display_gl1_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float menu_font_size,
@ -230,8 +213,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_gl1 = {
gfx_display_gl1_viewport,
gfx_display_gl1_blend_begin,
gfx_display_gl1_blend_end,
gfx_display_gl1_restore_clear_color,
gfx_display_gl1_clear_color,
gfx_display_gl1_get_default_mvp,
gfx_display_gl1_get_default_vertices,
gfx_display_gl1_get_default_tex_coords,

18
gfx/drivers_display/gfx_display_gl_core.c
View File

@ -280,22 +280,6 @@ static void gfx_display_gl_core_draw(gfx_display_ctx_draw_t *draw,
glBindTexture(GL_TEXTURE_2D, 0);
}
static void gfx_display_gl_core_restore_clear_color(void)
{
glClearColor(0.0f, 0.0f, 0.0f, 0.00f);
}
static void gfx_display_gl_core_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor,
void *data)
{
if (!clearcolor)
return;
glClearColor(clearcolor->r, clearcolor->g, clearcolor->b, clearcolor->a);
glClear(GL_COLOR_BUFFER_BIT);
}
static void gfx_display_gl_core_blend_begin(void *data)
{
gl_core_t *gl = (gl_core_t*)data;
@ -349,8 +333,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_gl_core = {
gfx_display_gl_core_viewport,
gfx_display_gl_core_blend_begin,
gfx_display_gl_core_blend_end,
gfx_display_gl_core_restore_clear_color,
gfx_display_gl_core_clear_color,
gfx_display_gl_core_get_default_mvp,
gfx_display_gl_core_get_default_vertices,
gfx_display_gl_core_get_default_tex_coords,

16
gfx/drivers_display/gfx_display_metal.m
View File

@ -115,20 +115,6 @@ static void gfx_display_metal_scissor_end(void *data,
[md.display clearScissorRect];
}
/* Nothing to do */
static void gfx_display_metal_restore_clear_color(void) { }
static void gfx_display_metal_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor,
void *data)
{
MetalDriver *md = (__bridge MetalDriver *)data;
if (!md)
return;
md.display.clearColor = MTLClearColorMake(clearcolor->r, clearcolor->g, clearcolor->b, clearcolor->a);
}
static bool gfx_display_metal_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float font_size,
@ -152,8 +138,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_metal = {
.viewport = gfx_display_metal_viewport,
.blend_begin = gfx_display_metal_blend_begin,
.blend_end = gfx_display_metal_blend_end,
.restore_clear_color = gfx_display_metal_restore_clear_color,
.clear_color = gfx_display_metal_clear_color,
.get_default_mvp = gfx_display_metal_get_default_mvp,
.get_default_vertices = gfx_display_metal_get_default_vertices,
.get_default_tex_coords = gfx_display_metal_get_default_tex_coords,

5
gfx/drivers_display/gfx_display_switch.c
View File

@ -32,9 +32,6 @@ static void gfx_display_switch_draw_pipeline(
void *data, unsigned video_width, unsigned video_height) { }
static void gfx_display_switch_viewport(gfx_display_ctx_draw_t *draw,
void *data) { }
static void gfx_display_switch_restore_clear_color(void) { }
static void gfx_display_switch_clear_color(gfx_display_ctx_clearcolor_t *clearcolor, void *data) { }
static bool gfx_display_switch_font_init_first(
void **font_handle, void *video_data,
@ -67,8 +64,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_switch = {
gfx_display_switch_viewport,
gfx_display_switch_blend_begin,
gfx_display_switch_blend_end,
gfx_display_switch_restore_clear_color,
gfx_display_switch_clear_color,
gfx_display_switch_get_default_mvp,
gfx_display_switch_get_default_vertices,
gfx_display_switch_get_default_tex_coords,

19
gfx/drivers_display/gfx_display_vita2d.c
View File

@ -145,23 +145,6 @@ static void gfx_display_vita2d_draw(gfx_display_ctx_draw_t *draw,
static void gfx_display_vita2d_draw_pipeline(gfx_display_ctx_draw_t *draw,
void *data, unsigned video_width, unsigned video_height) { }
static void gfx_display_vita2d_restore_clear_color(void)
{
vita2d_set_clear_color(RGBA8(0x00, 0x00, 0x00, 0xFF));
}
static void gfx_display_vita2d_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor, void *data)
{
if (!clearcolor)
return;
vita2d_set_clear_color(RGBA8((int)(clearcolor->r*255.f),
(int)(clearcolor->g*255.f),
(int)(clearcolor->b*255.f),
(int)(clearcolor->a*255.f)));
vita2d_draw_rectangle(0,0,PSP_FB_WIDTH,PSP_FB_HEIGHT, vita2d_get_clear_color());
}
static bool gfx_display_vita2d_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float font_size,
@ -202,8 +185,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_vita2d = {
gfx_display_vita2d_viewport,
gfx_display_vita2d_blend_begin,
gfx_display_vita2d_blend_end,
gfx_display_vita2d_restore_clear_color,
gfx_display_vita2d_clear_color,
gfx_display_vita2d_get_default_mvp,
gfx_display_vita2d_get_default_vertices,
gfx_display_vita2d_get_default_tex_coords,

33
gfx/drivers_display/gfx_display_vulkan.c
View File

@ -286,37 +286,6 @@ static void gfx_display_vk_draw(gfx_display_ctx_draw_t *draw,
}
}
static void gfx_display_vk_restore_clear_color(void)
{
}
static void gfx_display_vk_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor,
void *data)
{
VkClearRect rect;
VkClearAttachment attachment;
vk_t *vk = (vk_t*)data;
if (!vk || !clearcolor)
return;
attachment.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
attachment.colorAttachment = 0;
attachment.clearValue.color.float32[0] = clearcolor->r;
attachment.clearValue.color.float32[1] = clearcolor->g;
attachment.clearValue.color.float32[2] = clearcolor->b;
attachment.clearValue.color.float32[3] = clearcolor->a;
rect.rect.offset.x = 0;
rect.rect.offset.y = 0;
rect.rect.extent.width = vk->context->swapchain_width;
rect.rect.extent.height = vk->context->swapchain_height;
rect.baseArrayLayer = 0;
rect.layerCount = 1;
vkCmdClearAttachments(vk->cmd, 1, &attachment, 1, &rect);
}
static void gfx_display_vk_blend_begin(void *data)
{
vk_t *vk = (vk_t*)data;
@ -381,8 +350,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_vulkan = {
gfx_display_vk_viewport,
gfx_display_vk_blend_begin,
gfx_display_vk_blend_end,
gfx_display_vk_restore_clear_color,
gfx_display_vk_clear_color,
gfx_display_vk_get_default_mvp,
gfx_display_vk_get_default_vertices,
gfx_display_vk_get_default_tex_coords,

24
gfx/drivers_display/gfx_display_wiiu.c
View File

@ -266,28 +266,6 @@ static void gfx_display_wiiu_draw_pipeline(gfx_display_ctx_draw_t *draw,
GX2SetPixelUniformBlock(1, sizeof(*wiiu->menu_shader_ubo), wiiu->menu_shader_ubo);
}
static void gfx_display_wiiu_restore_clear_color(void)
{
#if 0
wiiu_set_clear_color(RGBA8(0x00, 0x00, 0x00, 0xFF));
#endif
}
static void gfx_display_wiiu_clear_color(
gfx_display_ctx_clearcolor_t *clearcolor,
void *data)
{
if (!clearcolor)
return;
#if 0
wiiu_set_clear_color(RGBA8((int)(clearcolor->r*255.f),
(int)(clearcolor->g*255.f),
(int)(clearcolor->b*255.f),
(int)(clearcolor->a*255.f)));
wiiu_clear_screen();
#endif
}
static bool gfx_display_wiiu_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float font_size,
@ -326,8 +304,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_wiiu = {
gfx_display_wiiu_viewport,
gfx_display_wiiu_blend_begin,
gfx_display_wiiu_blend_end,
gfx_display_wiiu_restore_clear_color,
gfx_display_wiiu_clear_color,
gfx_display_wiiu_get_default_mvp,
gfx_display_wiiu_get_default_vertices,
gfx_display_wiiu_get_default_tex_coords,

4
gfx/gfx_display.c
View File

@ -49,8 +49,6 @@ static void gfx_display_null_draw(gfx_display_ctx_draw_t *draw,
static void gfx_display_null_draw_pipeline(gfx_display_ctx_draw_t *draw,
void *data, unsigned width, unsigned height) { }
static void gfx_display_null_viewport(gfx_display_ctx_draw_t *draw, void *data) { }
static void gfx_display_null_restore_clear_color(void) { }
static void gfx_display_null_clear_color(gfx_display_ctx_clearcolor_t *clearcolor, void *data) { }
static bool gfx_display_null_font_init_first(
void **font_handle, void *video_data,
@ -84,8 +82,6 @@ gfx_display_ctx_driver_t gfx_display_ctx_null = {
gfx_display_null_viewport,
gfx_display_null_blend_begin,
gfx_display_null_blend_end,
gfx_display_null_restore_clear_color,
gfx_display_null_clear_color,
gfx_display_null_get_default_mvp,
gfx_display_null_get_default_vertices,
gfx_display_null_get_default_tex_coords,

13
gfx/gfx_display.h
View File

@ -89,14 +89,6 @@ enum gfx_display_driver_type
GFX_VIDEO_DRIVER_SWITCH
};
typedef struct gfx_display_ctx_clearcolor
{
float r;
float g;
float b;
float a;
} gfx_display_ctx_clearcolor_t;
typedef struct gfx_display_frame_info
{
bool shadows_enable;
@ -118,11 +110,6 @@ typedef struct gfx_display_ctx_driver
void (*blend_begin)(void *data);
/* Finish blending operation. */
void (*blend_end)(void *data);
/* Set the clear color back to its default values. */
void (*restore_clear_color)(void);
/* Set the color to be used when clearing the screen */
void (*clear_color)(gfx_display_ctx_clearcolor_t *clearcolor,
void *data);
/* Get the default Model-View-Projection matrix */
void *(*get_default_mvp)(void *data);
/* Get the default vertices matrix */