ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move vulkan to common/video.

This commit is contained in:
BearOso 2024-08-10 17:41:47 -05:00
parent 9f7173f819
commit 1773782575
37 changed files with 82 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/video/opengl/shaders/glsl.cpp
View File

@ -11,7 +11,7 @@
#include <map> #include <map>
#include "glsl.h" #include "glsl.h"
#include "shader_helpers.h" #include "shader_helpers.h"
#include "vulkan/slang_helpers.hpp" #include "common/video/vulkan/slang_helpers.hpp"
#include "shader_platform.h" #include "shader_platform.h"
#ifndef _MSC_VER #ifndef _MSC_VER
#include <unistd.h> #include <unistd.h>

2
common/video/opengl/shaders/glsl.h
View File

@ -8,7 +8,7 @@
#define __GLSL_H #define __GLSL_H
#include "snes9x.h" #include "snes9x.h"
#include "vulkan/slang_preset_ini.hpp" #include "common/video/vulkan/slang_preset_ini.hpp"
#include "shader_platform.h" #include "shader_platform.h"
#include <deque> #include <deque>
#include <limits.h> #include <limits.h>

0
vulkan/std_chrono_throttle.cpp → common/video/std_chrono_throttle.cpp
View File

0
vulkan/std_chrono_throttle.hpp → common/video/std_chrono_throttle.hpp
View File

0
vulkan/slang_helpers.cpp → common/video/vulkan/slang_helpers.cpp
View File

0
vulkan/slang_helpers.hpp → common/video/vulkan/slang_helpers.hpp
View File

6
vulkan/slang_preset.cpp → common/video/vulkan/slang_preset.cpp
View File

@ -1,5 +1,5 @@
#include "slang_preset.hpp" #include "slang_preset.hpp"
#include "../external/SPIRV-Cross/spirv.hpp" #include "external/SPIRV-Cross/spirv.hpp"
#include "slang_helpers.hpp" #include "slang_helpers.hpp"
#include "slang_preset_ini.hpp" #include "slang_preset_ini.hpp"
@ -12,8 +12,8 @@
#include <fstream> #include <fstream>
#include <filesystem> #include <filesystem>
#include <future> #include <future>
#include "../external/SPIRV-Cross/spirv_cross.hpp" #include "external/SPIRV-Cross/spirv_cross.hpp"
#include "../external/SPIRV-Cross/spirv_glsl.hpp" #include "external/SPIRV-Cross/spirv_glsl.hpp"
#include "slang_shader.hpp" #include "slang_shader.hpp"
using std::string; using std::string;

0
vulkan/slang_preset.hpp → common/video/vulkan/slang_preset.hpp
View File

0
vulkan/slang_preset_ini.cpp → common/video/vulkan/slang_preset_ini.cpp
View File

0
vulkan/slang_preset_ini.hpp → common/video/vulkan/slang_preset_ini.hpp
View File

0
vulkan/slang_preset_test.cpp → common/video/vulkan/slang_preset_test.cpp
View File

6
vulkan/slang_shader.cpp → common/video/vulkan/slang_shader.cpp
View File

@ -7,9 +7,9 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <fstream> #include <fstream>
#include "../external/glslang/glslang/Public/ShaderLang.h" #include "external/glslang/glslang/Public/ShaderLang.h"
#include "../external/glslang/SPIRV/GlslangToSpv.h" #include "external/glslang/SPIRV/GlslangToSpv.h"
#include "../external/glslang/glslang/Public/ResourceLimits.h" #include "external/glslang/glslang/Public/ResourceLimits.h"
using std::string; using std::string;
using std::vector; using std::vector;

0
vulkan/slang_shader.hpp → common/video/vulkan/slang_shader.hpp
View File

0
vulkan/vk_mem_alloc_implementation.cpp → common/video/vulkan/vk_mem_alloc_implementation.cpp
View File

0
vulkan/vulkan_context.cpp → common/video/vulkan/vulkan_context.cpp
View File

4
vulkan/vulkan_context.hpp → common/video/vulkan/vulkan_context.hpp
View File

@ -8,8 +8,8 @@
#define WINVER 0x599 #define WINVER 0x599
#endif #endif
#include <cstdint> #include <cstdint>
#include "vulkan/vulkan_hpp_wrapper.hpp" #include "vulkan_hpp_wrapper.hpp"
#include "../external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.hpp" #include "external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.hpp"
#include "vulkan_swapchain.hpp" #include "vulkan_swapchain.hpp"
#include <memory> #include <memory>

0
vulkan/vulkan_hpp_storage.cpp → common/video/vulkan/vulkan_hpp_storage.cpp
View File

0
vulkan/vulkan_hpp_wrapper.hpp → common/video/vulkan/vulkan_hpp_wrapper.hpp
View File

0
vulkan/vulkan_pipeline_image.cpp → common/video/vulkan/vulkan_pipeline_image.cpp
View File

0
vulkan/vulkan_pipeline_image.hpp → common/video/vulkan/vulkan_pipeline_image.hpp
View File

0
vulkan/vulkan_shader_chain.cpp → common/video/vulkan/vulkan_shader_chain.cpp
View File

0
vulkan/vulkan_shader_chain.hpp → common/video/vulkan/vulkan_shader_chain.hpp
View File

0
vulkan/vulkan_simple_output.cpp → common/video/vulkan/vulkan_simple_output.cpp
View File

0
vulkan/vulkan_simple_output.hpp → common/video/vulkan/vulkan_simple_output.hpp
View File

0
vulkan/vulkan_slang_pipeline.cpp → common/video/vulkan/vulkan_slang_pipeline.cpp
View File

2
vulkan/vulkan_slang_pipeline.hpp → common/video/vulkan/vulkan_slang_pipeline.hpp
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "vulkan/vulkan_hpp_wrapper.hpp" #include "vulkan_hpp_wrapper.hpp"
#include "slang_shader.hpp" #include "slang_shader.hpp"
#include "vulkan_context.hpp" #include "vulkan_context.hpp"
#include "vulkan_pipeline_image.hpp" #include "vulkan_pipeline_image.hpp"

0
vulkan/vulkan_swapchain.cpp → common/video/vulkan/vulkan_swapchain.cpp
View File

2
vulkan/vulkan_swapchain.hpp → common/video/vulkan/vulkan_swapchain.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "vulkan/vulkan_hpp_wrapper.hpp" #include "vulkan_hpp_wrapper.hpp"
#include <functional> #include <functional>
namespace Vulkan namespace Vulkan

0
vulkan/vulkan_texture.cpp → common/video/vulkan/vulkan_texture.cpp
View File

0
vulkan/vulkan_texture.hpp → common/video/vulkan/vulkan_texture.hpp
View File

72
gtk/CMakeLists.txt
View File

@ -71,16 +71,16 @@ list(APPEND SOURCES src/gtk_display_driver_opengl.cpp
../common/video/opengl/glx_context.cpp ../common/video/opengl/glx_context.cpp
../common/video/opengl/shaders/glsl.cpp ../common/video/opengl/shaders/glsl.cpp
../common/video/opengl/shaders/shader_helpers.cpp ../common/video/opengl/shaders/shader_helpers.cpp
../vulkan/slang_helpers.cpp ../common/video/vulkan/slang_helpers.cpp
../vulkan/slang_helpers.hpp ../common/video/vulkan/slang_helpers.hpp
../vulkan/slang_preset_ini.cpp ../common/video/vulkan/slang_preset_ini.cpp
../vulkan/slang_preset_ini.hpp ../common/video/vulkan/slang_preset_ini.hpp
../external/glad/src/glx.c ../external/glad/src/glx.c
../external/glad/src/egl.c ../external/glad/src/egl.c
../external/glad/src/gl.c ../external/glad/src/gl.c
src/gtk_shader_parameters.cpp src/gtk_shader_parameters.cpp
../vulkan/std_chrono_throttle.cpp ../common/video/std_chrono_throttle.cpp
../vulkan/std_chrono_throttle.hpp) ../common/video/std_chrono_throttle.hpp)
list(APPEND INCLUDES ../external/glad/include) list(APPEND INCLUDES ../external/glad/include)
if(USE_SLANG) if(USE_SLANG)
@ -116,26 +116,26 @@ if(USE_SLANG)
list(APPEND INCLUDES ../external/VulkanMemoryAllocator-Hpp/include) list(APPEND INCLUDES ../external/VulkanMemoryAllocator-Hpp/include)
list(APPEND INCLUDES ../external/stb) list(APPEND INCLUDES ../external/stb)
list(APPEND SOURCES ../external/stb/stb_image_implementation.cpp) list(APPEND SOURCES ../external/stb/stb_image_implementation.cpp)
list(APPEND SOURCES ../vulkan/slang_shader.cpp list(APPEND SOURCES ../common/video/vulkan/slang_shader.cpp
../vulkan/slang_shader.hpp ../common/video/vulkan/slang_shader.hpp
../vulkan/slang_preset.cpp ../common/video/vulkan/slang_preset.cpp
../vulkan/slang_preset.hpp ../common/video/vulkan/slang_preset.hpp
../vulkan/vulkan_hpp_storage.cpp ../common/video/vulkan/vulkan_hpp_storage.cpp
../vulkan/vk_mem_alloc_implementation.cpp ../common/video/vulkan/vk_mem_alloc_implementation.cpp
../vulkan/vulkan_context.cpp ../common/video/vulkan/vulkan_context.cpp
../vulkan/vulkan_context.hpp ../common/video/vulkan/vulkan_context.hpp
../vulkan/vulkan_texture.cpp ../common/video/vulkan/vulkan_texture.cpp
../vulkan/vulkan_texture.hpp ../common/video/vulkan/vulkan_texture.hpp
../vulkan/vulkan_swapchain.cpp ../common/video/vulkan/vulkan_swapchain.cpp
../vulkan/vulkan_swapchain.hpp ../common/video/vulkan/vulkan_swapchain.hpp
../vulkan/vulkan_slang_pipeline.cpp ../common/video/vulkan/vulkan_slang_pipeline.cpp
../vulkan/vulkan_slang_pipeline.hpp ../common/video/vulkan/vulkan_slang_pipeline.hpp
../vulkan/vulkan_pipeline_image.cpp ../common/video/vulkan/vulkan_pipeline_image.cpp
../vulkan/vulkan_pipeline_image.hpp ../common/video/vulkan/vulkan_pipeline_image.hpp
../vulkan/vulkan_shader_chain.cpp ../common/video/vulkan/vulkan_shader_chain.cpp
../vulkan/vulkan_shader_chain.hpp ../common/video/vulkan/vulkan_shader_chain.hpp
../vulkan/vulkan_simple_output.hpp ../common/video/vulkan/vulkan_simple_output.hpp
../vulkan/vulkan_simple_output.cpp ../common/video/vulkan/vulkan_simple_output.cpp
src/gtk_display_driver_vulkan.cpp src/gtk_display_driver_vulkan.cpp
src/gtk_display_driver_vulkan.h src/gtk_display_driver_vulkan.h
../external/imgui/imgui_impl_vulkan.cpp) ../external/imgui/imgui_impl_vulkan.cpp)
@ -388,16 +388,16 @@ target_compile_definitions(snes9x-gtk PRIVATE ${DEFINES})
if(USE_SLANG) if(USE_SLANG)
add_executable(slang_test EXCLUDE_FROM_ALL add_executable(slang_test EXCLUDE_FROM_ALL
../vulkan/slang_helpers.cpp ../common/video/vulkan/slang_helpers.cpp
../vulkan/slang_helpers.hpp ../common/video/vulkan/slang_helpers.hpp
../vulkan/slang_shader.cpp ../common/video/vulkan/slang_shader.cpp
../vulkan/slang_shader.hpp ../common/video/vulkan/slang_shader.hpp
../vulkan/slang_preset.cpp ../common/video/vulkan/slang_preset.cpp
../vulkan/slang_preset.hpp ../common/video/vulkan/slang_preset.hpp
../vulkan/slang_preset_ini.cpp ../common/video/vulkan/slang_preset_ini.cpp
../vulkan/slang_preset_ini.hpp ../common/video/vulkan/slang_preset_ini.hpp
../vulkan/vulkan_hpp_storage.cpp ../common/video/vulkan/vulkan_hpp_storage.cpp
../vulkan/slang_preset_test.cpp ../common/video/vulkan/slang_preset_test.cpp
../conffile.cpp ../conffile.cpp
../stream.cpp) ../stream.cpp)

2
gtk/src/gtk_display_driver_opengl.h
View File

@ -23,7 +23,7 @@
#endif #endif
#include "common/video/opengl/shaders/glsl.h" #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)) #define BUFFER_OFFSET(i) ((char *)(i))

8
gtk/src/gtk_display_driver_vulkan.h
View File

@ -7,10 +7,10 @@
#pragma once #pragma once
#include "gtk_s9x.h" #include "gtk_s9x.h"
#include "gtk_display_driver.h" #include "gtk_display_driver.h"
#include "vulkan/vulkan_context.hpp" #include "common/video/vulkan/vulkan_context.hpp"
#include "vulkan/vulkan_shader_chain.hpp" #include "common/video/vulkan/vulkan_shader_chain.hpp"
#include "vulkan/vulkan_simple_output.hpp" #include "common/video/vulkan/vulkan_simple_output.hpp"
#include "vulkan/std_chrono_throttle.hpp" #include "common/video/std_chrono_throttle.hpp"
#ifdef VK_USE_PLATFORM_WAYLAND_KHR #ifdef VK_USE_PLATFORM_WAYLAND_KHR
#include "common/video/wayland/wayland_surface.hpp" #include "common/video/wayland/wayland_surface.hpp"

52
qt/CMakeLists.txt
View File

@ -254,32 +254,32 @@ list(APPEND INCLUDES
../external/stb ../external/stb
"../external/glad/include") "../external/glad/include")
list(APPEND SOURCES list(APPEND SOURCES
../vulkan/slang_shader.cpp ../common/video/vulkan/slang_shader.cpp
../vulkan/slang_shader.hpp ../common/video/vulkan/slang_shader.hpp
../vulkan/slang_preset.cpp ../common/video/vulkan/slang_preset.cpp
../vulkan/slang_preset.hpp ../common/video/vulkan/slang_preset.hpp
../vulkan/vulkan_hpp_storage.cpp ../common/video/vulkan/vulkan_hpp_storage.cpp
../vulkan/vk_mem_alloc_implementation.cpp ../common/video/vulkan/vk_mem_alloc_implementation.cpp
../vulkan/vulkan_context.cpp ../common/video/vulkan/vulkan_context.cpp
../vulkan/vulkan_context.hpp ../common/video/vulkan/vulkan_context.hpp
../vulkan/vulkan_texture.cpp ../common/video/vulkan/vulkan_texture.cpp
../vulkan/vulkan_texture.hpp ../common/video/vulkan/vulkan_texture.hpp
../vulkan/vulkan_swapchain.cpp ../common/video/vulkan/vulkan_swapchain.cpp
../vulkan/vulkan_swapchain.hpp ../common/video/vulkan/vulkan_swapchain.hpp
../vulkan/vulkan_slang_pipeline.cpp ../common/video/vulkan/vulkan_slang_pipeline.cpp
../vulkan/vulkan_slang_pipeline.hpp ../common/video/vulkan/vulkan_slang_pipeline.hpp
../vulkan/vulkan_pipeline_image.cpp ../common/video/vulkan/vulkan_pipeline_image.cpp
../vulkan/vulkan_pipeline_image.hpp ../common/video/vulkan/vulkan_pipeline_image.hpp
../vulkan/vulkan_shader_chain.cpp ../common/video/vulkan/vulkan_shader_chain.cpp
../vulkan/vulkan_shader_chain.hpp ../common/video/vulkan/vulkan_shader_chain.hpp
../vulkan/vulkan_simple_output.hpp ../common/video/vulkan/vulkan_simple_output.hpp
../vulkan/vulkan_simple_output.cpp ../common/video/vulkan/vulkan_simple_output.cpp
../vulkan/std_chrono_throttle.cpp ../common/video/std_chrono_throttle.cpp
../vulkan/std_chrono_throttle.hpp ../common/video/std_chrono_throttle.hpp
../vulkan/slang_helpers.cpp ../common/video/vulkan/slang_helpers.cpp
../vulkan/slang_helpers.hpp ../common/video/vulkan/slang_helpers.hpp
../vulkan/slang_preset_ini.cpp ../common/video/vulkan/slang_preset_ini.cpp
../vulkan/slang_preset_ini.hpp ../common/video/vulkan/slang_preset_ini.hpp
../external/stb/stb_image_implementation.cpp ../external/stb/stb_image_implementation.cpp
../common/video/opengl/shaders/glsl.cpp ../common/video/opengl/shaders/glsl.cpp
../common/video/opengl/shaders/slang.cpp ../common/video/opengl/shaders/slang.cpp

2
qt/src/EmuCanvas.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <QWidget> #include <QWidget>
#include <QImage> #include <QImage>
#include "../../vulkan/std_chrono_throttle.hpp" #include "common/video/std_chrono_throttle.hpp"
class EmuConfig; class EmuConfig;

1
qt/src/EmuCanvasVulkan.cpp
View File

@ -4,7 +4,6 @@
#include <QtEvents> #include <QtEvents>
#include <QMessageBox> #include <QMessageBox>
#include "EmuCanvasVulkan.hpp" #include "EmuCanvasVulkan.hpp"
#include "src/ShaderParametersDialog.hpp"
#include "EmuMainWindow.hpp" #include "EmuMainWindow.hpp"
#include "snes9x_imgui.h" #include "snes9x_imgui.h"

4
qt/src/EmuCanvasVulkan.hpp
View File

@ -3,8 +3,8 @@
#include "EmuCanvas.hpp" #include "EmuCanvas.hpp"
#include "ShaderParametersDialog.hpp" #include "ShaderParametersDialog.hpp"
#include "../../vulkan/vulkan_simple_output.hpp" #include "common/video/vulkan/vulkan_simple_output.hpp"
#include "../../vulkan/vulkan_shader_chain.hpp" #include "common/video/vulkan/vulkan_shader_chain.hpp"
#ifndef _WIN32 #ifndef _WIN32
#include "common/video/wayland/wayland_surface.hpp" #include "common/video/wayland/wayland_surface.hpp"