From a18fb406ace8163309a27f948acb85309dfbd312 Mon Sep 17 00:00:00 2001
From: Martin Ejdestig <marejde@gmail.com>
Date: Sat, 22 Jun 2024 13:54:21 +0200
Subject: [PATCH] Backends: Vulkan: Remove Volk/ from volk.h #include
 directives (#7722, #6582, #4854)

---
 backends/imgui_impl_vulkan.h          | 2 +-
 docs/CHANGELOG.txt                    | 4 +++-
 examples/example_glfw_vulkan/main.cpp | 2 +-
 examples/example_sdl2_vulkan/main.cpp | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/backends/imgui_impl_vulkan.h b/backends/imgui_impl_vulkan.h
index c174a6ca1..fb98bfbc4 100644
--- a/backends/imgui_impl_vulkan.h
+++ b/backends/imgui_impl_vulkan.h
@@ -55,7 +55,7 @@
 
 // Vulkan includes
 #ifdef IMGUI_IMPL_VULKAN_USE_VOLK
-#include <Volk/volk.h>
+#include <volk.h>
 #else
 #include <vulkan/vulkan.h>
 #endif
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 35694f47e..eea03be61 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -80,10 +80,12 @@ Other changes:
 - Drag and Drop: Fixes an issue when elapsing payload would be based on last payload
   frame instead of last drag source frame, which makes a difference if not resubmitting
   payload every frame. (#143)
+- Backends: SDL3: Update for API removal of keysym field in SDL_KeyboardEvent. (#7728)
+- Backends: Vulkan: Remove Volk/ from volk.h #include directives. (#7722, #6582, #4854)
+  [@martin-ejdestig]
 - Examples: GLFW+Vulkan, SDL+Vulkan: handle swap chain resize even without Vulkan
   returning VK_SUBOPTIMAL_KHR, which doesn't seem to happen on Wayland. (#7671)
   [@AndreiNego, @ocornut]
-- Backends: SDL3: Update for API removal of keysym field in SDL_KeyboardEvent. (#7728)
 
 
 -----------------------------------------------------------------------
diff --git a/examples/example_glfw_vulkan/main.cpp b/examples/example_glfw_vulkan/main.cpp
index 26012065a..e1f099e3d 100644
--- a/examples/example_glfw_vulkan/main.cpp
+++ b/examples/example_glfw_vulkan/main.cpp
@@ -25,7 +25,7 @@
 // Volk headers
 #ifdef IMGUI_IMPL_VULKAN_USE_VOLK
 #define VOLK_IMPLEMENTATION
-#include <Volk/volk.h>
+#include <volk.h>
 #endif
 
 // [Win32] Our example includes a copy of glfw3.lib pre-compiled with VS2010 to maximize ease of testing and compatibility with old VS compilers.
diff --git a/examples/example_sdl2_vulkan/main.cpp b/examples/example_sdl2_vulkan/main.cpp
index 7f8fd0abb..afcebf1b9 100644
--- a/examples/example_sdl2_vulkan/main.cpp
+++ b/examples/example_sdl2_vulkan/main.cpp
@@ -24,7 +24,7 @@
 // Volk headers
 #ifdef IMGUI_IMPL_VULKAN_USE_VOLK
 #define VOLK_IMPLEMENTATION
-#include <Volk/volk.h>
+#include <volk.h>
 #endif
 
 //#define APP_USE_UNLIMITED_FRAME_RATE