mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 05:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan driver fixes for HDR (#13468)

Browse Source 
* Fixed crash on boot with xmb and vulkan driver Fixed wrong blend state affecting the ribbon shader Fixed up C++ style comments with C style

* Fixed compilation issue - I made a last minute change and thought I had compiled it but obviously hadn't! No wonder it worked.
This commit is contained in:
MajorPainTheCactus 2022-01-10 05:26:02 +00:00 committed by GitHub
parent b3f3bf1e83
commit ad4f6176ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/common/vulkan_common.c
View File

@ -3077,7 +3077,7 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
} }
if (!vk->context.hdr_enable) if (!vk->context.hdr_enable)
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
{ {
for (i = 0; i < format_count; i++) for (i = 0; i < format_count; i++)
{ {
@ -3212,7 +3212,7 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
vk->context.swapchain_height = swapchain_size.height; vk->context.swapchain_height = swapchain_size.height;
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
vk->context.swapchain_colour_space = format.colorSpace; vk->context.swapchain_colour_space = format.colorSpace;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
/* Make sure we create a backbuffer format that is as we expect. */ /* Make sure we create a backbuffer format that is as we expect. */
switch (format.format) switch (format.format)

12
gfx/common/vulkan_common.h
View File

@ -112,7 +112,7 @@ typedef struct ALIGN(16)
float inverse_tonemap; /* 1.0f */ float inverse_tonemap; /* 1.0f */
float hdr10; /* 1.0f */ float hdr10; /* 1.0f */
} vulkan_hdr_uniform_t; } vulkan_hdr_uniform_t;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
typedef struct vulkan_context typedef struct vulkan_context
{ {
@ -132,7 +132,7 @@ typedef struct vulkan_context
VkFormat swapchain_format; VkFormat swapchain_format;
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
VkColorSpaceKHR swapchain_colour_space; VkColorSpaceKHR swapchain_colour_space;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
VkSemaphore swapchain_semaphores[VULKAN_MAX_SWAPCHAIN_IMAGES]; VkSemaphore swapchain_semaphores[VULKAN_MAX_SWAPCHAIN_IMAGES];
VkSemaphore swapchain_acquire_semaphore; VkSemaphore swapchain_acquire_semaphore;
@ -161,7 +161,7 @@ typedef struct vulkan_context
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
bool hdr_enable; bool hdr_enable;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
} vulkan_context_t; } vulkan_context_t;
@ -346,7 +346,7 @@ typedef struct vk
struct vk_image *backbuffer; struct vk_image *backbuffer;
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
struct vk_image main_buffer; struct vk_image main_buffer;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
unsigned video_width; unsigned video_width;
unsigned video_height; unsigned video_height;
@ -397,7 +397,7 @@ typedef struct vk
VkPipeline font; VkPipeline font;
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
VkPipeline hdr; VkPipeline hdr;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
VkDescriptorSetLayout set_layout; VkDescriptorSetLayout set_layout;
VkPipelineLayout layout; VkPipelineLayout layout;
VkPipelineCache cache; VkPipelineCache cache;
@ -420,7 +420,7 @@ typedef struct vk
float max_fall; float max_fall;
bool support; bool support;
} hdr; } hdr;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
struct struct
{ {

75
gfx/drivers/vulkan.c
View File

@ -226,7 +226,7 @@ static void vulkan_init_pipelines(vk_t *vk)
static const uint32_t hdr_frag[] = static const uint32_t hdr_frag[] =
#include "vulkan_shaders/hdr.frag.inc" #include "vulkan_shaders/hdr.frag.inc"
; ;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
static const uint32_t alpha_blend_vert[] = static const uint32_t alpha_blend_vert[] =
#include "vulkan_shaders/alpha_blend.vert.inc" #include "vulkan_shaders/alpha_blend.vert.inc"
@ -449,13 +449,14 @@ static void vulkan_init_pipelines(vk_t *vk)
for (i = 4; i < 6; i++) for (i = 4; i < 6; i++)
{ {
input_assembly.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; input_assembly.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
blend_attachment.blendEnable = false;
vkCreateGraphicsPipelines(vk->context->device, vk->pipelines.cache, vkCreateGraphicsPipelines(vk->context->device, vk->pipelines.cache,
1, &pipe, NULL, &vk->display.pipelines[i]); 1, &pipe, NULL, &vk->display.pipelines[i]);
} }
vkDestroyShaderModule(vk->context->device, shader_stages[1].module, NULL); vkDestroyShaderModule(vk->context->device, shader_stages[1].module, NULL);
#endif // VULKAN_HDR_SWAPCHAIN
blend_attachment.blendEnable = true;
#endif /* VULKAN_HDR_SWAPCHAIN */
vkDestroyShaderModule(vk->context->device, shader_stages[0].module, NULL); vkDestroyShaderModule(vk->context->device, shader_stages[0].module, NULL);
@ -781,7 +782,7 @@ static void vulkan_deinit_pipelines(vk_t *vk)
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
vkDestroyPipeline(vk->context->device, vkDestroyPipeline(vk->context->device,
vk->pipelines.hdr, NULL); vk->pipelines.hdr, NULL);
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
for (i = 0; i < ARRAY_SIZE(vk->display.pipelines); i++) for (i = 0; i < ARRAY_SIZE(vk->display.pipelines); i++)
vkDestroyPipeline(vk->context->device, vkDestroyPipeline(vk->context->device,
@ -818,15 +819,17 @@ static void vulkan_set_hdr_max_nits(void* data, float max_nits)
vk->hdr.max_output_nits = max_nits; vk->hdr.max_output_nits = max_nits;
mapped_ubo->max_nits = max_nits; mapped_ubo->max_nits = max_nits;
//vulkan_set_hdr_metadata( /*
// vk->chain.handle, vulkan_set_hdr_metadata(
// vk->hdr.support, vk->chain.handle,
// vk->chain.bit_depth, vk->hdr.support,
// vk->chain.color_space, vk->chain.bit_depth,
// vk->hdr.max_output_nits, vk->chain.color_space,
// vk->hdr.min_output_nits, vk->hdr.max_output_nits,
// vk->hdr.max_cll, vk->hdr.min_output_nits,
// vk->hdr.max_fall); vk->hdr.max_cll,
vk->hdr.max_fall);
*/
} }
static void vulkan_set_hdr_paper_white_nits(void* data, float paper_white_nits) static void vulkan_set_hdr_paper_white_nits(void* data, float paper_white_nits)
@ -866,7 +869,7 @@ static void vulkan_set_hdr10(vk_t* vk, bool hdr10)
mapped_ubo->hdr10 = hdr10 ? 1.0f : 0.0f; mapped_ubo->hdr10 = hdr10 ? 1.0f : 0.0f;
} }
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
static bool vulkan_init_default_filter_chain(vk_t *vk) static bool vulkan_init_default_filter_chain(vk_t *vk)
{ {
@ -927,7 +930,7 @@ static bool vulkan_init_default_filter_chain(vk_t *vk)
vulkan_set_hdr10(vk, true); vulkan_set_hdr10(vk, true);
} }
} }
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
return true; return true;
} }
@ -988,7 +991,7 @@ static bool vulkan_init_filter_chain_preset(vk_t *vk, const char *shader_path)
vulkan_set_hdr10(vk, true); vulkan_set_hdr10(vk, true);
} }
} }
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
return true; return true;
} }
@ -1141,7 +1144,7 @@ static void vulkan_free(void *data)
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
video_driver_unset_hdr_support(); video_driver_unset_hdr_support();
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
if (vk->ctx_driver && vk->ctx_driver->destroy) if (vk->ctx_driver && vk->ctx_driver->destroy)
vk->ctx_driver->destroy(vk->ctx_data); vk->ctx_driver->destroy(vk->ctx_data);
@ -1364,7 +1367,7 @@ static void *vulkan_init(const video_info_t *video,
vk->hdr.min_output_nits = 0.001f; vk->hdr.min_output_nits = 0.001f;
vk->hdr.max_cll = 0.0f; vk->hdr.max_cll = 0.0f;
vk->hdr.max_fall = 0.0f; vk->hdr.max_fall = 0.0f;
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
vk->video = *video; vk->video = *video;
vk->ctx_driver = ctx_driver; vk->ctx_driver = ctx_driver;
@ -1459,7 +1462,7 @@ static void *vulkan_init(const video_info_t *video,
mapped_ubo->expand_gamut = settings->bools.video_hdr_expand_gamut; mapped_ubo->expand_gamut = settings->bools.video_hdr_expand_gamut;
mapped_ubo->inverse_tonemap = 1.0f; /* Use this to turn on/off the inverse tonemap */ mapped_ubo->inverse_tonemap = 1.0f; /* Use this to turn on/off the inverse tonemap */
mapped_ubo->hdr10 = 1.0f; /* Use this to turn on/off the hdr10 */ mapped_ubo->hdr10 = 1.0f; /* Use this to turn on/off the hdr10 */
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
vulkan_init_hw_render(vk); vulkan_init_hw_render(vk);
vulkan_init_static_resources(vk); vulkan_init_static_resources(vk);
@ -2126,14 +2129,14 @@ static bool vulkan_frame(void *data, const void *frame,
{ {
struct vk_texture *tex = NULL; struct vk_texture *tex = NULL;
#ifdef VULKAN_HDR_SWAPCHIN #if 0 /* VULKAN_HDR_SWAPCHAIN */
if(vk->context->hdr_enable) if(vk->context->hdr_enable)
{ {
tex = &vk->main_buffer.texture; tex = &vk->main_buffer.texture;
vulkan_transition_texture(vk, vk->cmd, tex); vulkan_transition_texture(vk, vk->cmd, tex);
} }
else else
#endif // VULKAN_HDR_SWAPCHIN #endif /* VULKAN_HDR_SWAPCHAIN */
{ {
tex = &vk->swapchain[vk->last_valid_index].texture; tex = &vk->swapchain[vk->last_valid_index].texture;
if (vk->swapchain[vk->last_valid_index].texture_optimal.memory if (vk->swapchain[vk->last_valid_index].texture_optimal.memory
@ -2192,7 +2195,7 @@ static bool vulkan_frame(void *data, const void *frame,
{ {
backbuffer = &vk->main_buffer; backbuffer = &vk->main_buffer;
} }
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
/* Render to backbuffer. */ /* Render to backbuffer. */
if ( (backbuffer->image != VK_NULL_HANDLE) if ( (backbuffer->image != VK_NULL_HANDLE)
@ -2441,7 +2444,7 @@ static bool vulkan_frame(void *data, const void *frame,
vkCmdEndRenderPass(vk->cmd); vkCmdEndRenderPass(vk->cmd);
} }
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
} }
/* End the filter chain frame. /* End the filter chain frame.
@ -2621,7 +2624,7 @@ static bool vulkan_frame(void *data, const void *frame,
if (vk->should_resize || (vk->context->hdr_enable != video_hdr_enable)) if (vk->should_resize || (vk->context->hdr_enable != video_hdr_enable))
#else #else
if (vk->should_resize) if (vk->should_resize)
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
{ {
#ifdef VULKAN_HDR_SWAPCHAIN #ifdef VULKAN_HDR_SWAPCHAIN
vk->context->hdr_enable = video_hdr_enable; vk->context->hdr_enable = video_hdr_enable;
@ -2647,7 +2650,7 @@ static bool vulkan_frame(void *data, const void *frame,
if (img->memory) if (img->memory)
vkFreeMemory(vk->context->device, img->memory, NULL); vkFreeMemory(vk->context->device, img->memory, NULL);
} }
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
gfx_ctx_mode_t mode; gfx_ctx_mode_t mode;
mode.width = width; mode.width = width;
@ -2736,15 +2739,17 @@ static bool vulkan_frame(void *data, const void *frame,
} }
} }
//vulkan_set_hdr_metadata( /*
// vk->hdr.support, vulkan_set_hdr_metadata(
// vk->context->swapchain_format, vk->hdr.support,
// vk->context->swapchain_color_space, vk->context->swapchain_format,
// vk->hdr.max_output_nits, vk->context->swapchain_color_space,
// vk->hdr.min_output_nits, vk->hdr.max_output_nits,
// vk->hdr.max_cll, vk->hdr.min_output_nits,
// vk->hdr.max_fall); vk->hdr.max_cll,
#endif // VULKAN_HDR_SWAPCHAIN vk->hdr.max_fall);
*/
#endif /* VULKAN_HDR_SWAPCHAIN */
vk->should_resize = false; vk->should_resize = false;
} }
@ -3124,7 +3129,7 @@ static const video_poke_interface_t vulkan_poke_interface = {
NULL, /* set_hdr_paper_white_nits */ NULL, /* set_hdr_paper_white_nits */
NULL, /* set_hdr_contrast */ NULL, /* set_hdr_contrast */
NULL /* set_hdr_expand_gamut */ NULL /* set_hdr_expand_gamut */
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
}; };
static void vulkan_get_poke_interface(void *data, static void vulkan_get_poke_interface(void *data,

10
gfx/drivers_display/gfx_display_vulkan.c
View File

@ -73,15 +73,15 @@ static unsigned to_menu_pipeline(
switch (pipeline) switch (pipeline)
{ {
case VIDEO_SHADER_MENU: case VIDEO_SHADER_MENU:
return 4 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP);
case VIDEO_SHADER_MENU_2:
return 6 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP); return 6 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP);
case VIDEO_SHADER_MENU_3: case VIDEO_SHADER_MENU_2:
return 8 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP); return 8 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP);
case VIDEO_SHADER_MENU_4: case VIDEO_SHADER_MENU_3:
return 10 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP); return 10 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP);
case VIDEO_SHADER_MENU_5: case VIDEO_SHADER_MENU_4:
return 12 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP); return 12 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP);
case VIDEO_SHADER_MENU_5:
return 14 + (type == GFX_DISPLAY_PRIM_TRIANGLESTRIP);
default: default:
break; break;
} }

2
gfx/drivers_shader/shader_vulkan.cpp
View File

@ -2742,7 +2742,7 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset(
glslang_format_to_string(output.meta.rt_format), i); glslang_format_to_string(output.meta.rt_format), i);
} }
else else
#endif // VULKAN_HDR_SWAPCHAIN #endif /* VULKAN_HDR_SWAPCHAIN */
{ {
pass_info.rt_format = tmpinfo.swapchain.format; pass_info.rt_format = tmpinfo.swapchain.format;