[GitHub] Remove WARP from macOS

Kode · Feb 1, 2025 · c876ded · c876ded
1 parent c9efd3c
commit c876ded
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 72 deletions.
diff --git a/.github/workflows/macos-metal.yml b/.github/workflows/macos-metal.yml
@@ -17,14 +17,9 @@ jobs:
     - uses: actions/checkout@v4
 
 
-    - name: Install WARP 1.0.13
-      run: nuget install Microsoft.Direct3D.WARP
     - name: Get Submodules
       run: ./get_dlc
 
-    - name: Copy WARP
-      working-directory: Shader
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile Shader
       working-directory: Shader
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -37,9 +32,6 @@ jobs:
       with:
         name: Shader image
         path: Shader/Deployment/test.png
-    - name: Copy WARP
-      working-directory: Texture
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile Texture
       working-directory: Texture
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -52,9 +44,6 @@ jobs:
       with:
         name: Texture image
         path: Texture/Deployment/test.png
-    - name: Copy WARP
-      working-directory: ComputeShader
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile ComputeShader
       working-directory: ComputeShader
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -67,9 +56,6 @@ jobs:
       with:
         name: ComputeShader image
         path: ComputeShader/Deployment/test.png
-    - name: Copy WARP
-      working-directory: TextureArray
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile TextureArray
       working-directory: TextureArray
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -82,9 +68,6 @@ jobs:
       with:
         name: TextureArray image
         path: TextureArray/Deployment/test.png
-    - name: Copy WARP
-      working-directory: Raytracing
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile Raytracing
       working-directory: Raytracing
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -97,9 +80,6 @@ jobs:
       with:
         name: Raytracing image
         path: Raytracing/Deployment/test.png
-    - name: Copy WARP
-      working-directory: Bindless
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile Bindless
       working-directory: Bindless
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -112,9 +92,6 @@ jobs:
       with:
         name: Bindless image
         path: Bindless/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 00_empty
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 00_empty
       working-directory: 00_empty
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -127,9 +104,6 @@ jobs:
       with:
         name: 00_empty image
         path: 00_empty/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 01_triangle
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 01_triangle
       working-directory: 01_triangle
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -142,9 +116,6 @@ jobs:
       with:
         name: 01_triangle image
         path: 01_triangle/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 02_matrix
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 02_matrix
       working-directory: 02_matrix
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -157,9 +128,6 @@ jobs:
       with:
         name: 02_matrix image
         path: 02_matrix/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 03_colored_cube
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 03_colored_cube
       working-directory: 03_colored_cube
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -172,9 +140,6 @@ jobs:
       with:
         name: 03_colored_cube image
         path: 03_colored_cube/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 04_textured_cube
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 04_textured_cube
       working-directory: 04_textured_cube
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -187,9 +152,6 @@ jobs:
       with:
         name: 04_textured_cube image
         path: 04_textured_cube/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 05_camera_controls
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 05_camera_controls
       working-directory: 05_camera_controls
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -202,9 +164,6 @@ jobs:
       with:
         name: 05_camera_controls image
         path: 05_camera_controls/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 06_render_targets
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 06_render_targets
       working-directory: 06_render_targets
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -217,9 +176,6 @@ jobs:
       with:
         name: 06_render_targets image
         path: 06_render_targets/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 07_multiple_render_targets
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 07_multiple_render_targets
       working-directory: 07_multiple_render_targets
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -232,9 +188,6 @@ jobs:
       with:
         name: 07_multiple_render_targets image
         path: 07_multiple_render_targets/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 08_float_render_targets
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 08_float_render_targets
       working-directory: 08_float_render_targets
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -247,9 +200,6 @@ jobs:
       with:
         name: 08_float_render_targets image
         path: 08_float_render_targets/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 09_depth_render_targets
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 09_depth_render_targets
       working-directory: 09_depth_render_targets
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -262,9 +212,6 @@ jobs:
       with:
         name: 09_depth_render_targets image
         path: 09_depth_render_targets/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 10_cubemap
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 10_cubemap
       working-directory: 10_cubemap
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -277,9 +224,6 @@ jobs:
       with:
         name: 10_cubemap image
         path: 10_cubemap/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 11_instanced_rendering
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 11_instanced_rendering
       working-directory: 11_instanced_rendering
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -292,9 +236,6 @@ jobs:
       with:
         name: 11_instanced_rendering image
         path: 11_instanced_rendering/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 12_set_render_target_depth
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 12_set_render_target_depth
       working-directory: 12_set_render_target_depth
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -307,9 +248,6 @@ jobs:
       with:
         name: 12_set_render_target_depth image
         path: 12_set_render_target_depth/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 13_generate_mipmaps
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 13_generate_mipmaps
       working-directory: 13_generate_mipmaps
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -322,9 +260,6 @@ jobs:
       with:
         name: 13_generate_mipmaps image
         path: 13_generate_mipmaps/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 14_set_mipmap
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 14_set_mipmap
       working-directory: 14_set_mipmap
       run: ../Kinc/make osx -g metal --option screenshot --debug --run
@@ -337,9 +272,6 @@ jobs:
       with:
         name: 14_set_mipmap image
         path: 14_set_mipmap/Deployment/test.png
-    - name: Copy WARP
-      working-directory: 15_deinterleaved_buffers
-      run: echo F|xcopy D:\a\KopeKong-Samples\KopeKong-Samples\Microsoft.Direct3D.WARP.1.0.13\build\native\bin\x64\d3d10warp.dll Deployment\d3d10warp.dll
     - name: Compile 15_deinterleaved_buffers
       working-directory: 15_deinterleaved_buffers
       run: ../Kinc/make osx -g metal --option screenshot --debug --run

diff --git a/write_workflows.js b/write_workflows.js
@@ -251,9 +251,17 @@ jobs:
     - uses: actions/checkout@v4
 ${java}
 ${steps}
-    - name: Install WARP 1.0.13
+`;
+
+if (workflow.sys === 'Windows') {
+    workflowText +=
+`    - name: Install WARP 1.0.13
       run: nuget install Microsoft.Direct3D.WARP
-    - name: Get Submodules
+`;
+}
+
+workflowText +=
+`    - name: Get Submodules
       run: ./get_dlc
 ${postfixSteps}
 `;
@@ -280,11 +288,16 @@ ${postfixSteps}
     const sys = workflow.sys === 'macOS' ? 'osx' : (workflow.sys === 'UWP' ? 'windowsapp' : workflow.sys.toLowerCase());
     const vs = workflow.vs ? ' -v ' + workflow.vs : '';
 
-    workflowText +=
+    if (workflow.sys === 'Windows') {
+      workflowText +=
 `    - name: Copy WARP
       working-directory: ${sample}
       run: echo F|xcopy D:\\a\\KopeKong-Samples\\KopeKong-Samples\\Microsoft.Direct3D.WARP.1.0.13\\build\\native\\bin\\x64\\d3d10warp.dll Deployment\\d3d10warp.dll
-    - name: Compile ${sample}
+`;
+    }
+
+    workflowText +=
+`    - name: Compile ${sample}
       working-directory: ${sample}
       run: ${prefix}../Kinc/make ${sys}${vs}${gfx}${options} --option screenshot --debug --run${postfix}
     - name: Check ${sample}