update shaders

bevyengine · Nov 5, 2020 · bf4b6fa · bf4b6fa
1 parent e76f56b
commit bf4b6fa
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 40 deletions.
diff --git a/crates/bevy_render/src/shader/shader_reflect.rs b/crates/bevy_render/src/shader/shader_reflect.rs
@@ -311,16 +311,15 @@ mod tests {
         let vertex_shader = Shader::from_glsl(
             ShaderStage::Vertex,
             r#"
-            #version 450
-            layout(location = 0) in vec4 Vertex_Position;
-            layout(location = 1) in uvec4 Vertex_Normal;
-            layout(location = 2) in uvec4 I_TestInstancing_Property;
+            LAYOUT(location = 0) in vec4 Vertex_Position;
+            LAYOUT(location = 1) in uvec4 Vertex_Normal;
+            LAYOUT(location = 2) in uvec4 I_TestInstancing_Property;
 
-            layout(location = 0) out vec4 v_Position;
-            layout(set = 0, binding = 0) uniform Camera {
+            LAYOUT(location = 0) out vec4 v_Position;
+            BLOCK_LAYOUT(set = 0, binding = 0) uniform Camera {
                 mat4 ViewProj;
             };
-            layout(set = 1, binding = 0) uniform texture2D Texture;
+            UNIFORM_TEXTURE(set = 1, binding = 0, Texture)
 
             void main() {
                 v_Position = Vertex_Position;

diff --git a/crates/bevy_ui/src/render/ui.frag b/crates/bevy_ui/src/render/ui.frag
@@ -1,5 +1,3 @@
-#version 450
-
 layout(location = 0) in vec2 v_Uv;
 
 layout(location = 0) out vec4 o_Target;
@@ -8,7 +6,7 @@ layout(set = 2, binding = 0) uniform ColorMaterial_color {
     vec4 Color;
 };
 
-# ifdef COLORMATERIAL_TEXTURE 
+# ifdef COLORMATERIAL_TEXTURE
 layout(set = 2, binding = 1) uniform texture2D ColorMaterial_texture;
 layout(set = 2, binding = 2) uniform sampler ColorMaterial_texture_sampler;
 # endif

diff --git a/crates/bevy_ui/src/render/ui.vert b/crates/bevy_ui/src/render/ui.vert
@@ -1,5 +1,3 @@
-#version 450
-
 layout(location = 0) in vec3 Vertex_Position;
 layout(location = 1) in vec3 Vertex_Normal;
 layout(location = 2) in vec2 Vertex_Uv;

diff --git a/examples/shader/mesh_custom_attribute.rs b/examples/shader/mesh_custom_attribute.rs
@@ -2,7 +2,7 @@ use bevy::{
     prelude::*,
     render::{
         mesh::{shape, VertexAttributeValues},
-        pipeline::{PipelineDescriptor, PipelineSpecialization, RenderPipeline},
+        pipeline::{PipelineDescriptor, RenderPipeline},
         render_graph::{base, AssetRenderResourcesNode, RenderGraph},
         renderer::RenderResources,
         shader::{ShaderStage, ShaderStages},
@@ -24,15 +24,14 @@ fn main() {
 struct MyMaterialWithVertexColorSupport {}
 
 const VERTEX_SHADER: &str = r#"
-#version 450
-layout(location = 0) in vec3 Vertex_Position;
-layout(location = 1) in vec3 Vertex_Color;
-layout(location = 0) out vec3 v_color;
+LAYOUT(location = 0) in vec3 Vertex_Position;
+LAYOUT(location = 1) in vec3 Vertex_Color;
+LAYOUT(location = 0) out vec3 v_color;
 
-layout(set = 0, binding = 0) uniform Camera {
+BLOCK_LAYOUT(set = 0, binding = 0) uniform Camera {
     mat4 ViewProj;
 };
-layout(set = 1, binding = 0) uniform Transform {
+BLOCK_LAYOUT(set = 1, binding = 0) uniform Transform {
     mat4 Model;
 };
 void main() {
@@ -42,12 +41,11 @@ void main() {
 "#;
 
 const FRAGMENT_SHADER: &str = r#"
-#version 450
-layout(location = 0) out vec4 o_Target;
-layout(location = 0) in vec3 v_color;
+LAYOUT(location = 0) out vec4 o_Target;
+LAYOUT(location = 0) in vec3 v_color;
 
 void main() {
-    o_Target = vec4(v_color, 1.0);
+    o_Target = encodeColor(vec4(v_color, 1.0));
 }
 "#;
 

diff --git a/examples/shader/shader_custom_material.rs b/examples/shader/shader_custom_material.rs
@@ -26,12 +26,11 @@ struct MyMaterial {
 }
 
 const VERTEX_SHADER: &str = r#"
-#version 450
-layout(location = 0) in vec3 Vertex_Position;
-layout(set = 0, binding = 0) uniform Camera {
+LAYOUT(location = 0) in vec3 Vertex_Position;
+BLOCK_LAYOUT(set = 0, binding = 0) uniform Camera {
     mat4 ViewProj;
 };
-layout(set = 1, binding = 0) uniform Transform {
+BLOCK_LAYOUT(set = 1, binding = 0) uniform Transform {
     mat4 Model;
 };
 void main() {
@@ -40,13 +39,12 @@ void main() {
 "#;
 
 const FRAGMENT_SHADER: &str = r#"
-#version 450
-layout(location = 0) out vec4 o_Target;
-layout(set = 1, binding = 1) uniform MyMaterial_color {
+LAYOUT(location = 0) out vec4 o_Target;
+BLOCK_LAYOUT(set = 1, binding = 1) uniform MyMaterial_color {
     vec4 color;
 };
 void main() {
-    o_Target = color;
+    o_Target = encodeColor(color);
 }
 "#;
 

diff --git a/examples/shader/shader_defs.rs b/examples/shader/shader_defs.rs
@@ -34,12 +34,11 @@ struct MyMaterial {
 }
 
 const VERTEX_SHADER: &str = r#"
-#version 450
-layout(location = 0) in vec3 Vertex_Position;
-layout(set = 0, binding = 0) uniform Camera {
+LAYOUT(location = 0) in vec3 Vertex_Position;
+BLOCK_LAYOUT(set = 0, binding = 0) uniform Camera {
     mat4 ViewProj;
 };
-layout(set = 1, binding = 0) uniform Transform {
+BLOCK_LAYOUT(set = 1, binding = 0) uniform Transform {
     mat4 Model;
 };
 void main() {
@@ -48,16 +47,15 @@ void main() {
 "#;
 
 const FRAGMENT_SHADER: &str = r#"
-#version 450
-layout(location = 0) out vec4 o_Target;
-layout(set = 1, binding = 1) uniform MyMaterial_color {
+LAYOUT(location = 0) out vec4 o_Target;
+BLOCK_LAYOUT(set = 1, binding = 1) uniform MyMaterial_color {
     vec4 color;
 };
 void main() {
-    o_Target = color;
+    o_Target = encodeColor(color);
 
 # ifdef MYMATERIAL_ALWAYS_BLUE
-    o_Target = vec4(0.0, 0.0, 0.8, 1.0);
+    o_Target = encodeColor(vec4(0.0, 0.0, 0.8, 1.0));
 # endif
 }
 "#;