Skip to content

Commit 4aa1025

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@b5e32ce 🚀
1 parent a6415f9 commit 4aa1025

28 files changed

+171
-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/lib.rs.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,16 @@
182182
Color, ColorTargetState, ColorWrites, CommandBufferDescriptor, CompareFunction,
183183
CompositeAlphaMode, CopyExternalImageDestInfo, CoreCounters, DepthBiasState, DepthStencilState,
184184
DeviceLostReason, DeviceType, DownlevelCapabilities, DownlevelFlags, DownlevelLimits,
185-
Dx12BackendOptions, Dx12Compiler, DynamicOffset, Extent3d, Face, Features, FeaturesWGPU,
186-
FeaturesWebGPU, FilterMode, FrontFace, GlBackendOptions, GlFenceBehavior, Gles3MinorVersion,
187-
HalCounters, ImageSubresourceRange, IndexFormat, InstanceDescriptor, InstanceFlags,
188-
InternalCounters, Limits, MemoryHints, MultisampleState, NoopBackendOptions, Origin2d,
189-
Origin3d, PipelineStatisticsTypes, PollError, PollStatus, PolygonMode, PowerPreference,
190-
PredefinedColorSpace, PresentMode, PresentationTimestamp, PrimitiveState, PrimitiveTopology,
191-
PushConstantRange, QueryType, RenderBundleDepthStencil, SamplerBindingType, SamplerBorderColor,
192-
ShaderLocation, ShaderModel, ShaderRuntimeChecks, ShaderStages, StencilFaceState,
193-
StencilOperation, StencilState, StorageTextureAccess, SurfaceCapabilities, SurfaceStatus,
194-
TexelCopyBufferLayout, TextureAspect, TextureDimension, TextureFormat,
185+
Dx12BackendOptions, Dx12Compiler, DxcShaderModel, DynamicOffset, Extent3d, Face, Features,
186+
FeaturesWGPU, FeaturesWebGPU, FilterMode, FrontFace, GlBackendOptions, GlFenceBehavior,
187+
Gles3MinorVersion, HalCounters, ImageSubresourceRange, IndexFormat, InstanceDescriptor,
188+
InstanceFlags, InternalCounters, Limits, MemoryHints, MultisampleState, NoopBackendOptions,
189+
Origin2d, Origin3d, PipelineStatisticsTypes, PollError, PollStatus, PolygonMode,
190+
PowerPreference, PredefinedColorSpace, PresentMode, PresentationTimestamp, PrimitiveState,
191+
PrimitiveTopology, PushConstantRange, QueryType, RenderBundleDepthStencil, SamplerBindingType,
192+
SamplerBorderColor, ShaderLocation, ShaderModel, ShaderRuntimeChecks, ShaderStages,
193+
StencilFaceState, StencilOperation, StencilState, StorageTextureAccess, SurfaceCapabilities,
194+
SurfaceStatus, TexelCopyBufferLayout, TextureAspect, TextureDimension, TextureFormat,
195195
TextureFormatFeatureFlags, TextureFormatFeatures, TextureSampleType, TextureTransition,
196196
TextureUsages, TextureUses, TextureViewDimension, VertexAttribute, VertexFormat,
197197
VertexStepMode, WasmNotSend, WasmNotSendSync, WasmNotSync, COPY_BUFFER_ALIGNMENT,

doc/src/wgpu_types/instance.rs.html

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,26 @@
523523
<a href="#522" id="522">522</a>
524524
<a href="#523" id="523">523</a>
525525
<a href="#524" id="524">524</a>
526-
<a href="#525" id="525">525</a></pre></div><pre class="rust"><code><span class="doccomment">//! Types for dealing with Instances
526+
<a href="#525" id="525">525</a>
527+
<a href="#526" id="526">526</a>
528+
<a href="#527" id="527">527</a>
529+
<a href="#528" id="528">528</a>
530+
<a href="#529" id="529">529</a>
531+
<a href="#530" id="530">530</a>
532+
<a href="#531" id="531">531</a>
533+
<a href="#532" id="532">532</a>
534+
<a href="#533" id="533">533</a>
535+
<a href="#534" id="534">534</a>
536+
<a href="#535" id="535">535</a>
537+
<a href="#536" id="536">536</a>
538+
<a href="#537" id="537">537</a>
539+
<a href="#538" id="538">538</a>
540+
<a href="#539" id="539">539</a>
541+
<a href="#540" id="540">540</a>
542+
<a href="#541" id="541">541</a>
543+
<a href="#542" id="542">542</a>
544+
<a href="#543" id="543">543</a>
545+
<a href="#544" id="544">544</a></pre></div><pre class="rust"><code><span class="doccomment">//! Types for dealing with Instances
527546

528547
</span><span class="kw">use </span>alloc::string::String;
529548

@@ -862,6 +881,20 @@
862881
}
863882
}
864883

884+
<span class="doccomment">/// DXC shader model.
885+
</span><span class="attr">#[derive(Clone, Debug)]
886+
#[allow(missing_docs)]
887+
</span><span class="kw">pub enum </span>DxcShaderModel {
888+
V6_0,
889+
V6_1,
890+
V6_2,
891+
V6_3,
892+
V6_4,
893+
V6_5,
894+
V6_6,
895+
V6_7,
896+
}
897+
865898
<span class="doccomment">/// Selects which DX12 shader compiler to use.
866899
///
867900
/// If the `DynamicDxc` option is selected, but `dxcompiler.dll` and `dxil.dll` files aren't found,
@@ -886,6 +919,8 @@
886919
</span>dxc_path: String,
887920
<span class="doccomment">/// Path to `dxil.dll`.
888921
</span>dxil_path: String,
922+
<span class="doccomment">/// Maximum shader model the given dll supports.
923+
</span>max_shader_model: DxcShaderModel,
889924
},
890925
<span class="doccomment">/// The statically-linked variant of Dxc.
891926
///
@@ -896,10 +931,13 @@
896931

897932
<span class="kw">impl </span>Dx12Compiler {
898933
<span class="doccomment">/// Helper function to construct a `DynamicDxc` variant with default paths.
934+
///
935+
/// The dll must support at least shader model 6.5.
899936
</span><span class="kw">pub fn </span>default_dynamic_dxc() -&gt; <span class="self">Self </span>{
900937
<span class="self">Self</span>::DynamicDxc {
901938
dxc_path: String::from(<span class="string">"dxcompiler.dll"</span>),
902939
dxil_path: String::from(<span class="string">"dxil.dll"</span>),
940+
max_shader_model: DxcShaderModel::V6_5,
903941
}
904942
}
905943

doc/trait.impl/core/clone/trait.Clone.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/trait.impl/core/fmt/trait.Debug.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/trait.impl/core/marker/trait.Freeze.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/trait.impl/core/marker/trait.Send.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.

0 commit comments

Comments
 (0)