From 63fb573900f7be5f946c6fe3df42c1256e08cf58 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Fri, 8 Sep 2023 03:57:40 +0100 Subject: [PATCH] build: Add reshade submodule --- .gitmodules | 6 ++++++ LICENSE | 15 +++++++++++++++ src/meson.build | 18 +++++++++++++++++- src/reshade | 1 + thirdparty/SPIRV-Headers | 1 + 5 files changed, 40 insertions(+), 1 deletion(-) create mode 160000 src/reshade create mode 160000 thirdparty/SPIRV-Headers diff --git a/.gitmodules b/.gitmodules index 5238eaf..c525696 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,9 @@ [submodule "subprojects/openvr"] path = subprojects/openvr url = https://github.com/ValveSoftware/openvr.git +[submodule "src/reshade"] + path = src/reshade + url = https://github.com/Joshua-Ashton/reshade +[submodule "thirdparty/SPIRV-Headers"] + path = thirdparty/SPIRV-Headers + url = https://github.com/KhronosGroup/SPIRV-Headers/ diff --git a/LICENSE b/LICENSE index e60eb75..5fa2814 100644 --- a/LICENSE +++ b/LICENSE @@ -57,3 +57,18 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +======================================================== + +Reshade effects compiler from Reshade + +Copyright 2014 Patrick Mours. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/src/meson.build b/src/meson.build index ff9aed5..2f67489 100644 --- a/src/meson.build +++ b/src/meson.build @@ -81,6 +81,21 @@ liftoff_dep = dependency( default_options: ['default_library=static'], ) +reshade_src = [ + 'reshade/source/effect_codegen_spirv.cpp', + 'reshade/source/effect_expression.cpp', + 'reshade/source/effect_lexer.cpp', + 'reshade/source/effect_parser_exp.cpp', + 'reshade/source/effect_parser_stmt.cpp', + 'reshade/source/effect_preprocessor.cpp', + 'reshade/source/effect_symbol_table.cpp', +] + +reshade_include = include_directories([ + 'reshade/source', + 'reshade/include', + '../thirdparty/SPIRV-Headers/include/spirv/unified1' +]) src = [ 'steamcompmgr.cpp', @@ -110,7 +125,8 @@ endif executable( 'gamescope', - src, + src, reshade_src, + include_directories : [reshade_include], dependencies: [ dep_x11, dep_xdamage, dep_xcomposite, dep_xrender, dep_xext, dep_xfixes, dep_xxf86vm, dep_xres, glm_dep, drm_dep, wayland_server, diff --git a/src/reshade b/src/reshade new file mode 160000 index 0000000..9fdbea6 --- /dev/null +++ b/src/reshade @@ -0,0 +1 @@ +Subproject commit 9fdbea6892f9959fdc18095d035976c574b268b7 diff --git a/thirdparty/SPIRV-Headers b/thirdparty/SPIRV-Headers new file mode 160000 index 0000000..d790ced --- /dev/null +++ b/thirdparty/SPIRV-Headers @@ -0,0 +1 @@ +Subproject commit d790ced752b5bfc06b6988baadef6eb2d16bdf96