From 08cd5964a4416c503ce58126fe0c28eec3c51d1b Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Sun, 22 Mar 2020 13:08:20 -0700 Subject: [PATCH] get_field_info is now static --- bevy_derive/src/lib.rs | 2 +- src/render/shader/uniform.rs | 2 +- src/render/shader/uniforms/local_to_world.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bevy_derive/src/lib.rs b/bevy_derive/src/lib.rs index fe39ffc6ec..14b1a85322 100644 --- a/bevy_derive/src/lib.rs +++ b/bevy_derive/src/lib.rs @@ -293,7 +293,7 @@ pub fn derive_uniforms(input: TokenStream) -> TokenStream { }); impl bevy::render::shader::AsUniforms for #struct_name { - fn get_field_infos(&self) -> &[bevy::render::shader::FieldInfo] { + fn get_field_infos() -> &'static [bevy::render::shader::FieldInfo] { #field_infos_ident } diff --git a/src/render/shader/uniform.rs b/src/render/shader/uniform.rs index 2c829cad60..d4d026d21b 100644 --- a/src/render/shader/uniform.rs +++ b/src/render/shader/uniform.rs @@ -9,7 +9,7 @@ use crate::{ }; pub trait AsUniforms { - fn get_field_infos(&self) -> &[FieldInfo]; + fn get_field_infos() -> &'static [FieldInfo]; fn get_uniform_bytes(&self, name: &str) -> Option>; fn get_uniform_texture(&self, name: &str) -> Option>; fn get_shader_defs(&self) -> Option>; diff --git a/src/render/shader/uniforms/local_to_world.rs b/src/render/shader/uniforms/local_to_world.rs index ead2e470ef..3bf14229e4 100644 --- a/src/render/shader/uniforms/local_to_world.rs +++ b/src/render/shader/uniforms/local_to_world.rs @@ -53,7 +53,7 @@ static VERTEX_BUFFER_DESCRIPTOR: Lazy = }); impl AsUniforms for bevy_transform::prelude::LocalToWorld { - fn get_field_infos(&self) -> &[FieldInfo] { + fn get_field_infos() -> &'static [FieldInfo] { LOCAL_TO_WORLD_FIELD_INFOS }