From 17737825757b059dff25ee1ce930a318b53e8765 Mon Sep 17 00:00:00 2001 From: BearOso Date: Sat, 10 Aug 2024 17:41:47 -0500 Subject: [PATCH] Move vulkan to common/video. --- common/video/opengl/shaders/glsl.cpp | 2 +- common/video/opengl/shaders/glsl.h | 2 +- .../video}/std_chrono_throttle.cpp | 0 .../video}/std_chrono_throttle.hpp | 0 .../video/vulkan}/slang_helpers.cpp | 0 .../video/vulkan}/slang_helpers.hpp | 0 .../video/vulkan}/slang_preset.cpp | 6 +- .../video/vulkan}/slang_preset.hpp | 0 .../video/vulkan}/slang_preset_ini.cpp | 0 .../video/vulkan}/slang_preset_ini.hpp | 0 .../video/vulkan}/slang_preset_test.cpp | 0 .../video/vulkan}/slang_shader.cpp | 6 +- .../video/vulkan}/slang_shader.hpp | 0 .../vulkan}/vk_mem_alloc_implementation.cpp | 0 .../video/vulkan}/vulkan_context.cpp | 0 .../video/vulkan}/vulkan_context.hpp | 4 +- .../video/vulkan}/vulkan_hpp_storage.cpp | 0 .../video/vulkan}/vulkan_hpp_wrapper.hpp | 0 .../video/vulkan}/vulkan_pipeline_image.cpp | 0 .../video/vulkan}/vulkan_pipeline_image.hpp | 0 .../video/vulkan}/vulkan_shader_chain.cpp | 0 .../video/vulkan}/vulkan_shader_chain.hpp | 0 .../video/vulkan}/vulkan_simple_output.cpp | 0 .../video/vulkan}/vulkan_simple_output.hpp | 0 .../video/vulkan}/vulkan_slang_pipeline.cpp | 0 .../video/vulkan}/vulkan_slang_pipeline.hpp | 2 +- .../video/vulkan}/vulkan_swapchain.cpp | 0 .../video/vulkan}/vulkan_swapchain.hpp | 2 +- .../video/vulkan}/vulkan_texture.cpp | 0 .../video/vulkan}/vulkan_texture.hpp | 0 gtk/CMakeLists.txt | 72 +++++++++---------- gtk/src/gtk_display_driver_opengl.h | 2 +- gtk/src/gtk_display_driver_vulkan.h | 8 +-- qt/CMakeLists.txt | 52 +++++++------- qt/src/EmuCanvas.hpp | 2 +- qt/src/EmuCanvasVulkan.cpp | 1 - qt/src/EmuCanvasVulkan.hpp | 4 +- 37 files changed, 82 insertions(+), 83 deletions(-) rename {vulkan => common/video}/std_chrono_throttle.cpp (100%) rename {vulkan => common/video}/std_chrono_throttle.hpp (100%) rename {vulkan => common/video/vulkan}/slang_helpers.cpp (100%) rename {vulkan => common/video/vulkan}/slang_helpers.hpp (100%) rename {vulkan => common/video/vulkan}/slang_preset.cpp (99%) rename {vulkan => common/video/vulkan}/slang_preset.hpp (100%) rename {vulkan => common/video/vulkan}/slang_preset_ini.cpp (100%) rename {vulkan => common/video/vulkan}/slang_preset_ini.hpp (100%) rename {vulkan => common/video/vulkan}/slang_preset_test.cpp (100%) rename {vulkan => common/video/vulkan}/slang_shader.cpp (97%) rename {vulkan => common/video/vulkan}/slang_shader.hpp (100%) rename {vulkan => common/video/vulkan}/vk_mem_alloc_implementation.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_context.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_context.hpp (93%) rename {vulkan => common/video/vulkan}/vulkan_hpp_storage.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_hpp_wrapper.hpp (100%) rename {vulkan => common/video/vulkan}/vulkan_pipeline_image.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_pipeline_image.hpp (100%) rename {vulkan => common/video/vulkan}/vulkan_shader_chain.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_shader_chain.hpp (100%) rename {vulkan => common/video/vulkan}/vulkan_simple_output.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_simple_output.hpp (100%) rename {vulkan => common/video/vulkan}/vulkan_slang_pipeline.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_slang_pipeline.hpp (95%) rename {vulkan => common/video/vulkan}/vulkan_swapchain.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_swapchain.hpp (97%) rename {vulkan => common/video/vulkan}/vulkan_texture.cpp (100%) rename {vulkan => common/video/vulkan}/vulkan_texture.hpp (100%) diff --git a/common/video/opengl/shaders/glsl.cpp b/common/video/opengl/shaders/glsl.cpp index 8056ea79..05a5a51a 100644 --- a/common/video/opengl/shaders/glsl.cpp +++ b/common/video/opengl/shaders/glsl.cpp @@ -11,7 +11,7 @@ #include #include "glsl.h" #include "shader_helpers.h" -#include "vulkan/slang_helpers.hpp" +#include "common/video/vulkan/slang_helpers.hpp" #include "shader_platform.h" #ifndef _MSC_VER #include diff --git a/common/video/opengl/shaders/glsl.h b/common/video/opengl/shaders/glsl.h index 73669b91..d3c612d1 100644 --- a/common/video/opengl/shaders/glsl.h +++ b/common/video/opengl/shaders/glsl.h @@ -8,7 +8,7 @@ #define __GLSL_H #include "snes9x.h" -#include "vulkan/slang_preset_ini.hpp" +#include "common/video/vulkan/slang_preset_ini.hpp" #include "shader_platform.h" #include #include diff --git a/vulkan/std_chrono_throttle.cpp b/common/video/std_chrono_throttle.cpp similarity index 100% rename from vulkan/std_chrono_throttle.cpp rename to common/video/std_chrono_throttle.cpp diff --git a/vulkan/std_chrono_throttle.hpp b/common/video/std_chrono_throttle.hpp similarity index 100% rename from vulkan/std_chrono_throttle.hpp rename to common/video/std_chrono_throttle.hpp diff --git a/vulkan/slang_helpers.cpp b/common/video/vulkan/slang_helpers.cpp similarity index 100% rename from vulkan/slang_helpers.cpp rename to common/video/vulkan/slang_helpers.cpp diff --git a/vulkan/slang_helpers.hpp b/common/video/vulkan/slang_helpers.hpp similarity index 100% rename from vulkan/slang_helpers.hpp rename to common/video/vulkan/slang_helpers.hpp diff --git a/vulkan/slang_preset.cpp b/common/video/vulkan/slang_preset.cpp similarity index 99% rename from vulkan/slang_preset.cpp rename to common/video/vulkan/slang_preset.cpp index bdb63c3e..69362ae2 100644 --- a/vulkan/slang_preset.cpp +++ b/common/video/vulkan/slang_preset.cpp @@ -1,5 +1,5 @@ #include "slang_preset.hpp" -#include "../external/SPIRV-Cross/spirv.hpp" +#include "external/SPIRV-Cross/spirv.hpp" #include "slang_helpers.hpp" #include "slang_preset_ini.hpp" @@ -12,8 +12,8 @@ #include #include #include -#include "../external/SPIRV-Cross/spirv_cross.hpp" -#include "../external/SPIRV-Cross/spirv_glsl.hpp" +#include "external/SPIRV-Cross/spirv_cross.hpp" +#include "external/SPIRV-Cross/spirv_glsl.hpp" #include "slang_shader.hpp" using std::string; diff --git a/vulkan/slang_preset.hpp b/common/video/vulkan/slang_preset.hpp similarity index 100% rename from vulkan/slang_preset.hpp rename to common/video/vulkan/slang_preset.hpp diff --git a/vulkan/slang_preset_ini.cpp b/common/video/vulkan/slang_preset_ini.cpp similarity index 100% rename from vulkan/slang_preset_ini.cpp rename to common/video/vulkan/slang_preset_ini.cpp diff --git a/vulkan/slang_preset_ini.hpp b/common/video/vulkan/slang_preset_ini.hpp similarity index 100% rename from vulkan/slang_preset_ini.hpp rename to common/video/vulkan/slang_preset_ini.hpp diff --git a/vulkan/slang_preset_test.cpp b/common/video/vulkan/slang_preset_test.cpp similarity index 100% rename from vulkan/slang_preset_test.cpp rename to common/video/vulkan/slang_preset_test.cpp diff --git a/vulkan/slang_shader.cpp b/common/video/vulkan/slang_shader.cpp similarity index 97% rename from vulkan/slang_shader.cpp rename to common/video/vulkan/slang_shader.cpp index 7a16564e..1b01cf3a 100644 --- a/vulkan/slang_shader.cpp +++ b/common/video/vulkan/slang_shader.cpp @@ -7,9 +7,9 @@ #include #include #include -#include "../external/glslang/glslang/Public/ShaderLang.h" -#include "../external/glslang/SPIRV/GlslangToSpv.h" -#include "../external/glslang/glslang/Public/ResourceLimits.h" +#include "external/glslang/glslang/Public/ShaderLang.h" +#include "external/glslang/SPIRV/GlslangToSpv.h" +#include "external/glslang/glslang/Public/ResourceLimits.h" using std::string; using std::vector; diff --git a/vulkan/slang_shader.hpp b/common/video/vulkan/slang_shader.hpp similarity index 100% rename from vulkan/slang_shader.hpp rename to common/video/vulkan/slang_shader.hpp diff --git a/vulkan/vk_mem_alloc_implementation.cpp b/common/video/vulkan/vk_mem_alloc_implementation.cpp similarity index 100% rename from vulkan/vk_mem_alloc_implementation.cpp rename to common/video/vulkan/vk_mem_alloc_implementation.cpp diff --git a/vulkan/vulkan_context.cpp b/common/video/vulkan/vulkan_context.cpp similarity index 100% rename from vulkan/vulkan_context.cpp rename to common/video/vulkan/vulkan_context.cpp diff --git a/vulkan/vulkan_context.hpp b/common/video/vulkan/vulkan_context.hpp similarity index 93% rename from vulkan/vulkan_context.hpp rename to common/video/vulkan/vulkan_context.hpp index 8ebe4b83..c15df4f8 100644 --- a/vulkan/vulkan_context.hpp +++ b/common/video/vulkan/vulkan_context.hpp @@ -8,8 +8,8 @@ #define WINVER 0x599 #endif #include -#include "vulkan/vulkan_hpp_wrapper.hpp" -#include "../external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.hpp" +#include "vulkan_hpp_wrapper.hpp" +#include "external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.hpp" #include "vulkan_swapchain.hpp" #include diff --git a/vulkan/vulkan_hpp_storage.cpp b/common/video/vulkan/vulkan_hpp_storage.cpp similarity index 100% rename from vulkan/vulkan_hpp_storage.cpp rename to common/video/vulkan/vulkan_hpp_storage.cpp diff --git a/vulkan/vulkan_hpp_wrapper.hpp b/common/video/vulkan/vulkan_hpp_wrapper.hpp similarity index 100% rename from vulkan/vulkan_hpp_wrapper.hpp rename to common/video/vulkan/vulkan_hpp_wrapper.hpp diff --git a/vulkan/vulkan_pipeline_image.cpp b/common/video/vulkan/vulkan_pipeline_image.cpp similarity index 100% rename from vulkan/vulkan_pipeline_image.cpp rename to common/video/vulkan/vulkan_pipeline_image.cpp diff --git a/vulkan/vulkan_pipeline_image.hpp b/common/video/vulkan/vulkan_pipeline_image.hpp similarity index 100% rename from vulkan/vulkan_pipeline_image.hpp rename to common/video/vulkan/vulkan_pipeline_image.hpp diff --git a/vulkan/vulkan_shader_chain.cpp b/common/video/vulkan/vulkan_shader_chain.cpp similarity index 100% rename from vulkan/vulkan_shader_chain.cpp rename to common/video/vulkan/vulkan_shader_chain.cpp diff --git a/vulkan/vulkan_shader_chain.hpp b/common/video/vulkan/vulkan_shader_chain.hpp similarity index 100% rename from vulkan/vulkan_shader_chain.hpp rename to common/video/vulkan/vulkan_shader_chain.hpp diff --git a/vulkan/vulkan_simple_output.cpp b/common/video/vulkan/vulkan_simple_output.cpp similarity index 100% rename from vulkan/vulkan_simple_output.cpp rename to common/video/vulkan/vulkan_simple_output.cpp diff --git a/vulkan/vulkan_simple_output.hpp b/common/video/vulkan/vulkan_simple_output.hpp similarity index 100% rename from vulkan/vulkan_simple_output.hpp rename to common/video/vulkan/vulkan_simple_output.hpp diff --git a/vulkan/vulkan_slang_pipeline.cpp b/common/video/vulkan/vulkan_slang_pipeline.cpp similarity index 100% rename from vulkan/vulkan_slang_pipeline.cpp rename to common/video/vulkan/vulkan_slang_pipeline.cpp diff --git a/vulkan/vulkan_slang_pipeline.hpp b/common/video/vulkan/vulkan_slang_pipeline.hpp similarity index 95% rename from vulkan/vulkan_slang_pipeline.hpp rename to common/video/vulkan/vulkan_slang_pipeline.hpp index b9e813a3..d4fd473c 100644 --- a/vulkan/vulkan_slang_pipeline.hpp +++ b/common/video/vulkan/vulkan_slang_pipeline.hpp @@ -1,5 +1,5 @@ #pragma once -#include "vulkan/vulkan_hpp_wrapper.hpp" +#include "vulkan_hpp_wrapper.hpp" #include "slang_shader.hpp" #include "vulkan_context.hpp" #include "vulkan_pipeline_image.hpp" diff --git a/vulkan/vulkan_swapchain.cpp b/common/video/vulkan/vulkan_swapchain.cpp similarity index 100% rename from vulkan/vulkan_swapchain.cpp rename to common/video/vulkan/vulkan_swapchain.cpp diff --git a/vulkan/vulkan_swapchain.hpp b/common/video/vulkan/vulkan_swapchain.hpp similarity index 97% rename from vulkan/vulkan_swapchain.hpp rename to common/video/vulkan/vulkan_swapchain.hpp index ad271e83..41028027 100644 --- a/vulkan/vulkan_swapchain.hpp +++ b/common/video/vulkan/vulkan_swapchain.hpp @@ -1,6 +1,6 @@ #pragma once -#include "vulkan/vulkan_hpp_wrapper.hpp" +#include "vulkan_hpp_wrapper.hpp" #include namespace Vulkan diff --git a/vulkan/vulkan_texture.cpp b/common/video/vulkan/vulkan_texture.cpp similarity index 100% rename from vulkan/vulkan_texture.cpp rename to common/video/vulkan/vulkan_texture.cpp diff --git a/vulkan/vulkan_texture.hpp b/common/video/vulkan/vulkan_texture.hpp similarity index 100% rename from vulkan/vulkan_texture.hpp rename to common/video/vulkan/vulkan_texture.hpp diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 4bf16fb0..7c65cc5f 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -71,16 +71,16 @@ list(APPEND SOURCES src/gtk_display_driver_opengl.cpp ../common/video/opengl/glx_context.cpp ../common/video/opengl/shaders/glsl.cpp ../common/video/opengl/shaders/shader_helpers.cpp - ../vulkan/slang_helpers.cpp - ../vulkan/slang_helpers.hpp - ../vulkan/slang_preset_ini.cpp - ../vulkan/slang_preset_ini.hpp + ../common/video/vulkan/slang_helpers.cpp + ../common/video/vulkan/slang_helpers.hpp + ../common/video/vulkan/slang_preset_ini.cpp + ../common/video/vulkan/slang_preset_ini.hpp ../external/glad/src/glx.c ../external/glad/src/egl.c ../external/glad/src/gl.c src/gtk_shader_parameters.cpp - ../vulkan/std_chrono_throttle.cpp - ../vulkan/std_chrono_throttle.hpp) + ../common/video/std_chrono_throttle.cpp + ../common/video/std_chrono_throttle.hpp) list(APPEND INCLUDES ../external/glad/include) if(USE_SLANG) @@ -116,26 +116,26 @@ if(USE_SLANG) list(APPEND INCLUDES ../external/VulkanMemoryAllocator-Hpp/include) list(APPEND INCLUDES ../external/stb) list(APPEND SOURCES ../external/stb/stb_image_implementation.cpp) - list(APPEND SOURCES ../vulkan/slang_shader.cpp - ../vulkan/slang_shader.hpp - ../vulkan/slang_preset.cpp - ../vulkan/slang_preset.hpp - ../vulkan/vulkan_hpp_storage.cpp - ../vulkan/vk_mem_alloc_implementation.cpp - ../vulkan/vulkan_context.cpp - ../vulkan/vulkan_context.hpp - ../vulkan/vulkan_texture.cpp - ../vulkan/vulkan_texture.hpp - ../vulkan/vulkan_swapchain.cpp - ../vulkan/vulkan_swapchain.hpp - ../vulkan/vulkan_slang_pipeline.cpp - ../vulkan/vulkan_slang_pipeline.hpp - ../vulkan/vulkan_pipeline_image.cpp - ../vulkan/vulkan_pipeline_image.hpp - ../vulkan/vulkan_shader_chain.cpp - ../vulkan/vulkan_shader_chain.hpp - ../vulkan/vulkan_simple_output.hpp - ../vulkan/vulkan_simple_output.cpp + list(APPEND SOURCES ../common/video/vulkan/slang_shader.cpp + ../common/video/vulkan/slang_shader.hpp + ../common/video/vulkan/slang_preset.cpp + ../common/video/vulkan/slang_preset.hpp + ../common/video/vulkan/vulkan_hpp_storage.cpp + ../common/video/vulkan/vk_mem_alloc_implementation.cpp + ../common/video/vulkan/vulkan_context.cpp + ../common/video/vulkan/vulkan_context.hpp + ../common/video/vulkan/vulkan_texture.cpp + ../common/video/vulkan/vulkan_texture.hpp + ../common/video/vulkan/vulkan_swapchain.cpp + ../common/video/vulkan/vulkan_swapchain.hpp + ../common/video/vulkan/vulkan_slang_pipeline.cpp + ../common/video/vulkan/vulkan_slang_pipeline.hpp + ../common/video/vulkan/vulkan_pipeline_image.cpp + ../common/video/vulkan/vulkan_pipeline_image.hpp + ../common/video/vulkan/vulkan_shader_chain.cpp + ../common/video/vulkan/vulkan_shader_chain.hpp + ../common/video/vulkan/vulkan_simple_output.hpp + ../common/video/vulkan/vulkan_simple_output.cpp src/gtk_display_driver_vulkan.cpp src/gtk_display_driver_vulkan.h ../external/imgui/imgui_impl_vulkan.cpp) @@ -388,16 +388,16 @@ target_compile_definitions(snes9x-gtk PRIVATE ${DEFINES}) if(USE_SLANG) add_executable(slang_test EXCLUDE_FROM_ALL - ../vulkan/slang_helpers.cpp - ../vulkan/slang_helpers.hpp - ../vulkan/slang_shader.cpp - ../vulkan/slang_shader.hpp - ../vulkan/slang_preset.cpp - ../vulkan/slang_preset.hpp - ../vulkan/slang_preset_ini.cpp - ../vulkan/slang_preset_ini.hpp - ../vulkan/vulkan_hpp_storage.cpp - ../vulkan/slang_preset_test.cpp + ../common/video/vulkan/slang_helpers.cpp + ../common/video/vulkan/slang_helpers.hpp + ../common/video/vulkan/slang_shader.cpp + ../common/video/vulkan/slang_shader.hpp + ../common/video/vulkan/slang_preset.cpp + ../common/video/vulkan/slang_preset.hpp + ../common/video/vulkan/slang_preset_ini.cpp + ../common/video/vulkan/slang_preset_ini.hpp + ../common/video/vulkan/vulkan_hpp_storage.cpp + ../common/video/vulkan/slang_preset_test.cpp ../conffile.cpp ../stream.cpp) diff --git a/gtk/src/gtk_display_driver_opengl.h b/gtk/src/gtk_display_driver_opengl.h index bd5d4d17..b94fc82f 100644 --- a/gtk/src/gtk_display_driver_opengl.h +++ b/gtk/src/gtk_display_driver_opengl.h @@ -23,7 +23,7 @@ #endif #include "common/video/opengl/shaders/glsl.h" -#include "vulkan/std_chrono_throttle.hpp" +#include "common/video/std_chrono_throttle.hpp" #define BUFFER_OFFSET(i) ((char *)(i)) diff --git a/gtk/src/gtk_display_driver_vulkan.h b/gtk/src/gtk_display_driver_vulkan.h index 63945f0b..78761596 100644 --- a/gtk/src/gtk_display_driver_vulkan.h +++ b/gtk/src/gtk_display_driver_vulkan.h @@ -7,10 +7,10 @@ #pragma once #include "gtk_s9x.h" #include "gtk_display_driver.h" -#include "vulkan/vulkan_context.hpp" -#include "vulkan/vulkan_shader_chain.hpp" -#include "vulkan/vulkan_simple_output.hpp" -#include "vulkan/std_chrono_throttle.hpp" +#include "common/video/vulkan/vulkan_context.hpp" +#include "common/video/vulkan/vulkan_shader_chain.hpp" +#include "common/video/vulkan/vulkan_simple_output.hpp" +#include "common/video/std_chrono_throttle.hpp" #ifdef VK_USE_PLATFORM_WAYLAND_KHR #include "common/video/wayland/wayland_surface.hpp" diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 7a1fdea6..a2205712 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -254,32 +254,32 @@ list(APPEND INCLUDES ../external/stb "../external/glad/include") list(APPEND SOURCES - ../vulkan/slang_shader.cpp - ../vulkan/slang_shader.hpp - ../vulkan/slang_preset.cpp - ../vulkan/slang_preset.hpp - ../vulkan/vulkan_hpp_storage.cpp - ../vulkan/vk_mem_alloc_implementation.cpp - ../vulkan/vulkan_context.cpp - ../vulkan/vulkan_context.hpp - ../vulkan/vulkan_texture.cpp - ../vulkan/vulkan_texture.hpp - ../vulkan/vulkan_swapchain.cpp - ../vulkan/vulkan_swapchain.hpp - ../vulkan/vulkan_slang_pipeline.cpp - ../vulkan/vulkan_slang_pipeline.hpp - ../vulkan/vulkan_pipeline_image.cpp - ../vulkan/vulkan_pipeline_image.hpp - ../vulkan/vulkan_shader_chain.cpp - ../vulkan/vulkan_shader_chain.hpp - ../vulkan/vulkan_simple_output.hpp - ../vulkan/vulkan_simple_output.cpp - ../vulkan/std_chrono_throttle.cpp - ../vulkan/std_chrono_throttle.hpp - ../vulkan/slang_helpers.cpp - ../vulkan/slang_helpers.hpp - ../vulkan/slang_preset_ini.cpp - ../vulkan/slang_preset_ini.hpp + ../common/video/vulkan/slang_shader.cpp + ../common/video/vulkan/slang_shader.hpp + ../common/video/vulkan/slang_preset.cpp + ../common/video/vulkan/slang_preset.hpp + ../common/video/vulkan/vulkan_hpp_storage.cpp + ../common/video/vulkan/vk_mem_alloc_implementation.cpp + ../common/video/vulkan/vulkan_context.cpp + ../common/video/vulkan/vulkan_context.hpp + ../common/video/vulkan/vulkan_texture.cpp + ../common/video/vulkan/vulkan_texture.hpp + ../common/video/vulkan/vulkan_swapchain.cpp + ../common/video/vulkan/vulkan_swapchain.hpp + ../common/video/vulkan/vulkan_slang_pipeline.cpp + ../common/video/vulkan/vulkan_slang_pipeline.hpp + ../common/video/vulkan/vulkan_pipeline_image.cpp + ../common/video/vulkan/vulkan_pipeline_image.hpp + ../common/video/vulkan/vulkan_shader_chain.cpp + ../common/video/vulkan/vulkan_shader_chain.hpp + ../common/video/vulkan/vulkan_simple_output.hpp + ../common/video/vulkan/vulkan_simple_output.cpp + ../common/video/std_chrono_throttle.cpp + ../common/video/std_chrono_throttle.hpp + ../common/video/vulkan/slang_helpers.cpp + ../common/video/vulkan/slang_helpers.hpp + ../common/video/vulkan/slang_preset_ini.cpp + ../common/video/vulkan/slang_preset_ini.hpp ../external/stb/stb_image_implementation.cpp ../common/video/opengl/shaders/glsl.cpp ../common/video/opengl/shaders/slang.cpp diff --git a/qt/src/EmuCanvas.hpp b/qt/src/EmuCanvas.hpp index 09fb398a..ef9a1138 100644 --- a/qt/src/EmuCanvas.hpp +++ b/qt/src/EmuCanvas.hpp @@ -1,7 +1,7 @@ #pragma once #include #include -#include "../../vulkan/std_chrono_throttle.hpp" +#include "common/video/std_chrono_throttle.hpp" class EmuConfig; diff --git a/qt/src/EmuCanvasVulkan.cpp b/qt/src/EmuCanvasVulkan.cpp index 3795ebba..c02788b6 100644 --- a/qt/src/EmuCanvasVulkan.cpp +++ b/qt/src/EmuCanvasVulkan.cpp @@ -4,7 +4,6 @@ #include #include #include "EmuCanvasVulkan.hpp" -#include "src/ShaderParametersDialog.hpp" #include "EmuMainWindow.hpp" #include "snes9x_imgui.h" diff --git a/qt/src/EmuCanvasVulkan.hpp b/qt/src/EmuCanvasVulkan.hpp index 1f269f2f..ec20828a 100644 --- a/qt/src/EmuCanvasVulkan.hpp +++ b/qt/src/EmuCanvasVulkan.hpp @@ -3,8 +3,8 @@ #include "EmuCanvas.hpp" #include "ShaderParametersDialog.hpp" -#include "../../vulkan/vulkan_simple_output.hpp" -#include "../../vulkan/vulkan_shader_chain.hpp" +#include "common/video/vulkan/vulkan_simple_output.hpp" +#include "common/video/vulkan/vulkan_shader_chain.hpp" #ifndef _WIN32 #include "common/video/wayland/wayland_surface.hpp"