Skip to content

Commit 46b403f

Browse files
authored
dont re-export SamplerBindingType twice for no reason (#21618)
# Objective - dont re-export SamplerBindingType twice for no reason ## Solution - dont re-export SamplerBindingType twice for no reason ## Testing - ci
1 parent 3dd5d70 commit 46b403f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

crates/bevy_render/macros/src/as_bind_group.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ pub fn derive_as_bind_group(ast: syn::DeriveInput) -> Result<TokenStream> {
716716
#binding_index,
717717
#render_path::render_resource::OwnedBindingResource::Sampler(
718718
// TODO: Support other types.
719-
#render_path::render_resource::WgpuSamplerBindingType::Filtering,
719+
#render_path::render_resource::SamplerBindingType::Filtering,
720720
{
721721
let handle: Option<&#asset_path::Handle<#image_path::Image>> = (&self.#field_name).into();
722722
if let Some(handle) = handle {

crates/bevy_render/src/render_resource/mod.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,12 @@ pub use wgpu::{
5454
PollType, PolygonMode, PrimitiveState, PrimitiveTopology, PushConstantRange,
5555
RenderPassColorAttachment, RenderPassDepthStencilAttachment, RenderPassDescriptor,
5656
RenderPipelineDescriptor as RawRenderPipelineDescriptor, Sampler as WgpuSampler,
57-
SamplerBindingType, SamplerBindingType as WgpuSamplerBindingType, SamplerDescriptor,
58-
ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, StencilFaceState,
59-
StencilOperation, StencilState, StorageTextureAccess, StoreOp, TexelCopyBufferInfo,
60-
TexelCopyBufferLayout, TexelCopyTextureInfo, TextureAspect, TextureDescriptor,
61-
TextureDimension, TextureFormat, TextureFormatFeatureFlags, TextureFormatFeatures,
62-
TextureSampleType, TextureUsages, TextureView as WgpuTextureView, TextureViewDescriptor,
63-
TextureViewDimension, Tlas, TlasInstance, VertexAttribute,
57+
SamplerBindingType, SamplerDescriptor, ShaderModule, ShaderModuleDescriptor, ShaderSource,
58+
ShaderStages, StencilFaceState, StencilOperation, StencilState, StorageTextureAccess, StoreOp,
59+
TexelCopyBufferInfo, TexelCopyBufferLayout, TexelCopyTextureInfo, TextureAspect,
60+
TextureDescriptor, TextureDimension, TextureFormat, TextureFormatFeatureFlags,
61+
TextureFormatFeatures, TextureSampleType, TextureUsages, TextureView as WgpuTextureView,
62+
TextureViewDescriptor, TextureViewDimension, Tlas, TlasInstance, VertexAttribute,
6463
VertexBufferLayout as RawVertexBufferLayout, VertexFormat, VertexState as RawVertexState,
6564
VertexStepMode, COPY_BUFFER_ALIGNMENT,
6665
};

0 commit comments

Comments
 (0)