From 254e0bbd9042eaa182198f5a5d8c4a9aa930bc32 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 21 Feb 2016 10:11:35 +0100 Subject: [PATCH] vulkan_common.h - style nits --- gfx/common/vulkan_common.h | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h index 2288fc96be..5496a3dfd1 100644 --- a/gfx/common/vulkan_common.h +++ b/gfx/common/vulkan_common.h @@ -52,11 +52,14 @@ #include -#include -#include +#include #include #include -#include "boolean.h" +#include +#include +#include +#include + #include "../../driver.h" #include "../../performance.h" #include "../../libretro.h" @@ -66,8 +69,6 @@ #include "../video_context_driver.h" #include "libretro_vulkan.h" #include "../drivers_shader/shader_vulkan.h" -#include -#include enum vk_texture_type { @@ -118,10 +119,14 @@ typedef struct gfx_ctx_vulkan_data { vulkan_context_t context; - PFN_vkGetPhysicalDeviceSurfaceSupportKHR fpGetPhysicalDeviceSurfaceSupportKHR; - PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR fpGetPhysicalDeviceSurfaceCapabilitiesKHR; - PFN_vkGetPhysicalDeviceSurfaceFormatsKHR fpGetPhysicalDeviceSurfaceFormatsKHR; - PFN_vkGetPhysicalDeviceSurfacePresentModesKHR fpGetPhysicalDeviceSurfacePresentModesKHR; + PFN_vkGetPhysicalDeviceSurfaceSupportKHR + fpGetPhysicalDeviceSurfaceSupportKHR; + PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR + fpGetPhysicalDeviceSurfaceCapabilitiesKHR; + PFN_vkGetPhysicalDeviceSurfaceFormatsKHR + fpGetPhysicalDeviceSurfaceFormatsKHR; + PFN_vkGetPhysicalDeviceSurfacePresentModesKHR + fpGetPhysicalDeviceSurfacePresentModesKHR; PFN_vkCreateSwapchainKHR fpCreateSwapchainKHR; PFN_vkDestroySwapchainKHR fpDestroySwapchainKHR; PFN_vkGetSwapchainImagesKHR fpGetSwapchainImagesKHR; @@ -428,7 +433,8 @@ void vulkan_draw_quad(vk_t *vk, const struct vk_draw_quad *quad); */ void vulkan_draw_triangles(vk_t *vk, const struct vk_draw_triangles *call); -void vulkan_image_layout_transition(vk_t *vk, VkCommandBuffer cmd, VkImage image, +void vulkan_image_layout_transition(vk_t *vk, + VkCommandBuffer cmd, VkImage image, VkImageLayout old_layout, VkImageLayout new_layout, VkAccessFlags srcAccess, VkAccessFlags dstAccess, VkPipelineStageFlags srcStages, VkPipelineStageFlags dstStages); @@ -470,8 +476,8 @@ static INLINE void vulkan_write_quad_vbo(struct vk_vertex *pv, for (i = 0; i < 6; i++) { - pv[i].x = x + strip[2 * i + 0] * width; - pv[i].y = y + strip[2 * i + 1] * height; + pv[i].x = x + strip[2 * i + 0] * width; + pv[i].y = y + strip[2 * i + 1] * height; pv[i].tex_x = tex_x + strip[2 * i + 0] * tex_width; pv[i].tex_y = tex_y + strip[2 * i + 1] * tex_height; pv[i].color = *color;