From 9f7173f81962a8bbc64bdcd36a71c99d3b1fb98b Mon Sep 17 00:00:00 2001
From: BearOso <BearOso@gmail.com>
Date: Sat, 10 Aug 2024 17:08:57 -0500
Subject: [PATCH] Move shaders directory into common/video/opengl.

---
 {shaders => common/video/opengl/shaders}/glsl.cpp           | 2 +-
 {shaders => common/video/opengl/shaders}/glsl.h             | 2 +-
 {shaders => common/video/opengl/shaders}/shader_helpers.cpp | 0
 {shaders => common/video/opengl/shaders}/shader_helpers.h   | 0
 {shaders => common/video/opengl/shaders}/shader_platform.h  | 0
 {shaders => common/video/opengl/shaders}/slang.cpp          | 0
 gtk/CMakeLists.txt                                          | 6 +++---
 gtk/src/gtk_display_driver_opengl.h                         | 2 +-
 gtk/src/gtk_shader_parameters.cpp                           | 2 +-
 qt/CMakeLists.txt                                           | 6 +++---
 qt/src/EmuCanvasOpenGL.cpp                                  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename {shaders => common/video/opengl/shaders}/glsl.cpp (99%)
 rename {shaders => common/video/opengl/shaders}/glsl.h (99%)
 rename {shaders => common/video/opengl/shaders}/shader_helpers.cpp (100%)
 rename {shaders => common/video/opengl/shaders}/shader_helpers.h (100%)
 rename {shaders => common/video/opengl/shaders}/shader_platform.h (100%)
 rename {shaders => common/video/opengl/shaders}/slang.cpp (100%)

diff --git a/shaders/glsl.cpp b/common/video/opengl/shaders/glsl.cpp
similarity index 99%
rename from shaders/glsl.cpp
rename to common/video/opengl/shaders/glsl.cpp
index cabf0b82..8056ea79 100644
--- a/shaders/glsl.cpp
+++ b/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>
diff --git a/shaders/glsl.h b/common/video/opengl/shaders/glsl.h
similarity index 99%
rename from shaders/glsl.h
rename to common/video/opengl/shaders/glsl.h
index c12309f6..73669b91 100644
--- a/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 "vulkan/slang_preset_ini.hpp"
 #include "shader_platform.h"
 #include <deque>
 #include <limits.h>
diff --git a/shaders/shader_helpers.cpp b/common/video/opengl/shaders/shader_helpers.cpp
similarity index 100%
rename from shaders/shader_helpers.cpp
rename to common/video/opengl/shaders/shader_helpers.cpp
diff --git a/shaders/shader_helpers.h b/common/video/opengl/shaders/shader_helpers.h
similarity index 100%
rename from shaders/shader_helpers.h
rename to common/video/opengl/shaders/shader_helpers.h
diff --git a/shaders/shader_platform.h b/common/video/opengl/shaders/shader_platform.h
similarity index 100%
rename from shaders/shader_platform.h
rename to common/video/opengl/shaders/shader_platform.h
diff --git a/shaders/slang.cpp b/common/video/opengl/shaders/slang.cpp
similarity index 100%
rename from shaders/slang.cpp
rename to common/video/opengl/shaders/slang.cpp
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 82617b4d..4bf16fb0 100644
--- a/gtk/CMakeLists.txt
+++ b/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)
diff --git a/gtk/src/gtk_display_driver_opengl.h b/gtk/src/gtk_display_driver_opengl.h
index f4acd903..bd5d4d17 100644
--- a/gtk/src/gtk_display_driver_opengl.h
+++ b/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))
diff --git a/gtk/src/gtk_shader_parameters.cpp b/gtk/src/gtk_shader_parameters.cpp
index 377167a9..7c70e427 100644
--- a/gtk/src/gtk_shader_parameters.cpp
+++ b/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"
 
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index efda7183..7a1fdea6 100644
--- a/qt/CMakeLists.txt
+++ b/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
diff --git a/qt/src/EmuCanvasOpenGL.cpp b/qt/src/EmuCanvasOpenGL.cpp
index 218219b8..e2c0c7fe 100644
--- a/qt/src/EmuCanvasOpenGL.cpp
+++ b/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"