Minimal change to support instanced rendering (bevyengine#1262)

rparrett · Jan 27, 2021 · edd7d27 · edd7d27
1 parent b5cddb7
commit edd7d27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/crates/bevy_render/src/shader/mod.rs b/crates/bevy_render/src/shader/mod.rs
@@ -22,3 +22,4 @@ pub struct ShaderLayout {
 }
 
 pub const GL_VERTEX_INDEX: &str = "gl_VertexIndex";
+pub const GL_INSTANCE_INDEX: &str = "gl_InstanceIndex";
diff --git a/crates/bevy_render/src/shader/shader_reflect.rs b/crates/bevy_render/src/shader/shader_reflect.rs
@@ -3,7 +3,7 @@ use crate::{
         BindGroupDescriptor, BindType, BindingDescriptor, BindingShaderStage, InputStepMode,
         UniformProperty, VertexAttributeDescriptor, VertexBufferDescriptor, VertexFormat,
     },
-    shader::{ShaderLayout, GL_VERTEX_INDEX},
+    shader::{ShaderLayout, GL_INSTANCE_INDEX, GL_VERTEX_INDEX},
     texture::{TextureComponentType, TextureViewDimension},
 };
 use bevy_core::AsBytes;
@@ -31,7 +31,9 @@ impl ShaderLayout {
                 // obtain attribute descriptors from reflection
                 let mut vertex_attribute_descriptors = Vec::new();
                 for input_variable in module.enumerate_input_variables(None).unwrap() {
-                    if input_variable.name == GL_VERTEX_INDEX {
+                    if input_variable.name == GL_VERTEX_INDEX
+                        || input_variable.name == GL_INSTANCE_INDEX
+                    {
                         continue;
                     }
                     // reflect vertex attribute descriptor and record it
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,4 @@ pub struct ShaderLayout {
		}

		pub const GL_VERTEX_INDEX: &str = "gl_VertexIndex";
		pub const GL_INSTANCE_INDEX: &str = "gl_InstanceIndex";