Merge commit 'f7d6650c2622df1195b7103fc49d3d967cacc01b'

ares-emulator · Mar 28, 2024 · 69daac5 · 69daac5
2 parents 5440ef5 + f7d6650
commit 69daac5
Show file tree

Hide file tree

Showing 90 changed files with 5,358 additions and 1,532 deletions.
diff --git a/thirdparty/librashader/Cargo.lock b/thirdparty/librashader/Cargo.lock
diff --git a/thirdparty/librashader/Cargo.toml b/thirdparty/librashader/Cargo.toml
@@ -14,9 +14,12 @@ members = [
     "librashader-runtime-wgpu",
     "librashader-cache",
     "librashader-capi",
-    "librashader-build-script"]
+    "librashader-build-script", "librashader-runtime-d3d9"]
 resolver = "2"
 
+[workspace.dependencies]
+windows = "0.52.0"
+
 [workspace.metadata.release]
 
 [profile.optimized]

diff --git a/thirdparty/librashader/README.md b/thirdparty/librashader/README.md
@@ -16,18 +16,27 @@ Windows and macOS users can grab the latest binaries from [GitHub Releases](http
 
 ## Supported Render APIs
 librashader supports all modern graphics runtimes, including wgpu, Vulkan, OpenGL 3.3+ and 4.6 (with DSA), 
-Direct3D 11, Direct3D 12, and Metal. librashader does not support legacy render
-APIs such as older versions of OpenGL, or legacy versions of Direct3D.
+Direct3D 11, Direct3D 12, and Metal. 
+
+librashader does not support legacy render APIs such as older versions of OpenGL or Direct3D, except for experimental
+support for Direct3D 9.
 
 | **API**     | **Status** | **`librashader` feature** |
-|-------------|-----------|---------------------------|
-| OpenGL 3.3+ | ✔         | `gl`                      |
-| OpenGL 4.6  | ✔         | `gl`                      |
-| Vulkan      | ✔         | `vk`                      |
-| Direct3D 11 | ✔         | `d3d11`                   |
-| Direct3D 12 | ✔         | `d3d12`                   |
-| Metal       | ✔         | `metal`                   |
-| wgpu        | ✔         | `wgpu`                    |
+|-------------|------------|---------------------------|
+| OpenGL 3.3+ | ✅          | `gl`                      |
+| OpenGL 4.6  | ✅          | `gl`                      |
+| Vulkan      | ✅          | `vk`                      |
+| Direct3D 9  | ⚠️         | `d3d9`                    |
+| Direct3D 11 | ✅          | `d3d11`                   |
+| Direct3D 12 | ✅          | `d3d12`                   |
+| Metal       | ✅          | `metal`                   |
+| wgpu        | 🆗         | `wgpu`                    |
+
+✅ Full Support &mdash; 🆗 Secondary Support &mdash; ⚠️ ️Experimental Support
+
+wgpu may not support all shaders due to restrictions from WGSL. Direct3D 9 support is experimental and does not fully
+support features such as previous frame feedback or history, as well as being unable to support shaders that need Direct3D 10+
+only features. 
 
 ## Usage