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

(Vulkan) Style nits

This commit is contained in:
twinaphex 2016-02-29 19:26:57 +01:00
parent ae5d7849af
commit b09a19d9a0
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
menu/drivers_display/menu_display_vulkan.c
View File

@ -74,29 +74,29 @@ static void menu_display_vk_draw(void *data)
if (!vk) if (!vk)
return; return;
texture = (struct vk_texture*)draw->texture; texture = (struct vk_texture*)draw->texture;
mat = (math_matrix_4x4*)draw->matrix_data; mat = (math_matrix_4x4*)draw->matrix_data;
vertex = draw->coords->vertex; vertex = draw->coords->vertex;
tex_coord = draw->coords->tex_coord; tex_coord = draw->coords->tex_coord;
color = draw->coords->color; color = draw->coords->color;
/* TODO - edge case */ /* TODO - edge case */
if (draw->height <= 0) if (draw->height <= 0)
draw->height = 1; draw->height = 1;
if (!mat) if (!mat)
mat = (math_matrix_4x4*)menu_display_vk_get_default_mvp(); mat = (math_matrix_4x4*)menu_display_vk_get_default_mvp();
if (!vertex) if (!vertex)
vertex = &vk_vertexes[0]; vertex = &vk_vertexes[0];
if (!tex_coord) if (!tex_coord)
tex_coord = &vk_tex_coords[0]; tex_coord = &vk_tex_coords[0];
if (!texture) if (!texture)
texture = &vk->display.blank_texture; texture = &vk->display.blank_texture;
vk->vk_vp.x = draw->x; vk->vk_vp.x = draw->x;
vk->vk_vp.y = vk->context->swapchain_height - draw->y - draw->height; vk->vk_vp.y = vk->context->swapchain_height - draw->y - draw->height;
vk->vk_vp.width = draw->width; vk->vk_vp.width = draw->width;
vk->vk_vp.height = draw->height; vk->vk_vp.height = draw->height;
vk->vk_vp.minDepth = 0.0f; vk->vk_vp.minDepth = 0.0f;
vk->vk_vp.maxDepth = 1.0f; vk->vk_vp.maxDepth = 1.0f;
vk->tracker.dirty |= VULKAN_DIRTY_DYNAMIC_BIT; vk->tracker.dirty |= VULKAN_DIRTY_DYNAMIC_BIT;
@ -110,10 +110,10 @@ static void menu_display_vk_draw(void *data)
pv = (struct vk_vertex*)range.data; pv = (struct vk_vertex*)range.data;
for (i = 0; i < draw->coords->vertices; i++, pv++) for (i = 0; i < draw->coords->vertices; i++, pv++)
{ {
pv->x = *vertex++; pv->x = *vertex++;
pv->y = *vertex++; pv->y = *vertex++;
pv->tex_x = *tex_coord++; pv->tex_x = *tex_coord++;
pv->tex_y = *tex_coord++; pv->tex_y = *tex_coord++;
pv->color.r = *color++; pv->color.r = *color++;
pv->color.g = *color++; pv->color.g = *color++;
pv->color.b = *color++; pv->color.b = *color++;
@ -125,7 +125,8 @@ static void menu_display_vk_draw(void *data)
vk->display.pipelines[ vk->display.pipelines[
to_display_pipeline(draw->prim_type, vk->display.blend)], to_display_pipeline(draw->prim_type, vk->display.blend)],
texture, texture,
texture->default_smooth ? vk->samplers.linear : vk->samplers.nearest, texture->default_smooth
? vk->samplers.linear : vk->samplers.nearest,
mat, mat,
&range, &range,
draw->coords->vertices, draw->coords->vertices,
@ -190,7 +191,6 @@ static void menu_display_vk_clear_color(void *data)
VkClearAttachment attachment = { VK_IMAGE_ASPECT_COLOR_BIT }; VkClearAttachment attachment = { VK_IMAGE_ASPECT_COLOR_BIT };
menu_display_ctx_clearcolor_t *clearcolor = menu_display_ctx_clearcolor_t *clearcolor =
(menu_display_ctx_clearcolor_t*)data; (menu_display_ctx_clearcolor_t*)data;
vk_t *vk = vk_get_ptr(); vk_t *vk = vk_get_ptr();
if (!vk || !clearcolor) if (!vk || !clearcolor)
return; return;
@ -201,9 +201,9 @@ static void menu_display_vk_clear_color(void *data)
attachment.clearValue.color.float32[3] = clearcolor->a; attachment.clearValue.color.float32[3] = clearcolor->a;
memset(&rect, 0, sizeof(rect)); memset(&rect, 0, sizeof(rect));
rect.rect.extent.width = vk->context->swapchain_width; rect.rect.extent.width = vk->context->swapchain_width;
rect.rect.extent.height = vk->context->swapchain_height; rect.rect.extent.height = vk->context->swapchain_height;
rect.layerCount = 1; rect.layerCount = 1;
vkCmdClearAttachments(vk->cmd, 1, &attachment, 1, &rect); vkCmdClearAttachments(vk->cmd, 1, &attachment, 1, &rect);
} }