Skip to content

Commit 0c662b0

Browse files
nvzkupunvzkupu
committed
Merge branch 'REMIX-4016-bridge-migration' into 'main'
Testing github actions in test repo See merge request lightspeedrtx/test-dxvk-remix-nv!1
2 parents 1842270 + 59cd66e commit 0c662b0

File tree

228 files changed

+55678
-9
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+55678
-9
lines changed

‎.github/workflows/build.yml‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,51 @@ jobs:
4040
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process
4141
. .\build_common.ps1
4242
PerformBuild -BuildFlavour ${{matrix.build-flavour}} -BuildSubDir ${{matrix.output-subdir}} -Backend ninja -EnableTracy false copy_output
43-
43+
4444
- name: Copy readme
4545
run: copy artifacts_readme.txt _output
4646

47-
- name: Upload binaries
47+
- name: Upload x64 binaries
4848
uses: actions/upload-artifact@v4
4949
with:
50-
name: dxvk-remix-${{env.GITHUB_SHA_SHORT}}-${{github.run_number}}-${{matrix.build-flavour}}
50+
name: rtx-remix-for-x64-games-${{env.GITHUB_SHA_SHORT}}-${{github.run_number}}-${{matrix.build-flavour}}
5151
path: |
5252
_output\*.dll
5353
_output\*.pdb
5454
_output\*.txt
5555
_output\usd\*
56+
57+
- name: Move DXVK
58+
shell: pwsh
59+
run: |
60+
mkdir _output\.trex
61+
Move-Item -Path _output\*.dll -Destination _output\.trex\
62+
Move-Item -Path _output\*.pdb -Destination _output\.trex\
63+
Move-Item -Path _output\usd -Destination _output\.trex\usd
64+
65+
- name: Build Bridge
66+
shell: pwsh
67+
run: |
68+
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process
69+
pushd bridge
70+
. .\build_bridge_${{matrix.build-flavour}}.bat
71+
popd
72+
73+
- name: Copy Bridge
74+
shell: pwsh
75+
run: |
76+
Copy-Item -Recurse -Path bridge\_output -Destination _output
77+
78+
- name: Upload x86 binaries
79+
uses: actions/upload-artifact@v4
80+
with:
81+
name: rtx-remix-for-x86-games-${{env.GITHUB_SHA_SHORT}}-${{github.run_number}}-${{matrix.build-flavour}}
82+
include-hidden-files: true
83+
path: |
84+
_output\*.dll
85+
_output\*.exe
86+
_output\*.pdb
87+
_output\*.txt
88+
_output\.trex\*.dll
89+
_output\.trex\*.exe
90+
_output\.trex\*.pdb

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@
3636
[submodule "submodules/nvapi/nvapi"]
3737
path = submodules/nvapi
3838
url = https://github.com/NVIDIA/nvapi.git
39+
[submodule "submodules/Detours"]
40+
path = submodules/Detours
41+
url = https://github.com/microsoft/Detours.git

‎artifacts_readme.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ Installation instructions:
33
1. Install a Remix release from https://github.com/NVIDIAGameWorks/rtx-remix
44
(Generally, the last release that came out before the build you are installing)
55

6-
2. Copy and paste the files from this package into the `.trex/` folder
7-
from that release.
6+
2. Ensure you have the correct artifact. Most d3d9 games were compiled for x86
7+
computers, and will need the `rtx-remix-for-x86-games-...` package. If you know
8+
your game was compiled for x64, use the `rtx-remix-for-x64-games-...` package.
9+
10+
3. Copy and paste the files directly into your game directory.
811

912
Notes:
1013

1114
- You should be prompted to overwrite existing files - if you aren't, you're
12-
probably putting the files in the wrong place.
13-
14-
- For x86 games, the files here should NOT be put next to the game's executable.
15-
The d3d9.dll file next to the executable is the Remix Bridge, not DXVK-Remix.
15+
probably putting the files in the wrong place.

‎bridge/.editorconfig‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Visual Studio generated .editorconfig file with C++ settings.
2+
root = true
3+
4+
[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
5+
6+
indent_style = space
7+
indent_size = 2
8+
tab_width = 2
9+
10+
# Visual C++ Code Style settings
11+
12+
cpp_generate_documentation_comments = doxygen_slash_star
13+
14+
# Visual C++ Formatting settings
15+
16+
cpp_indent_braces = false
17+
cpp_indent_multi_line_relative_to = innermost_parenthesis
18+
cpp_indent_within_parentheses = align_to_parenthesis
19+
cpp_indent_preserve_within_parentheses = true
20+
cpp_indent_case_contents = true
21+
cpp_indent_case_labels = false
22+
cpp_indent_case_contents_when_block = false
23+
cpp_indent_lambda_braces_when_parameter = true
24+
cpp_indent_goto_labels = one_left
25+
cpp_indent_preprocessor = leftmost_column
26+
cpp_indent_access_specifiers = false
27+
cpp_indent_namespace_contents = true
28+
cpp_indent_preserve_comments = false
29+
cpp_new_line_before_open_brace_namespace = same_line
30+
cpp_new_line_before_open_brace_type = same_line
31+
cpp_new_line_before_open_brace_function = same_line
32+
cpp_new_line_before_open_brace_block = same_line
33+
cpp_new_line_before_open_brace_lambda = same_line
34+
cpp_new_line_scope_braces_on_separate_lines = true
35+
cpp_new_line_close_brace_same_line_empty_type = false
36+
cpp_new_line_close_brace_same_line_empty_function = false
37+
cpp_new_line_before_catch = true
38+
cpp_new_line_before_else = false
39+
cpp_new_line_before_while_in_do_while = false
40+
cpp_space_before_function_open_parenthesis = remove
41+
cpp_space_within_parameter_list_parentheses = false
42+
cpp_space_between_empty_parameter_list_parentheses = false
43+
cpp_space_after_keywords_in_control_flow_statements = true
44+
cpp_space_within_control_flow_statement_parentheses = false
45+
cpp_space_before_lambda_open_parenthesis = false
46+
cpp_space_within_cast_parentheses = false
47+
cpp_space_after_cast_close_parenthesis = true
48+
cpp_space_within_expression_parentheses = false
49+
cpp_space_before_block_open_brace = true
50+
cpp_space_between_empty_braces = true
51+
cpp_space_before_initializer_list_open_brace = true
52+
cpp_space_within_initializer_list_braces = true
53+
cpp_space_preserve_in_initializer_list = true
54+
cpp_space_before_open_square_bracket = false
55+
cpp_space_within_square_brackets = false
56+
cpp_space_before_empty_square_brackets = false
57+
cpp_space_between_empty_square_brackets = false
58+
cpp_space_group_square_brackets = true
59+
cpp_space_within_lambda_brackets = false
60+
cpp_space_between_empty_lambda_brackets = false
61+
cpp_space_before_comma = false
62+
cpp_space_after_comma = true
63+
cpp_space_remove_around_member_operators = true
64+
cpp_space_before_inheritance_colon = true
65+
cpp_space_before_constructor_colon = true
66+
cpp_space_remove_before_semicolon = true
67+
cpp_space_after_semicolon = true
68+
cpp_space_remove_around_unary_operator = true
69+
cpp_space_around_binary_operator = insert
70+
cpp_space_around_assignment_operator = insert
71+
cpp_space_pointer_reference_alignment = left
72+
cpp_space_around_ternary_operator = insert
73+
cpp_wrap_preserve_blocks = never

‎bridge/.gitattributes‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#############################################################################
2+
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
3+
#
4+
# Permission is hereby granted, free of charge, to any person obtaining a
5+
# copy of this software and associated documentation files (the "Software"),
6+
# to deal in the Software without restriction, including without limitation
7+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
# and/or sell copies of the Software, and to permit persons to whom the
9+
# Software is furnished to do so, subject to the following conditions:
10+
#
11+
# The above copyright notice and this permission notice shall be included in
12+
# all copies or substantial portions of the Software.
13+
#
14+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20+
# DEALINGS IN THE SOFTWARE.
21+
#############################################################################
22+
23+
*.lib filter=lfs diff=lfs merge=lfs -text
24+
*.exe filter=lfs diff=lfs merge=lfs -text
25+
*.bin filter=lfs diff=lfs merge=lfs -text
26+
*.dll filter=lfs diff=lfs merge=lfs -text
27+
*.pdb filter=lfs diff=lfs merge=lfs -text

‎bridge/.gitignore‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#############################################################################
2+
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
3+
#
4+
# Permission is hereby granted, free of charge, to any person obtaining a
5+
# copy of this software and associated documentation files (the "Software"),
6+
# to deal in the Software without restriction, including without limitation
7+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
# and/or sell copies of the Software, and to permit persons to whom the
9+
# Software is furnished to do so, subject to the following conditions:
10+
#
11+
# The above copyright notice and this permission notice shall be included in
12+
# all copies or substantial portions of the Software.
13+
#
14+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20+
# DEALINGS IN THE SOFTWARE.
21+
#############################################################################
22+
23+
_output/
24+
_output
25+
_comp*
26+
_Comp*
27+
_vs/**
28+
29+
.history
30+
game_list.txt
31+
vsgen/__pycache__/**
32+
33+
/gametargets.conf

‎bridge/Directory.Build.Props‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
3+
4+
Permission is hereby granted, free of charge, to any person obtaining a
5+
copy of this software and associated documentation files (the "Software"),
6+
to deal in the Software without restriction, including without limitation
7+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
and/or sell copies of the Software, and to permit persons to whom the
9+
Software is furnished to do so, subject to the following conditions:
10+
11+
The above copyright notice and this permission notice shall be included in
12+
all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20+
DEALINGS IN THE SOFTWARE.
21+
-->
22+
<Project>
23+
<PropertyGroup>
24+
<UseMultiToolTask>true</UseMultiToolTask>
25+
<EnforceProcessCountAcrossBuilds>true</EnforceProcessCountAcrossBuilds>
26+
</PropertyGroup>
27+
</Project>

‎bridge/LICENSE-MIT‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright 2022-2023 NVIDIA CORPORATION & AFFILIATES.
2+
All rights reserved.
3+
4+
MIT License (https://opensource.org/licenses/MIT)
5+
Permission is hereby granted, free of charge, to any person obtaining a
6+
copy of this software and associated documentation files (the "Software"),
7+
to deal in the Software without restriction, including without limitation
8+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
and/or sell copies of the Software, and to permit persons to whom the
10+
Software is furnished to do so, subject to the following conditions:
11+
The above copyright notice and this permission notice shall be included in
12+
all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20+
DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)