Skip to content

Commit 1bbe66e

Browse files
committed
AMD FidelityFX SDK 1.1
1 parent d7531ae commit 1bbe66e

File tree

1,665 files changed

+340078
-63526
lines changed

Some content is hidden

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

1,665 files changed

+340078
-63526
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,5 +359,5 @@ healthchecksdb
359359
MigrationBackup/
360360

361361
# Folders created by the media delivery tool
362-
media/
363-
media-cache/
362+
/media/
363+
/media-cache/

.gitlab-ci.yml

Lines changed: 104 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ format_check:
2121
needs: []
2222
script:
2323
- echo Coming soon!
24-
24+
2525
build_release_cauldron:
2626
stage: build
2727
needs: []
@@ -48,42 +48,121 @@ build_debug_cauldron:
4848
paths:
4949
- ./bin
5050

51-
build_release_sdk:
51+
build_release_sdk_dx12:
5252
stage: build
5353
needs: []
5454
script:
5555
- 'cd sdk/'
5656
- 'mkdir build'
5757
- 'cd build'
58-
- 'cmake -A x64 .. -DFFX_API_CUSTOM=OFF -DFFX_ALL=ON -DFFX_AUTO_COMPILE_SHADERS=1'
58+
- 'cmake .. -DFFX_API_BACKEND=DX12_X64 -DFFX_ALL=ON -DFFX_AUTO_COMPILE_SHADERS=1'
5959
- 'cmake --build ./ --config Release %CMAKE_BUILD_DRIVER%'
6060
artifacts:
6161
paths:
6262
- ./sdk/bin
6363

64-
build_debug_sdk:
64+
build_debug_sdk_dx12:
6565
stage: build
6666
needs: []
6767
script:
6868
- 'cd sdk/'
6969
- 'mkdir build'
7070
- 'cd build'
71-
- 'cmake -A x64 .. -DFFX_API_CUSTOM=OFF -DFFX_ALL=ON -DFFX_AUTO_COMPILE_SHADERS=1'
71+
- 'cmake .. -DFFX_API_BACKEND=DX12_X64 -DFFX_ALL=ON -DFFX_AUTO_COMPILE_SHADERS=1'
7272
- 'cmake --build ./ --config Debug %CMAKE_BUILD_DRIVER%'
7373
artifacts:
7474
paths:
7575
- ./sdk/bin
76+
77+
build_release_sdk_vk:
78+
stage: build
79+
needs: []
80+
script:
81+
- 'cd sdk/'
82+
- 'mkdir build'
83+
- 'cd build'
84+
- 'cmake .. -DFFX_API_BACKEND=VK_X64 -DFFX_ALL=ON -DFFX_AUTO_COMPILE_SHADERS=1'
85+
- 'cmake --build ./ --config Release %CMAKE_BUILD_DRIVER%'
86+
artifacts:
87+
paths:
88+
- ./sdk/bin
89+
90+
build_debug_sdk_vk:
91+
stage: build
92+
needs: []
93+
script:
94+
- 'cd sdk/'
95+
- 'mkdir build'
96+
- 'cd build'
97+
- 'cmake .. -DFFX_API_BACKEND=VK_X64 -DFFX_ALL=ON -DFFX_AUTO_COMPILE_SHADERS=1'
98+
- 'cmake --build ./ --config Debug %CMAKE_BUILD_DRIVER%'
99+
artifacts:
100+
paths:
101+
- ./sdk/bin
102+
103+
build_debug_api_dll_dx12:
104+
stage: build
105+
needs: []
106+
script:
107+
- 'cd ffx-api'
108+
- 'mkdir build'
109+
- 'cd build'
110+
- 'cmake -A x64 .. -DFFX_API_BACKEND=DX12_X64'
111+
- 'cmake --build ./ --config Debug %CMAKE_BUILD_DRIVER%'
112+
artifacts:
113+
paths:
114+
- ./ffx-api/bin
115+
116+
build_release_api_dll_dx12:
117+
stage: build
118+
needs: []
119+
script:
120+
- 'cd ffx-api'
121+
- 'mkdir build'
122+
- 'cd build'
123+
- 'cmake -A x64 .. -DFFX_API_BACKEND=DX12_X64'
124+
- 'cmake --build ./ --config Release %CMAKE_BUILD_DRIVER%'
125+
artifacts:
126+
paths:
127+
- ./ffx-api/bin/amd_fidelityfx_dx12.dll
128+
- ./ffx-api/bin/amd_fidelityfx_dx12.lib
129+
130+
build_debug_api_dll_vk:
131+
stage: build
132+
needs: []
133+
script:
134+
- 'cd ffx-api'
135+
- 'mkdir build'
136+
- 'cd build'
137+
- 'cmake -A x64 .. -DFFX_API_BACKEND=VK_X64'
138+
- 'cmake --build ./ --config Debug %CMAKE_BUILD_DRIVER%'
139+
artifacts:
140+
paths:
141+
- ./ffx-api/bin
142+
143+
build_release_api_dll_vk:
144+
stage: build
145+
needs: []
146+
script:
147+
- 'cd ffx-api'
148+
- 'mkdir build'
149+
- 'cd build'
150+
- 'cmake -A x64 .. -DFFX_API_BACKEND=VK_X64'
151+
- 'cmake --build ./ --config Release %CMAKE_BUILD_DRIVER%'
152+
artifacts:
153+
paths:
154+
- ./ffx-api/bin/amd_fidelityfx_vk.dll
155+
- ./ffx-api/bin/amd_fidelityfx_vk.lib
76156

77157
build_release_samples_dx12:
78158
stage: build
79159
needs:
80-
- job: build_release_sdk
160+
- job: build_release_sdk_dx12
161+
- job: build_release_api_dll_dx12
81162
script:
82163
- 'mkdir build'
83164
- 'cd build'
84-
- 'cmake -A x64 .. -DBUILD_TYPE=ALL_SAMPLES -DFFX_API=CAULDRON'
85-
- 'cmake --build . --config ReleaseDX12 %CMAKE_BUILD_DRIVER%'
86-
- 'cmake -A x64 .. -DBUILD_TYPE=ALL_SAMPLES -DFFX_API=NATIVE'
165+
- 'cmake -A x64 .. -DBUILD_TYPE=SAMPLES_DX12 -DFFX_ALL=ON'
87166
- 'cmake --build . --config ReleaseDX12 %CMAKE_BUILD_DRIVER%'
88167
artifacts:
89168
paths:
@@ -92,13 +171,12 @@ build_release_samples_dx12:
92171
build_release_samples_vk:
93172
stage: build
94173
needs:
95-
- job: build_release_sdk
174+
- job: build_release_sdk_vk
175+
- job: build_release_api_dll_vk
96176
script:
97177
- 'mkdir build'
98178
- 'cd build'
99-
- 'cmake -A x64 .. -DBUILD_TYPE=ALL_SAMPLES -DFFX_API=CAULDRON'
100-
- 'cmake --build . --config ReleaseVK %CMAKE_BUILD_DRIVER%'
101-
- 'cmake -A x64 .. -DBUILD_TYPE=ALL_SAMPLES -DFFX_API=NATIVE'
179+
- 'cmake -A x64 .. -DBUILD_TYPE=SAMPLES_VK -DFFX_ALL=ON'
102180
- 'cmake --build . --config ReleaseVK %CMAKE_BUILD_DRIVER%'
103181
artifacts:
104182
paths:
@@ -107,13 +185,12 @@ build_release_samples_vk:
107185
build_debug_samples_dx12:
108186
stage: build
109187
needs:
110-
- job: build_debug_sdk
188+
- job: build_debug_sdk_dx12
189+
- job: build_debug_api_dll_dx12
111190
script:
112191
- 'mkdir build'
113192
- 'cd build'
114-
- 'cmake -A x64 .. -DBUILD_TYPE=ALL_SAMPLES -DFFX_API=CAULDRON'
115-
- 'cmake --build . --config DebugDX12 %CMAKE_BUILD_DRIVER%'
116-
- 'cmake -A x64 .. -DBUILD_TYPE=ALL_SAMPLES -DFFX_API=NATIVE'
193+
- 'cmake -A x64 .. -DBUILD_TYPE=SAMPLES_DX12 -DFFX_ALL=ON'
117194
- 'cmake --build . --config DebugDX12 %CMAKE_BUILD_DRIVER%'
118195
artifacts:
119196
paths:
@@ -122,46 +199,24 @@ build_debug_samples_dx12:
122199
build_debug_samples_vk:
123200
stage: build
124201
needs:
125-
- job: build_debug_sdk
202+
- job: build_debug_sdk_vk
203+
- job: build_debug_api_dll_vk
126204
script:
127205
- 'mkdir build'
128206
- 'cd build'
129-
- 'cmake -A x64 .. -DBUILD_TYPE=ALL_SAMPLES -DFFX_API=CAULDRON'
130-
- 'cmake --build . --config DebugVK %CMAKE_BUILD_DRIVER%'
131-
- 'cmake -A x64 .. -DBUILD_TYPE=ALL_SAMPLES -DFFX_API=NATIVE'
207+
- 'cmake -A x64 .. -DBUILD_TYPE=SAMPLES_VK -DFFX_ALL=ON'
132208
- 'cmake --build . --config DebugVK %CMAKE_BUILD_DRIVER%'
133209
artifacts:
134210
paths:
135211
- ./bin
136212

137-
package_release_samples:
213+
package_release_samples_pc:
138214
stage: package
139215
needs:
216+
- job: build_release_api_dll_dx12
217+
- job: build_release_api_dll_vk
140218
- job: build_release_samples_dx12
141-
- job: build_release_samples_vk
142-
script:
143-
- echo "Packaging FidelityFX SDK Samples"
144-
- 'copy %VULKAN_SDK%\Bin\glslc.exe .\bin'
145-
artifacts:
146-
name: "FIDELITYFX-SDK-SAMPLES-%CI_COMMIT_TAG%-%CI_COMMIT_REF_NAME%-%CI_COMMIT_SHORT_SHA%"
147-
paths:
148-
- ./bin
149-
- ./docs
150-
- ./framework
151-
- ./samples
152-
- ./sdk
153-
- ./*.bat
154-
- ./CMakeLists.txt
155-
- ./common.cmake
156-
- ./LICENSE.txt
157-
- ./readme.md
158-
- ./sample.cmake
159-
160-
package_debug_samples:
161-
stage: package
162-
needs:
163-
- job: build_debug_samples_dx12
164-
- job: build_debug_samples_vk
219+
- job: build_release_samples_vk
165220
script:
166221
- echo "Packaging FidelityFX SDK Samples"
167222
- 'copy %VULKAN_SDK%\Bin\glslc.exe .\bin'
@@ -170,12 +225,14 @@ package_debug_samples:
170225
paths:
171226
- ./bin
172227
- ./docs
228+
- ./ffx-api
173229
- ./framework
230+
- ./PrebuiltSignedDLL
174231
- ./samples
175232
- ./sdk
176233
- ./*.bat
177234
- ./CMakeLists.txt
178235
- ./common.cmake
179236
- ./LICENSE.txt
180237
- ./readme.md
181-
- ./sample.cmake
238+
- ./sample.cmake

BuildAllCauldronEffectsSolution.bat

Lines changed: 0 additions & 33 deletions
This file was deleted.

BuildAllNativeEffectsSolution.bat

Lines changed: 0 additions & 23 deletions
This file was deleted.

BuildBlurSolution.bat

Lines changed: 0 additions & 33 deletions
This file was deleted.

BuildCACAOSolution.bat

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)