|
578 | 578 | <a href="#577" id="577">577</a> |
579 | 579 | <a href="#578" id="578">578</a> |
580 | 580 | <a href="#579" id="579">579</a> |
581 | | -<a href="#580" id="580">580</a> |
582 | | -<a href="#581" id="581">581</a> |
583 | | -<a href="#582" id="582">582</a> |
584 | | -<a href="#583" id="583">583</a> |
585 | | -<a href="#584" id="584">584</a> |
586 | | -<a href="#585" id="585">585</a> |
587 | | -<a href="#586" id="586">586</a></pre></div><pre class="rust"><code><span class="doccomment">//! Types for dealing with Instances |
| 581 | +<a href="#580" id="580">580</a></pre></div><pre class="rust"><code><span class="doccomment">//! Types for dealing with Instances |
588 | 582 |
|
589 | 583 | </span><span class="kw">use </span>alloc::string::String; |
590 | 584 |
|
|
980 | 974 | } |
981 | 975 |
|
982 | 976 | <span class="doccomment">/// Selects which DX12 shader compiler to use. |
983 | | -/// |
984 | | -/// If the `DynamicDxc` option is selected, but `dxcompiler.dll` and `dxil.dll` files aren't found, |
985 | | -/// then this will fall back to the Fxc compiler at runtime and log an error. |
986 | 977 | </span><span class="attr">#[derive(Clone, Debug, Default)] |
987 | 978 | </span><span class="kw">pub enum </span>Dx12Compiler { |
988 | 979 | <span class="doccomment">/// The Fxc compiler (default) is old, slow and unmaintained. |
|
992 | 983 | </span>Fxc, |
993 | 984 | <span class="doccomment">/// The Dxc compiler is new, fast and maintained. |
994 | 985 | /// |
995 | | - /// However, it requires both `dxcompiler.dll` and `dxil.dll` to be shipped with the application. |
| 986 | + /// However, it requires `dxcompiler.dll` to be shipped with the application. |
996 | 987 | /// These files can be downloaded from <https://github.com/microsoft/DirectXShaderCompiler/releases>. |
997 | 988 | /// |
998 | | - /// Minimum supported version: [v1.5.2010](https://github.com/microsoft/DirectXShaderCompiler/releases/tag/v1.5.2010) |
| 989 | + /// Minimum supported version: [v1.8.2502](https://github.com/microsoft/DirectXShaderCompiler/releases/tag/v1.8.2502) |
999 | 990 | /// |
1000 | 991 | /// It also requires WDDM 2.1 (Windows 10 version 1607). |
1001 | 992 | </span>DynamicDxc { |
1002 | 993 | <span class="doccomment">/// Path to `dxcompiler.dll`. |
1003 | 994 | </span>dxc_path: String, |
1004 | | - <span class="doccomment">/// Path to `dxil.dll`. |
1005 | | - </span>dxil_path: String, |
1006 | 995 | <span class="doccomment">/// Maximum shader model the given dll supports. |
1007 | 996 | </span>max_shader_model: DxcShaderModel, |
1008 | 997 | }, |
|
1016 | 1005 | <span class="kw">impl </span>Dx12Compiler { |
1017 | 1006 | <span class="doccomment">/// Helper function to construct a `DynamicDxc` variant with default paths. |
1018 | 1007 | /// |
1019 | | - /// The dll must support at least shader model 6.5. |
| 1008 | + /// The dll must support at least shader model 6.8. |
1020 | 1009 | </span><span class="kw">pub fn </span>default_dynamic_dxc() -> <span class="self">Self </span>{ |
1021 | 1010 | <span class="self">Self</span>::DynamicDxc { |
1022 | 1011 | dxc_path: String::from(<span class="string">"dxcompiler.dll"</span>), |
1023 | | - dxil_path: String::from(<span class="string">"dxil.dll"</span>), |
1024 | | - max_shader_model: DxcShaderModel::V6_5, |
1025 | | - } |
| 1012 | + max_shader_model: DxcShaderModel::V6_7, <span class="comment">// should be 6.8 but the variant is missing |
| 1013 | + </span>} |
1026 | 1014 | } |
1027 | 1015 |
|
1028 | 1016 | <span class="doccomment">/// Choose which DX12 shader compiler to use from the environment variable `WGPU_DX12_COMPILER`. |
|
0 commit comments