Skip to content

Commit 5915640

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@6ea7962 🚀
1 parent 232f826 commit 5915640

File tree

13 files changed

+55
-75
lines changed

13 files changed

+55
-75
lines changed

doc/search-index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/search.desc/wgpu/wgpu-desc-0-.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/search.desc/wgpu/wgpu-desc-1-.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/search.desc/wgpu_types/wgpu_types-desc-0-.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/src/wgpu_types/instance.rs.html

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -578,13 +578,7 @@
578578
<a href="#577" id="577">577</a>
579579
<a href="#578" id="578">578</a>
580580
<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
588582

589583
</span><span class="kw">use </span>alloc::string::String;
590584

@@ -980,9 +974,6 @@
980974
}
981975

982976
<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.
986977
</span><span class="attr">#[derive(Clone, Debug, Default)]
987978
</span><span class="kw">pub enum </span>Dx12Compiler {
988979
<span class="doccomment">/// The Fxc compiler (default) is old, slow and unmaintained.
@@ -992,17 +983,15 @@
992983
</span>Fxc,
993984
<span class="doccomment">/// The Dxc compiler is new, fast and maintained.
994985
///
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.
996987
/// These files can be downloaded from &lt;https://github.com/microsoft/DirectXShaderCompiler/releases&gt;.
997988
///
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)
999990
///
1000991
/// It also requires WDDM 2.1 (Windows 10 version 1607).
1001992
</span>DynamicDxc {
1002993
<span class="doccomment">/// Path to `dxcompiler.dll`.
1003994
</span>dxc_path: String,
1004-
<span class="doccomment">/// Path to `dxil.dll`.
1005-
</span>dxil_path: String,
1006995
<span class="doccomment">/// Maximum shader model the given dll supports.
1007996
</span>max_shader_model: DxcShaderModel,
1008997
},
@@ -1016,13 +1005,12 @@
10161005
<span class="kw">impl </span>Dx12Compiler {
10171006
<span class="doccomment">/// Helper function to construct a `DynamicDxc` variant with default paths.
10181007
///
1019-
/// The dll must support at least shader model 6.5.
1008+
/// The dll must support at least shader model 6.8.
10201009
</span><span class="kw">pub fn </span>default_dynamic_dxc() -&gt; <span class="self">Self </span>{
10211010
<span class="self">Self</span>::DynamicDxc {
10221011
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>}
10261014
}
10271015

10281016
<span class="doccomment">/// Choose which DX12 shader compiler to use from the environment variable `WGPU_DX12_COMPILER`.

doc/wgpu/enum.Dx12Compiler.html

Lines changed: 8 additions & 12 deletions
Large diffs are not rendered by default.

doc/wgpu/enum.GlFenceBehavior.html

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

doc/wgpu/enum.Gles3MinorVersion.html

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

doc/wgpu/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ <h4 id="external-libraries"><a class="doc-anchor" href="#external-libraries">§<
5151
<li>
5252
<p><strong><code>static-dxc</code></strong> — Enables statically linking DXC.</p>
5353
<p>Normally, to use the modern DXC shader compiler with WGPU, the final application
54-
must be shipped alongside <code>dxcompiler.dll</code> and <code>dxil.dll</code> (which can be downloaded from <a href="https://github.com/Microsoft/DirectXShaderCompiler">Microsoft’s GitHub</a>).
54+
must be shipped alongside <code>dxcompiler.dll</code> (min v1.8.2502) (which can be downloaded from <a href="https://github.com/Microsoft/DirectXShaderCompiler">Microsoft’s GitHub</a>).
5555
This feature statically links a version of DXC so that no external binaries are required
5656
to compile DX12 shaders.</p>
5757
</li>

doc/wgpu_types/instance/enum.Dx12Compiler.html

Lines changed: 8 additions & 12 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)