Move shaders directory into common/video/opengl.

common/video/opengl/shaders/glsl.cpp

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

common/video/opengl/shaders/glsl.h

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

gtk/CMakeLists.txt

@@ -69,8 +69,8 @@ list(APPEND LIBS ${X11} ${XEXT} ${CMAKE_DL_LIBS} ${SDL2_LIBRARIES} ${GTK_LIBRARI
 
 list(APPEND SOURCES src/gtk_display_driver_opengl.cpp
                     ../common/video/opengl/glx_context.cpp
-                    ../shaders/glsl.cpp
-                    ../shaders/shader_helpers.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
@@ -84,7 +84,7 @@ list(APPEND SOURCES src/gtk_display_driver_opengl.cpp
 list(APPEND INCLUDES ../external/glad/include)
 
 if(USE_SLANG)
-    list(APPEND SOURCES ../shaders/slang.cpp)
+    list(APPEND SOURCES ../common/video/opengl/shaders/slang.cpp)
     list(APPEND INCLUDES ../external/glslang)
 
     set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS CACHE BOOL ON)

gtk/src/gtk_display_driver_opengl.h

@@ -22,7 +22,7 @@
 #include "common/video/opengl/wayland_egl_context.hpp"
 #endif
 
-#include "shaders/glsl.h"
+#include "common/video/opengl/shaders/glsl.h"
 #include "vulkan/std_chrono_throttle.hpp"
 
 #define BUFFER_OFFSET(i) ((char *)(i))

gtk/src/gtk_shader_parameters.cpp

@@ -11,7 +11,7 @@
 #include "gtk_s9x.h"
 #include "gtk_display.h"
 #include "gtk_shader_parameters.h"
-#include "shaders/glsl.h"
+#include "common/video/opengl/shaders/glsl.h"
 
 #include "gfx.h"
 

qt/CMakeLists.txt

@@ -281,9 +281,9 @@ list(APPEND SOURCES
     ../vulkan/slang_preset_ini.cpp
     ../vulkan/slang_preset_ini.hpp
     ../external/stb/stb_image_implementation.cpp
-    ../shaders/glsl.cpp
-    ../shaders/slang.cpp
-    ../shaders/shader_helpers.cpp)
+    ../common/video/opengl/shaders/glsl.cpp
+    ../common/video/opengl/shaders/slang.cpp
+    ../common/video/opengl/shaders/shader_helpers.cpp)
 
 list(APPEND DEFINES "IMGUI_IMPL_VULKAN_NO_PROTOTYPES")
 list(APPEND SOURCES ../external/imgui/imgui.cpp

qt/src/EmuCanvasOpenGL.cpp

@@ -13,7 +13,7 @@ using namespace QNativeInterface;
 #else
 #include "common/video/wgl_context.hpp"
 #endif
-#include "shaders/glsl.h"
+#include "common/video/opengl/shaders/glsl.h"
 #include "EmuMainWindow.hpp"
 #include "snes9x_imgui.h"
 #include "imgui_impl_opengl3.h"