Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge bevyengine/bevy -> ashneverdawn/bevy #1

Merged
merged 59 commits into from
Aug 24, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
f3ef23b
Working on correctly reflecting shader stage for bind groups.
StarArawn Aug 14, 2020
76564a4
Removed old comment.
StarArawn Aug 14, 2020
eac53c1
Fixed! :tada:
StarArawn Aug 15, 2020
e11fa3e
Added hack to allow all of the examples to work.
StarArawn Aug 15, 2020
9883cd1
Replace vector of UniformProperty with a single property
lachlansneff Aug 16, 2020
1ec7183
profiling: fix build
multun Aug 16, 2020
ece54e9
diagnostics: add missing feature dependency
multun Aug 16, 2020
d138647
enforce cargo fmt --check
multun Aug 16, 2020
c38420f
enforce clippy for all target and features
multun Aug 16, 2020
dfbdeeb
render: fix bind group PartialEq impl
multun Aug 16, 2020
e36b26c
render: fix RenderResourceBinding PartialEq impl
multun Aug 16, 2020
f92f6a4
Merge pull request #204 from multun/fix-profiling-build
cart Aug 16, 2020
77ebb46
Merge pull request #201 from multun/cargo-fmt
cart Aug 16, 2020
e24aaf3
Add Draw command to RenderCommand
lachlansneff Aug 16, 2020
cf8bab2
unused import
Aug 16, 2020
99e39b5
Merge pull request #212 from GabLotus/master
cart Aug 16, 2020
ccfa815
Use can_draw in can_draw_indexed
lachlansneff Aug 17, 2020
81d30dd
Created README for examples
0x22fe Aug 17, 2020
6e4c959
Merge pull request #211 from lachlansneff/bevy-render-draw-command
cart Aug 18, 2020
4a06bbf
Merge pull request #220 from 0x22fe/patch-1
cart Aug 18, 2020
6228e8a
Create FUNDING.yml
cart Aug 18, 2020
6ffe069
Merge pull request #203 from lachlansneff/ironing-out-uniforms
cart Aug 18, 2020
46636ed
fix formatting
multun Aug 19, 2020
7d1d9dc
Merge pull request #234 from multun/fix-formatting
cart Aug 19, 2020
900126b
Create CODE_OF_CONDUCT.md
Aug 19, 2020
4462eb4
Update CODE_OF_CONDUCT.md
Aug 19, 2020
49d4784
Update CODE_OF_CONDUCT.md
Aug 19, 2020
9648008
Update CODE_OF_CONDUCT.md
Aug 19, 2020
131a5e9
Merge branch 'master' into bind-group-reflect-fix
StarArawn Aug 19, 2020
f1b0d04
Fixed formatting.
StarArawn Aug 19, 2020
d4d68f6
Fixed tests.
StarArawn Aug 19, 2020
f12990f
Update CODE_OF_CONDUCT.md
Aug 19, 2020
322fad7
Update CODE_OF_CONDUCT.md
Aug 19, 2020
dc98881
Update CODE_OF_CONDUCT.md
Aug 19, 2020
1f7cdbd
Update CODE_OF_CONDUCT.md
Aug 19, 2020
e31f576
Merge pull request #206 from multun/clippy
cart Aug 20, 2020
979a134
Merge pull request #236 from stefee/patch-1
cart Aug 20, 2020
1ebb7e4
Merge pull request #189 from StarArawn/bind-group-reflect-fix
cart Aug 20, 2020
268b520
Simplify GLTF loader code (#245)
AmionSky Aug 20, 2020
38d3da5
Fix #187 . Multiple return instead of continue inside for loops. (#230)
BorisBoutillier Aug 20, 2020
3c5251f
Updating README.md with subreddit info and link to Code of Conduct (#…
GabCampbell Aug 21, 2020
45312a9
Basic mouse scroll-wheel event (#222)
ifletsomeclaire Aug 21, 2020
505c79b
README.md link points to the correct example (#225)
zeramorphic Aug 21, 2020
db1bf64
Allow calling winit with the 'run_return' variant of the run function…
jakerr Aug 21, 2020
fc53ff9
Add "Focus Areas" to readme
cart Aug 21, 2020
1eca55e
Replace std synchronization primitives with parking_lot (#210)
lachlansneff Aug 21, 2020
68d419d
Add repeating flag to Timer (#165)
8bit-pudding Aug 21, 2020
bfd6e4a
Add linux dependencies to README.md (#257)
Halfwhit Aug 21, 2020
6b11e58
readme formatting tweaks
cart Aug 21, 2020
20335d5
Add links to Stack Overflow and Awesome Bevy (#282)
DGriffin91 Aug 22, 2020
7a79dcc
Add serialize/deserialize to some input types (#281)
TehPers Aug 22, 2020
7c3b49c
upgrade to latest wgpu
cart Aug 13, 2020
47f3a0b
Changes ScheduleRunnerPlugin RunMode::Loop to run on fixed interval (…
mfrancis107 Aug 22, 2020
2dadc86
Change CullMode to none for sprites (#241)
kaflu Aug 22, 2020
4eb437a
Fixes #134 and #135 with a slight hit on performances as get_or_assi…
BorisBoutillier Aug 22, 2020
35c59d2
use wgpu 0.6.0 release
cart Aug 22, 2020
b925e22
0.1.3 upgrade
cart Aug 22, 2020
022a31f
fix formatting / clippy warnings (#295)
multun Aug 23, 2020
7b6fbcb
Add Arch / Manjaro dependencies (#275)
Aug 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed formatting.
  • Loading branch information
StarArawn committed Aug 19, 2020
commit f1b0d04e53ba3683344fb372c36875d38fb0b9c5
2 changes: 1 addition & 1 deletion crates/bevy_render/src/pipeline/pipeline_layout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl PipelineLayout {
}
}
}

for vertex_buffer_descriptor in shader_layouts[0].vertex_buffer_descriptors.iter() {
vertex_buffer_descriptors.push(vertex_buffer_descriptor.clone());
}
Expand Down
15 changes: 11 additions & 4 deletions crates/bevy_render/src/shader/shader_reflect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ use bevy_core::AsBytes;
use spirv_reflect::{
types::{
ReflectDescriptorBinding, ReflectDescriptorSet, ReflectDescriptorType, ReflectDimension,
ReflectInterfaceVariable, ReflectTypeDescription, ReflectTypeFlags, ReflectShaderStageFlags
ReflectInterfaceVariable, ReflectShaderStageFlags, ReflectTypeDescription,
ReflectTypeFlags,
},
ShaderModule,
};
Expand Down Expand Up @@ -151,7 +152,10 @@ fn reflect_vertex_attribute_descriptor(
}
}

fn reflect_bind_group(descriptor_set: &ReflectDescriptorSet, shader_stage: ReflectShaderStageFlags) -> BindGroupDescriptor {
fn reflect_bind_group(
descriptor_set: &ReflectDescriptorSet,
shader_stage: ReflectShaderStageFlags,
) -> BindGroupDescriptor {
let mut bindings = Vec::new();
for descriptor_binding in descriptor_set.bindings.iter() {
let binding = reflect_binding(descriptor_binding, shader_stage);
Expand All @@ -171,7 +175,10 @@ fn reflect_dimension(type_description: &ReflectTypeDescription) -> TextureViewDi
}
}

fn reflect_binding(binding: &ReflectDescriptorBinding, shader_stage: ReflectShaderStageFlags) -> BindingDescriptor {
fn reflect_binding(
binding: &ReflectDescriptorBinding,
shader_stage: ReflectShaderStageFlags,
) -> BindingDescriptor {
let type_description = binding.type_description.as_ref().unwrap();
let (name, bind_type) = match binding.descriptor_type {
ReflectDescriptorType::UniformBuffer => (
Expand Down Expand Up @@ -205,7 +212,7 @@ fn reflect_binding(binding: &ReflectDescriptorBinding, shader_stage: ReflectShad
ReflectShaderStageFlags::COMPUTE => BindingShaderStage::COMPUTE,
ReflectShaderStageFlags::VERTEX => BindingShaderStage::VERTEX,
ReflectShaderStageFlags::FRAGMENT => BindingShaderStage::FRAGMENT,
_ => panic!("Only one specified shader stage is supported.")
_ => panic!("Only one specified shader stage is supported."),
};

let name = name.to_string();
Expand Down