diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index d906db80..41c5fbf3 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -2,6 +2,12 @@ name: Win32/UWP build on: [push, pull_request] +env: + # 'capture' - generate golden images + # 'compare' - render and compare with the references + # 'compare_update' - first compare with the references and then update them + test_mode: compare_update + jobs: precheks: name: Win10 -> Pre-checks @@ -23,13 +29,14 @@ jobs: shell: cmd working-directory: ${{github.workspace}}/DiligentSamples/BuildTools/FormatValidation run: validate_format_win.bat - + build: needs: precheks runs-on: windows-2022 strategy: + fail-fast: false matrix: name: ["Win10"] toolset: ["Win32", "x64"] @@ -85,9 +92,15 @@ jobs: name: Win10 -> ${{ matrix.name }}-${{ matrix.toolset }}, ${{ matrix.build_type }} steps: - - name: Checkout + - name: Checkout Code Base uses: DiligentGraphics/github-action/checkout@v1 + - name: Checkout Test Data + uses: actions/checkout@v2 + with: + repository: DiligentGraphics/DiligentTestData + path: DiligentTestData + - name: Set up build environment if: success() uses: DiligentGraphics/github-action/setup-build-env@v1 @@ -108,3 +121,28 @@ jobs: - name: Build if: success() uses: DiligentGraphics/github-action/build@v1 + + - name: Run Sample Tests D3D11 + working-directory: ${{github.workspace}}/DiligentTestData/GoldenImages + if: ${{ success() && (matrix.name == 'Win10' || matrix.name == 'Win8.1') }} + shell: cmd + run: | + rem Run Sample Tests D3D11 + ProcessGoldenImages.bat "%DILIGENT_BUILD_DIR%" ${{matrix.build_type}} ${{matrix.test_mode}} "--mode d3d11 --adapter sw" + + - name: Run Sample Tests D3D12 + working-directory: ${{github.workspace}}/DiligentTestData/GoldenImages + if: ${{ success() && matrix.name == 'Win10' }} + shell: cmd + run: | + rem Run Sample Tests D3D12 + ProcessGoldenImages.bat "%DILIGENT_BUILD_DIR%" ${{matrix.build_type}} ${{matrix.test_mode}} "--mode d3d12 --adapter sw" + + - name: Upload Golden Images + uses: actions/upload-artifact@v2 + if: ${{ matrix.name == 'Win10' || matrix.name == 'Win8.1' }} + with: + name: GoldenImages-${{ matrix.name }}-${{ matrix.toolset }}-${{ matrix.build_type }} + path: | + ${{github.workspace}}/DiligentTestData/GoldenImages + retention-days: 90 diff --git a/BuildTools/Scripts/appveyor/run_tests.bat b/BuildTools/Scripts/appveyor/run_tests.bat deleted file mode 100644 index a14839d8..00000000 --- a/BuildTools/Scripts/appveyor/run_tests.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off - -if "%PLATFORM_NAME%"=="Windows" ( - if "%PLATFORM%" == "x64" ( - ProcessGoldenImages.bat %1 %CONFIGURATION% %2 "--mode d3d11 --adapter sw" "--mode d3d12 --adapter sw" - ) else ( - rem There appear to be bugs in 32-bit D3D12 WARP that cause shader compilation errors in - rem Tutorial14 and Atmosphere sample, so only run tests in d3d11 mode - ProcessGoldenImages.bat %1 %CONFIGURATION% %2 "--mode d3d11 --adapter sw" - ) -) - -if "%PLATFORM_NAME%"=="Windows8.1" ( - ProcessGoldenImages.bat %1 %CONFIGURATION% %2 "--mode d3d11 --adapter sw" -) diff --git a/Tests/GoldenImages/ProcessGoldenImages.bat b/Tests/GoldenImages/ProcessGoldenImages.bat deleted file mode 100644 index 70b1cb58..00000000 --- a/Tests/GoldenImages/ProcessGoldenImages.bat +++ /dev/null @@ -1,188 +0,0 @@ -@echo off - -set num_args=0 -for %%x in (%*) do Set /A num_args+=1 - -if "%num_args%" LSS "4" ( - echo Command line format: - echo. - echo ProcessGoldenImages.bat build_path config golden_img_mode test_modes - echo. - echo build_path - path to the root of the build tree - echo config - configuration (Debug, Release, etc.^) - echo golden_img_mode - golden image processing mode (capture or compare^) - echo test_modes - list of test modes (e.g. "--mode d3d11" "--mode d3d11 --adapter sw" "--mode d3d12" "--mode gl" "--mode vk"^) - echo. - echo Example: - echo ProcessGoldenImages.bat c:\Projects\DiligentEngine\build\Win64 Debug compare "--mode d3d11" "--mode d3d12 --adapter sw" - EXIT /B -1 -) - - -rem Enable delayed expansion to be able to use !ERRORLEVEL! -setlocal ENABLEDELAYEDEXPANSION - -if "%golden_img_width%" == "" ( - set golden_img_width=512 -) -if "%golden_img_height%" == "" ( - set golden_img_height=512 -) -if "%golden_images_root_dir%" == "" ( - set golden_images_root_dir=../../../Tests/GoldenImages -) - - :: ~ removes surrounding quotes -set build_folder=%~1 -shift - -set config=%1 -shift - -set golden_img_mode=%1 -shift - -set rest_args= -:loop1 - if "%~1"=="" goto end_loop1 - :: Do not remove quotes yet as this will ungroup arguments - set rest_args=%rest_args% %1 - shift - goto loop1 -:end_loop1 - -cd ../.. - -set Tutorials=Tutorial01_HelloTriangle^ - Tutorial02_Cube^ - Tutorial03_Texturing^ - Tutorial03_Texturing-C^ - Tutorial04_Instancing^ - Tutorial05_TextureArray^ - Tutorial06_Multithreading^ - Tutorial07_GeometryShader^ - Tutorial08_Tessellation^ - Tutorial09_Quads^ - Tutorial10_DataStreaming^ - Tutorial11_ResourceUpdates^ - Tutorial12_RenderTarget^ - Tutorial13_ShadowMap^ - Tutorial14_ComputeShader^ - Tutorial16_BindlessResources^ - Tutorial17_MSAA^ - Tutorial18_Queries^ - Tutorial19_RenderPasses - -set Samples=Atmosphere^ - GLTFViewer^ - NuklearDemo^ - Shadows - -rem ImguiDemo has fps counter in the UI, so we have to skip it - -set ERROR=0 -set APP_ID=1 - -for %%X in (%Tutorials%) do ( - call :gen_golden_img Tutorials %%X %rest_args% || set /a ERROR=!ERROR!+!APP_ID! - set /a APP_ID=!APP_ID!*2 -) - -for %%X in (%Samples%) do ( - call :gen_golden_img Samples %%X %rest_args% || set /a ERROR=!ERROR!+!APP_ID! - set /a APP_ID=!APP_ID!*2 -) - -cd Tests/GoldenImages - -EXIT /B %ERROR% - - - -:gen_golden_img - - set app_folder=%1 - shift - - set app_name=%1 - shift - - rem Who knows why, but without the echos below, the script fails on Appveyor. - @echo Testing %app_folder%/%app_name%... - @echo. - - set show_ui=1 - if "%app_folder%" == "Samples" ( - set show_ui=0 - if "%app_name%" == "ImguiDemo" set show_ui=1 - ) - if "%app_name%" == "Tutorial18_Queries" set show_ui=0 - - set test_modes= - :loop2 - :: Do not remove quotes as this will ungroup arguments - if "%~1"=="" goto end_loop2 - set test_modes=%test_modes% %1 - shift - goto loop2 - :end_loop2 - - cd "%app_folder%/%app_name%/assets" - - set golden_img_dir=%golden_images_root_dir%/%app_folder%/%app_name% - if not exist "%golden_img_dir%" ( - md "%golden_img_dir%" - ) - - set EXIT_CODE=0 - for %%X in (%test_modes%) do ( - - set app_path=%build_folder%/DiligentSamples/%app_folder%/%app_name%/%config%/%app_name%.exe - - :: Get the backend name and extra arguments - set extra_args= - set mode_param=0 - for %%Y in (%%~X) do ( - if "%%Y" == "--mode" ( - set mode_param=1 - ) else ( - if "!mode_param!" == "1" ( - set backend_name=%%Y - set mode_param=0 - ) else ( - set extra_args=!extra_args! %%Y - ) - ) - ) - set capture_name=%app_name%_gi_!backend_name! - - - rem !!! ERRORLEVEL doesn't get updated inside control blocks like IF statements unless !!! - rem !!! !ERRORLEVEL! is used instead of %ERRORLEVEL% and delayed expansion is enabled as below: !!! - rem !!! setlocal ENABLEDELAYEDEXPANSION !!! - rem ~ removes quotes from %%~X - !app_path! %%~X --width %golden_img_width% --height %golden_img_height% --golden_image_mode %golden_img_mode% --capture_path %golden_img_dir% --capture_name !capture_name! --capture_format png --adapters_dialog 0 --show_ui %show_ui% - - if !ERRORLEVEL! NEQ 0 ( - if !ERRORLEVEL! GEQ 0 ( - echo Golden image validation FAILED for %app_name% [!backend_name!!extra_args!]: !ERRORLEVEL! inconsistent pixels found - if "%golden_img_mode%" == "compare_update" echo Golden image updated - ) else ( - if "%golden_img_mode%" == "compare" echo Golden image validation FAILED for %app_name% [!backend_name!!extra_args!]: unknown error - if "%golden_img_mode%" == "capture" echo FAILED to generate golden image for %app_name% [!backend_name!!extra_args!]: unknown error - if "%golden_img_mode%" == "compare_update" echo FAILED to validate or update golden image for %app_name% [!backend_name!!extra_args!]: unknown error - ) - set EXIT_CODE=1 - ) else ( - if "%golden_img_mode%" == "compare" echo Golden image validation PASSED for %app_name% [!backend_name!!extra_args!] - if "%golden_img_mode%" == "capture" echo Successfully generated golden image for %app_name% [!backend_name!!extra_args!] - if "%golden_img_mode%" == "compare_update" echo Golden image validation PASSED for %app_name%. Image updated. [!backend_name!!extra_args!] - ) - - echo. - echo. - ) - - cd ../../../ - - EXIT /B %EXIT_CODE% diff --git a/Tests/GoldenImages/Samples/Atmosphere/Atmosphere_gi_d3d11.png b/Tests/GoldenImages/Samples/Atmosphere/Atmosphere_gi_d3d11.png deleted file mode 100644 index 8f8e0029..00000000 Binary files a/Tests/GoldenImages/Samples/Atmosphere/Atmosphere_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/Atmosphere/Atmosphere_gi_d3d12.png b/Tests/GoldenImages/Samples/Atmosphere/Atmosphere_gi_d3d12.png deleted file mode 100644 index 558fd296..00000000 Binary files a/Tests/GoldenImages/Samples/Atmosphere/Atmosphere_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/GLTFViewer/GLTFViewer_gi_d3d11.png b/Tests/GoldenImages/Samples/GLTFViewer/GLTFViewer_gi_d3d11.png deleted file mode 100644 index b0e0892c..00000000 Binary files a/Tests/GoldenImages/Samples/GLTFViewer/GLTFViewer_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/GLTFViewer/GLTFViewer_gi_d3d12.png b/Tests/GoldenImages/Samples/GLTFViewer/GLTFViewer_gi_d3d12.png deleted file mode 100644 index 0c2aa48d..00000000 Binary files a/Tests/GoldenImages/Samples/GLTFViewer/GLTFViewer_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/ImguiDemo/ImguiDemo_gi_d3d11.png b/Tests/GoldenImages/Samples/ImguiDemo/ImguiDemo_gi_d3d11.png deleted file mode 100644 index 35aa0d15..00000000 Binary files a/Tests/GoldenImages/Samples/ImguiDemo/ImguiDemo_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/ImguiDemo/ImguiDemo_gi_d3d12.png b/Tests/GoldenImages/Samples/ImguiDemo/ImguiDemo_gi_d3d12.png deleted file mode 100644 index 4046f3ff..00000000 Binary files a/Tests/GoldenImages/Samples/ImguiDemo/ImguiDemo_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/NuklearDemo/NuklearDemo_gi_d3d11.png b/Tests/GoldenImages/Samples/NuklearDemo/NuklearDemo_gi_d3d11.png deleted file mode 100644 index 48940f10..00000000 Binary files a/Tests/GoldenImages/Samples/NuklearDemo/NuklearDemo_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/NuklearDemo/NuklearDemo_gi_d3d12.png b/Tests/GoldenImages/Samples/NuklearDemo/NuklearDemo_gi_d3d12.png deleted file mode 100644 index 48940f10..00000000 Binary files a/Tests/GoldenImages/Samples/NuklearDemo/NuklearDemo_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/Shadows/Shadows_gi_d3d11.png b/Tests/GoldenImages/Samples/Shadows/Shadows_gi_d3d11.png deleted file mode 100644 index e56d40e6..00000000 Binary files a/Tests/GoldenImages/Samples/Shadows/Shadows_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Samples/Shadows/Shadows_gi_d3d12.png b/Tests/GoldenImages/Samples/Shadows/Shadows_gi_d3d12.png deleted file mode 100644 index 208f8d4c..00000000 Binary files a/Tests/GoldenImages/Samples/Shadows/Shadows_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial01_HelloTriangle/Tutorial01_HelloTriangle_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial01_HelloTriangle/Tutorial01_HelloTriangle_gi_d3d11.png deleted file mode 100644 index 09b06542..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial01_HelloTriangle/Tutorial01_HelloTriangle_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial01_HelloTriangle/Tutorial01_HelloTriangle_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial01_HelloTriangle/Tutorial01_HelloTriangle_gi_d3d12.png deleted file mode 100644 index 09b06542..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial01_HelloTriangle/Tutorial01_HelloTriangle_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial02_Cube/Tutorial02_Cube_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial02_Cube/Tutorial02_Cube_gi_d3d11.png deleted file mode 100644 index d5463a06..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial02_Cube/Tutorial02_Cube_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial02_Cube/Tutorial02_Cube_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial02_Cube/Tutorial02_Cube_gi_d3d12.png deleted file mode 100644 index d5463a06..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial02_Cube/Tutorial02_Cube_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial03_Texturing-C/Tutorial03_Texturing-C_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial03_Texturing-C/Tutorial03_Texturing-C_gi_d3d11.png deleted file mode 100644 index e6765059..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial03_Texturing-C/Tutorial03_Texturing-C_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial03_Texturing-C/Tutorial03_Texturing-C_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial03_Texturing-C/Tutorial03_Texturing-C_gi_d3d12.png deleted file mode 100644 index e6765059..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial03_Texturing-C/Tutorial03_Texturing-C_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial03_Texturing/Tutorial03_Texturing_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial03_Texturing/Tutorial03_Texturing_gi_d3d11.png deleted file mode 100644 index e6765059..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial03_Texturing/Tutorial03_Texturing_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial03_Texturing/Tutorial03_Texturing_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial03_Texturing/Tutorial03_Texturing_gi_d3d12.png deleted file mode 100644 index e6765059..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial03_Texturing/Tutorial03_Texturing_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial04_Instancing/Tutorial04_Instancing_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial04_Instancing/Tutorial04_Instancing_gi_d3d11.png deleted file mode 100644 index 925b372b..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial04_Instancing/Tutorial04_Instancing_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial04_Instancing/Tutorial04_Instancing_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial04_Instancing/Tutorial04_Instancing_gi_d3d12.png deleted file mode 100644 index 925b372b..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial04_Instancing/Tutorial04_Instancing_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial05_TextureArray/Tutorial05_TextureArray_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial05_TextureArray/Tutorial05_TextureArray_gi_d3d11.png deleted file mode 100644 index 5d60c6b7..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial05_TextureArray/Tutorial05_TextureArray_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial05_TextureArray/Tutorial05_TextureArray_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial05_TextureArray/Tutorial05_TextureArray_gi_d3d12.png deleted file mode 100644 index 5d60c6b7..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial05_TextureArray/Tutorial05_TextureArray_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial06_Multithreading/Tutorial06_Multithreading_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial06_Multithreading/Tutorial06_Multithreading_gi_d3d11.png deleted file mode 100644 index 845b051d..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial06_Multithreading/Tutorial06_Multithreading_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial06_Multithreading/Tutorial06_Multithreading_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial06_Multithreading/Tutorial06_Multithreading_gi_d3d12.png deleted file mode 100644 index 845b051d..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial06_Multithreading/Tutorial06_Multithreading_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial07_GeometryShader/Tutorial07_GeometryShader_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial07_GeometryShader/Tutorial07_GeometryShader_gi_d3d11.png deleted file mode 100644 index ab515eb9..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial07_GeometryShader/Tutorial07_GeometryShader_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial07_GeometryShader/Tutorial07_GeometryShader_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial07_GeometryShader/Tutorial07_GeometryShader_gi_d3d12.png deleted file mode 100644 index ab515eb9..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial07_GeometryShader/Tutorial07_GeometryShader_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial08_Tessellation/Tutorial08_Tessellation_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial08_Tessellation/Tutorial08_Tessellation_gi_d3d11.png deleted file mode 100644 index 2ff3c729..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial08_Tessellation/Tutorial08_Tessellation_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial08_Tessellation/Tutorial08_Tessellation_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial08_Tessellation/Tutorial08_Tessellation_gi_d3d12.png deleted file mode 100644 index 2ff3c729..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial08_Tessellation/Tutorial08_Tessellation_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial09_Quads/Tutorial09_Quads_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial09_Quads/Tutorial09_Quads_gi_d3d11.png deleted file mode 100644 index 06d27133..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial09_Quads/Tutorial09_Quads_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial09_Quads/Tutorial09_Quads_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial09_Quads/Tutorial09_Quads_gi_d3d12.png deleted file mode 100644 index 06d27133..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial09_Quads/Tutorial09_Quads_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial10_DataStreaming/Tutorial10_DataStreaming_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial10_DataStreaming/Tutorial10_DataStreaming_gi_d3d11.png deleted file mode 100644 index b5e1b7bd..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial10_DataStreaming/Tutorial10_DataStreaming_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial10_DataStreaming/Tutorial10_DataStreaming_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial10_DataStreaming/Tutorial10_DataStreaming_gi_d3d12.png deleted file mode 100644 index 1d584cc8..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial10_DataStreaming/Tutorial10_DataStreaming_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial11_ResourceUpdates/Tutorial11_ResourceUpdates_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial11_ResourceUpdates/Tutorial11_ResourceUpdates_gi_d3d11.png deleted file mode 100644 index 8b887091..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial11_ResourceUpdates/Tutorial11_ResourceUpdates_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial11_ResourceUpdates/Tutorial11_ResourceUpdates_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial11_ResourceUpdates/Tutorial11_ResourceUpdates_gi_d3d12.png deleted file mode 100644 index 8b887091..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial11_ResourceUpdates/Tutorial11_ResourceUpdates_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial12_RenderTarget/Tutorial12_RenderTarget_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial12_RenderTarget/Tutorial12_RenderTarget_gi_d3d11.png deleted file mode 100644 index d8ab6113..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial12_RenderTarget/Tutorial12_RenderTarget_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial12_RenderTarget/Tutorial12_RenderTarget_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial12_RenderTarget/Tutorial12_RenderTarget_gi_d3d12.png deleted file mode 100644 index d8ab6113..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial12_RenderTarget/Tutorial12_RenderTarget_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial13_ShadowMap/Tutorial13_ShadowMap_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial13_ShadowMap/Tutorial13_ShadowMap_gi_d3d11.png deleted file mode 100644 index 937ed075..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial13_ShadowMap/Tutorial13_ShadowMap_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial13_ShadowMap/Tutorial13_ShadowMap_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial13_ShadowMap/Tutorial13_ShadowMap_gi_d3d12.png deleted file mode 100644 index 937ed075..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial13_ShadowMap/Tutorial13_ShadowMap_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial14_ComputeShader/Tutorial14_ComputeShader_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial14_ComputeShader/Tutorial14_ComputeShader_gi_d3d11.png deleted file mode 100644 index 706dab6d..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial14_ComputeShader/Tutorial14_ComputeShader_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial14_ComputeShader/Tutorial14_ComputeShader_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial14_ComputeShader/Tutorial14_ComputeShader_gi_d3d12.png deleted file mode 100644 index 706dab6d..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial14_ComputeShader/Tutorial14_ComputeShader_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial16_BindlessResources/Tutorial16_BindlessResources_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial16_BindlessResources/Tutorial16_BindlessResources_gi_d3d11.png deleted file mode 100644 index 06bb216f..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial16_BindlessResources/Tutorial16_BindlessResources_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial16_BindlessResources/Tutorial16_BindlessResources_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial16_BindlessResources/Tutorial16_BindlessResources_gi_d3d12.png deleted file mode 100644 index 64d6b778..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial16_BindlessResources/Tutorial16_BindlessResources_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial17_MSAA/Tutorial17_MSAA_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial17_MSAA/Tutorial17_MSAA_gi_d3d11.png deleted file mode 100644 index 10ecb792..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial17_MSAA/Tutorial17_MSAA_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial17_MSAA/Tutorial17_MSAA_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial17_MSAA/Tutorial17_MSAA_gi_d3d12.png deleted file mode 100644 index 10ecb792..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial17_MSAA/Tutorial17_MSAA_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial18_Queries/Tutorial18_Queries_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial18_Queries/Tutorial18_Queries_gi_d3d11.png deleted file mode 100644 index e6765059..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial18_Queries/Tutorial18_Queries_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial18_Queries/Tutorial18_Queries_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial18_Queries/Tutorial18_Queries_gi_d3d12.png deleted file mode 100644 index e6765059..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial18_Queries/Tutorial18_Queries_gi_d3d12.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial19_RenderPasses/Tutorial19_RenderPasses_gi_d3d11.png b/Tests/GoldenImages/Tutorials/Tutorial19_RenderPasses/Tutorial19_RenderPasses_gi_d3d11.png deleted file mode 100644 index 7605d16a..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial19_RenderPasses/Tutorial19_RenderPasses_gi_d3d11.png and /dev/null differ diff --git a/Tests/GoldenImages/Tutorials/Tutorial19_RenderPasses/Tutorial19_RenderPasses_gi_d3d12.png b/Tests/GoldenImages/Tutorials/Tutorial19_RenderPasses/Tutorial19_RenderPasses_gi_d3d12.png deleted file mode 100644 index 7605d16a..00000000 Binary files a/Tests/GoldenImages/Tutorials/Tutorial19_RenderPasses/Tutorial19_RenderPasses_gi_d3d12.png and /dev/null differ diff --git a/appveyor.yml b/appveyor.yml index 3eecc952..e28295f2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,11 +10,6 @@ image: - Visual Studio 2019 environment: - # use 'capture' to generate golden images and upload them as build artifacts - # use 'compare' to render and compare with the golden references - # use 'compare_update' to first compare with the references and then update them - test_mode: compare_update - matrix: - platform: x64 configuration: Debug @@ -52,15 +47,3 @@ build: project: c:\projects\build\DiligentSamples_Test.sln verbosity: minimal parallel: true - -test_script: - - 'cd %APPVEYOR_BUILD_FOLDER%\Tests\GoldenImages' - - '%APPVEYOR_BUILD_FOLDER%\BuildTools\Scripts\appveyor\run_tests.bat c:\projects\build %test_mode%' - -after_test: - - 'cd %APPVEYOR_BUILD_FOLDER%' - - 7z a golden_images-"%CONFIGURATION%".zip .\Tests\GoldenImages\*\* - -artifacts: - - path: \golden_images-*.zip - name: golden_images-zip