Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 12:43:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove remaining camerapos bindings (#1708)

Browse source 
Fixes #1706

@JeanMertz already solved it. I just ran all examples and tests.
This commit is contained in:
Jonas Matser 2021-03-22 18:10:35 +00:00
parent 42924d2227
commit cd8025d0a7
7 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/bevy_render/src/shader/shader_reflect.rs
View file

@ -321,7 +321,6 @@ mod tests {
layout(location = 0) out vec4 v_Position;
layout(set = 0, binding = 0) uniform CameraViewProj {
mat4 ViewProj;
vec4 CameraPos;
};
layout(set = 1, binding = 0) uniform texture2D Texture;
@ -379,10 +378,7 @@ mod tests {
name: "CameraViewProj".into(),
bind_type: BindType::Uniform {
has_dynamic_offset: false,
property: UniformProperty::Struct(vec![
UniformProperty::Mat4,
UniformProperty::Vec4
]),
property: UniformProperty::Struct(vec![UniformProperty::Mat4]),
},
shader_stage: BindingShaderStage::VERTEX,
}]

1
crates/bevy_render/src/wireframe/wireframe.vert
View file

@ -4,7 +4,6 @@ layout(location = 0) in vec3 Vertex_Position;
layout(set = 0, binding = 0) uniform CameraViewProj {
mat4 ViewProj;
vec4 CameraPos;
};
layout(set = 1, binding = 0) uniform Transform {

1
crates/bevy_sprite/src/render/sprite.vert
View file

@ -8,7 +8,6 @@ layout(location = 0) out vec2 v_Uv;
layout(set = 0, binding = 0) uniform CameraViewProj {
mat4 ViewProj;
vec4 CameraPos;
};
layout(set = 2, binding = 0) uniform Transform {

1
crates/bevy_sprite/src/render/sprite_sheet.vert
View file

@ -9,7 +9,6 @@ layout(location = 1) out vec4 v_Color;
layout(set = 0, binding = 0) uniform CameraViewProj {
mat4 ViewProj;
vec4 CameraPos;
};
// TODO: merge dimensions into "sprites" buffer when that is supported in the Uniforms derive abstraction

1
crates/bevy_ui/src/render/ui.vert
View file

@ -8,7 +8,6 @@ layout(location = 0) out vec2 v_Uv;
layout(set = 0, binding = 0) uniform CameraViewProj {
mat4 ViewProj;
vec4 CameraPos;
};
layout(set = 1, binding = 0) uniform Transform {

1
examples/shader/shader_custom_material.rs
View file

@ -31,7 +31,6 @@ const VERTEX_SHADER: &str = r#"
layout(location = 0) in vec3 Vertex_Position;
layout(set = 0, binding = 0) uniform CameraViewProj {
mat4 ViewProj;
vec4 CameraPos;
};
layout(set = 1, binding = 0) uniform Transform {
mat4 Model;

1
examples/shader/shader_defs.rs
View file

@ -39,7 +39,6 @@ const VERTEX_SHADER: &str = r#"
layout(location = 0) in vec3 Vertex_Position;
layout(set = 0, binding = 0) uniform CameraViewProj {
mat4 ViewProj;
vec4 CameraPos;
};
layout(set = 1, binding = 0) uniform Transform {
mat4 Model;