Skip to content

Commit

Permalink
[meta] remove reshade submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
DadSchoorse committed May 16, 2020
1 parent ef948f0 commit 7e73260
Show file tree
Hide file tree
Showing 41 changed files with 11,491 additions and 14 deletions.
7 changes: 5 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ src/stb_image_dds.h linguist-vendored
src/AreaTex.h linguist-generated
src/SearchTex.h linguist-generated

shader/smaa.h linguist-vendored
shader/fxaa3_11.h linguist-vendored
src/reshade/* linguist-vendored

src/shader/smaa.h linguist-vendored
src/shader/fxaa3_11.h linguist-vendored

include/vulkan/* linguist-vendored
include/spirv/* linguist-vendored
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

4 changes: 1 addition & 3 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
project('vkBasalt', ['c', 'cpp'], default_options: ['c_std=c11', 'cpp_std=c++2a'])

vkBasalt_include_path = include_directories('./include')
vkBasalt_include_path = include_directories('./include', './include/spirv')

if get_option('with_so')
subdir('shader')
subdir('reshade')
subdir('src')
endif

Expand Down
1 change: 0 additions & 1 deletion reshade
Submodule reshade deleted from 8534d8
6 changes: 3 additions & 3 deletions src/effect_reshade.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#include "logical_device.hpp"

#include "../reshade/source/effect_parser.hpp"
#include "../reshade/source/effect_codegen.hpp"
#include "../reshade/source/effect_preprocessor.hpp"
#include "reshade/effect_parser.hpp"
#include "reshade/effect_codegen.hpp"
#include "reshade/effect_preprocessor.hpp"

namespace vkBasalt
{
Expand Down
3 changes: 3 additions & 0 deletions src/meson.build
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
subdir('shader')
subdir('reshade')

vkBasalt_src = [
'basalt.cpp',
'buffer.cpp',
Expand Down
9 changes: 9 additions & 0 deletions src/reshade/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
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.
336 changes: 336 additions & 0 deletions src/reshade/effect_codegen.hpp

Large diffs are not rendered by default.

Loading

0 comments on commit 7e73260

Please sign in to comment.