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

Move shaders directory into common/video/opengl.

This commit is contained in:
BearOso 2024-08-10 17:08:57 -05:00
parent 5c7847acbb
commit 9f7173f819
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/glsl.cpp → 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 "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
shaders/glsl.h → 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 "vulkan/slang_preset_ini.hpp"
#include "shader_platform.h" #include "shader_platform.h"
#include <deque> #include <deque>
#include <limits.h> #include <limits.h>

0
shaders/shader_helpers.cpp → common/video/opengl/shaders/shader_helpers.cpp
View File

0
shaders/shader_helpers.h → common/video/opengl/shaders/shader_helpers.h
View File

0
shaders/shader_platform.h → common/video/opengl/shaders/shader_platform.h
View File

0
shaders/slang.cpp → common/video/opengl/shaders/slang.cpp
View File

6
gtk/CMakeLists.txt
View File

@ -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 list(APPEND SOURCES src/gtk_display_driver_opengl.cpp
../common/video/opengl/glx_context.cpp ../common/video/opengl/glx_context.cpp
../shaders/glsl.cpp ../common/video/opengl/shaders/glsl.cpp
../shaders/shader_helpers.cpp ../common/video/opengl/shaders/shader_helpers.cpp
../vulkan/slang_helpers.cpp ../vulkan/slang_helpers.cpp
../vulkan/slang_helpers.hpp ../vulkan/slang_helpers.hpp
../vulkan/slang_preset_ini.cpp ../vulkan/slang_preset_ini.cpp
@ -84,7 +84,7 @@ list(APPEND SOURCES src/gtk_display_driver_opengl.cpp
list(APPEND INCLUDES ../external/glad/include) list(APPEND INCLUDES ../external/glad/include)
if(USE_SLANG) if(USE_SLANG)
list(APPEND SOURCES ../shaders/slang.cpp) list(APPEND SOURCES ../common/video/opengl/shaders/slang.cpp)
list(APPEND INCLUDES ../external/glslang) list(APPEND INCLUDES ../external/glslang)
set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS CACHE BOOL ON) set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS CACHE BOOL ON)

2
gtk/src/gtk_display_driver_opengl.h
View File

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

2
gtk/src/gtk_shader_parameters.cpp
View File

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

6
qt/CMakeLists.txt
View File

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

2
qt/src/EmuCanvasOpenGL.cpp
View File

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