FidelityFX SPD release 1.0

Author: aurolou

.gitlab-ci.yml

@@ -1,88 +1,53 @@
 variables:
   SampleName: SPDSample
-  SolutionDirDX12: sample\build\DX12  
-  SolutionDX12: SPDSample_DX12.sln
-  SolutionDirVK: sample\build\VK
-  SolutionVK: SPDSample_VK.sln
   GIT_SUBMODULE_STRATEGY: normal
 
-before_script:
-  - 'for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,16.0)" -products Microsoft.VisualStudio.Product.BuildTools -property installationPath`) do set MSBUILD_PATH=%%i'
-  - 'call "%MSBUILD_PATH%\VC\Auxiliary\Build\vcvars64.bat"'
-  - 'cd sample\build'
-  - 'call GenerateSolutions.bat -T v141'
-  - 'cd ..\..'
-  
 stages:
   - build
   - deploy
 
-build d3d12 and vulkan sample release:
+build_dx12:
   tags:
   - windows
   - amd64
-  stage: deploy
-  except:
-  - tags
+  stage: build
+  artifacts:
+    untracked: true
   script:
-  - echo Building "%SolutionVK%"
-  - cd %SolutionDirVK%
-  - 'msbuild.exe "%SolutionVK%" /p:Configuration=Release /p:Platform=x64'
-  - cd ../../..
-  - echo Building "%SolutionDX12%"
-  - cd %SolutionDirDX12%
-  - 'msbuild.exe "%SolutionDX12%" /p:Configuration=Release /p:Platform=x64'
-  - cd ../../..
-  - mkdir %SampleName%
-  - move sample\bin %SampleName%
-  - move sample\media %SampleName%
-  - move sample\README.md %SampleName%
-  - echo cd .\%SampleName%\bin\ > %SampleName%_VK.bat
-  - echo start %SampleName%_VK.exe >> %SampleName%_VK.bat  
-  - echo cd .\%SampleName%\bin\ > %SampleName%_DX12.bat
-  - echo start %SampleName%_DX12.exe >> %SampleName%_DX12.bat  
+  - 'cmake -S sample -B sample/build/DX12 -G "Visual Studio 15 2017" -A x64 -DGFX_API=DX12'
+  - 'cmake --build sample/build/DX12'
+
+build_vk:
+  tags:
+  - windows
+  - amd64
+  stage: build
   artifacts:
-      name: "%SampleName%-%CI_COMMIT_REF_NAME%-%CI_COMMIT_SHORT_SHA%"
-      paths:
-      - "%SampleName%/bin/"
-      - "%SampleName%/media/"
-      - "%SampleName%/README.md"
-      - "%SampleName%_DX12.bat"
-      - "%SampleName%_VK.bat"
+    untracked: true
+  script:
+  - 'cmake -S sample -B sample/build/Vk -G "Visual Studio 15 2017" -A x64 -DGFX_API=VK'
+  - 'cmake --build sample/build/Vk'
 
-build d3d12 and vulkan sample release tagged:
+package_sample:
   tags:
   - windows
   - amd64
   stage: deploy
-  only:
-  - tags  
+  dependencies:
+    - build_dx12
+    - build_vk
   script:
-  - echo Building "%SolutionVK%"
-  - cd %SolutionDirVK%
-  - 'msbuild.exe "%SolutionVK%" /p:Configuration=Release /p:Platform=x64'
-  - cd ../../..
-  - echo Building "%SolutionDX12%"
-  - cd %SolutionDirDX12%
-  - 'msbuild.exe "%SolutionDX12%" /p:Configuration=Release /p:Platform=x64'
-  - cd ../../..
-  - mkdir %SampleName%
-  - move sample\bin %SampleName%
-  - move sample\media %SampleName%
-  - move sample\README.md %SampleName%
-  - move sample\screenshot.png %SampleName%
-  - move NOTICES.txt %SampleName%
-  - echo cd .\%SampleName%\bin\ > %SampleName%_VK.bat
-  - echo start %SampleName%_VK.exe >> %SampleName%_VK.bat  
-  - echo cd .\%SampleName%\bin\ > %SampleName%_DX12.bat
-  - echo start %SampleName%_DX12.exe >> %SampleName%_DX12.bat  
+  - echo "Packaging build"
   artifacts:
-      name: "%SampleName%-%CI_COMMIT_TAG%"
+      name: "%SampleName%-%CI_COMMIT_TAG%-%CI_COMMIT_REF_NAME%-%CI_COMMIT_SHORT_SHA%"
       paths:
-      - "%SampleName%/bin/"
-      - "%SampleName%/media/"
-      - "%SampleName%/NOTICES.txt"
-      - "%SampleName%/README.md"
-      - "%SampleName%/screenshot.png"
-      - "%SampleName%_DX12.bat"
-      - "%SampleName%_VK.bat"
+      - LICENSE.txt
+      - sample/bin/dxcompiler.dll
+      - sample/bin/dxil.dll
+      - sample/bin/amd_ags_x64.dll
+      - sample/bin/brdfLut.dds
+      - sample/bin/%SampleName%_VK.exe
+      - sample/bin/%SampleName%_DX12.exe
+      - sample/bin/ShaderLibDX
+      - sample/bin/ShaderLibVK
+      - sample/media/

LICENSE

@@ -7,13 +7,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.