Skip to content

Commit e6bf544

Browse files
MajorPainTheCactusLibretroAdmin
authored andcommitted
Fixed Vulkan driver HDR menu when we're using a HDR native shader
Removed redundant constant buffer
1 parent 091d35c commit e6bf544

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

gfx/drivers/vulkan.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ typedef struct vk
251251
{
252252
vulkan_hdr_uniform_t ubo_values;
253253
struct vk_buffer ubo;
254-
struct vk_buffer ubo_post;
255254
float max_output_nits;
256255
float min_output_nits;
257256
float max_cll;
@@ -3478,7 +3477,6 @@ static void vulkan_free(void *data)
34783477
if (vk->context->flags & VK_CTX_FLAG_HDR_SUPPORT)
34793478
{
34803479
vulkan_destroy_buffer(vk->context->device, &vk->hdr.ubo);
3481-
vulkan_destroy_buffer(vk->context->device, &vk->hdr.ubo_post);
34823480
vulkan_destroy_hdr_buffer(vk->context->device, &vk->main_buffer);
34833481
vulkan_destroy_hdr_buffer(vk->context->device, &vk->readback_image);
34843482
vulkan_deinit_hdr_readback_render_pass(vk);
@@ -3811,8 +3809,7 @@ static void *vulkan_init(const video_info_t *video,
38113809
vulkan_set_viewport(vk, temp_width, temp_height, false, true);
38123810

38133811
#ifdef VULKAN_HDR_SWAPCHAIN
3814-
vk->hdr.ubo = vulkan_create_buffer(vk->context, sizeof(vulkan_hdr_uniform_t), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
3815-
vk->hdr.ubo_post = vulkan_create_buffer(vk->context, sizeof(vulkan_hdr_uniform_t), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
3812+
vk->hdr.ubo = vulkan_create_buffer(vk->context, sizeof(vulkan_hdr_uniform_t), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
38163813

38173814
vk->hdr.ubo_values.mvp = vk->mvp_no_rot;
38183815
vk->hdr.ubo_values.max_nits = settings->floats.video_hdr_max_nits;
@@ -3822,7 +3819,6 @@ static void *vulkan_init(const video_info_t *video,
38223819

38233820
vk->hdr.ubo_values.inverse_tonemap = 1.0f; /* Use this to turn on/off the inverse tonemap */
38243821
vk->hdr.ubo_values.hdr10 = 1.0f; /* Use this to turn on/off the hdr10 */
3825-
38263822
#endif /* VULKAN_HDR_SWAPCHAIN */
38273823

38283824
vulkan_init_hw_render(vk);
@@ -5086,8 +5082,7 @@ static bool vulkan_frame(void *data, const void *frame,
50865082

50875083
#ifdef VULKAN_HDR_SWAPCHAIN
50885084
if ((vk->context->flags & VK_CTX_FLAG_HDR_ENABLE) &&
5089-
(vk->flags & VK_FLAG_MENU_ENABLE) &&
5090-
(!filter_chain || !vulkan_filter_chain_emits_hdr10(filter_chain)))
5085+
(vk->flags & VK_FLAG_MENU_ENABLE))
50915086
{
50925087
vkCmdEndRenderPass(vk->cmd);
50935088

0 commit comments

Comments
 (0)