Correctness pass for texture types, builtin usage

Bevy-Rust-GPU · Mar 19, 2023 · 4b0e3d1 · 4b0e3d1
1 parent 77de1f2
commit 4b0e3d1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/mesh/entry_points.rs b/src/mesh/entry_points.rs
@@ -109,7 +109,6 @@ pub fn vertex(
 #[spirv(fragment)]
 #[allow(unused_variables)]
 pub fn fragment(
-    #[spirv(position)] in_clip_position: Vec4,
     in_world_position: Vec4,
     in_world_normal: Vec3,
     in_uv: Vec2,

diff --git a/src/mesh_view/bindings.rs b/src/mesh_view/bindings.rs
@@ -15,12 +15,12 @@ pub type TextureDepthCube = Image!(cube, type = f32, sampled = true, depth = tru
 pub type TextureDepthCubeArray =
     Image!(cube, type = f32, sampled = true, depth = true, arrayed = true);
 
-pub type TextureDepth2d = Image!(2D, type = f32, sampled = true, depth = true);
+pub type TextureDepth2d = Image!(2D, format = r32f, sampled = false, depth = true, arrayed = false, multisampled = false);
 pub type TextureDepth2dArray = Image!(2D, type = f32, sampled = true, depth = true, arrayed = true);
 
 pub type TextureMultisampled2d = Image!(2D, type = f32, sampled = true, multisampled = true);
 pub type TextureDepthMultisampled2d =
-    Image!(2D, type = f32, sampled = true, multisampled = true, depth = true);
+    Image!(type = f32, 2D, depth = true, arrayed = true, multisampled = true, sampled = false);
 
 pub trait DepthPrepassTexture {}
 

diff --git a/src/pbr/bindings.rs b/src/pbr/bindings.rs
@@ -2,11 +2,11 @@ use spirv_std::{spirv, Image, Sampler};
 
 use crate::prelude::StandardMaterial;
 
-pub type BaseColorTexture = Image!(2D, type = f32);
-pub type EmissiveTexture = Image!(2D, type = f32);
-pub type MetallicRoughnessTexture = Image!(2D, type = f32);
-pub type OcclusionTexture = Image!(2D, type = f32);
-pub type NormalMapTexture = Image!(2D, type = f32);
+pub type BaseColorTexture = Image!(2D, type = f32, sampled = true);
+pub type EmissiveTexture = Image!(2D, type = f32, sampled = true);
+pub type MetallicRoughnessTexture = Image!(2D, type = f32, sampled = true);
+pub type OcclusionTexture = Image!(2D, type = f32, sampled = true);
+pub type NormalMapTexture = Image!(2D, type = f32, sampled = true);
 
 #[allow(unused_variables)]
 #[spirv(fragment)]

diff --git a/src/pbr/entry_points.rs b/src/pbr/entry_points.rs
@@ -176,7 +176,7 @@ pub fn fragment(
     #[spirv(front_facing)]
     in_is_front: bool,
 
-    #[spirv(position)] in_frag_coord: Vec4,
+    #[spirv(frag_coord)] in_frag_coord: Vec4,
     in_world_position: Vec4,
     in_world_normal: Vec3,
     #[allow(unused_variables)] in_uv: Vec2,

diff --git a/src/shadows.rs b/src/shadows.rs
@@ -14,7 +14,7 @@ pub trait DirectionalShadowTextures {
     ) -> f32;
 }
 
-pub type DirectionalShadowTexture = Image!(2D, type = f32, depth = true);
+pub type DirectionalShadowTexture = Image!(2D, type = f32, depth = true, sampled = true);
 
 impl DirectionalShadowTextures for DirectionalShadowTexture {
     fn sample_depth_reference(
@@ -29,7 +29,7 @@ impl DirectionalShadowTextures for DirectionalShadowTexture {
     }
 }
 
-pub type DirectionalShadowTextureArray = Image!(2D, type = f32, depth = true, arrayed = true);
+pub type DirectionalShadowTextureArray = Image!(2D, type = f32, depth = true, arrayed = true, sampled = true);
 
 impl DirectionalShadowTextures for DirectionalShadowTextureArray {
     fn sample_depth_reference(
@@ -59,15 +59,15 @@ pub trait PointShadowTextures {
     ) -> f32;
 }
 
-pub type PointShadowTexture = Image!(cube, type = f32, depth = true);
+pub type PointShadowTexture = Image!(cube, type = f32, depth = true, sampled = true);
 
 impl PointShadowTextures for PointShadowTexture {
     fn sample_depth_reference(&self, sampler: &Sampler, frag_ls: Vec3, depth: f32, _: u32) -> f32 {
         self.sample_depth_reference_by_lod(*sampler, frag_ls, depth, 0.0)
     }
 }
 
-pub type PointShadowTextureArray = Image!(cube, type = f32, depth = true, arrayed = true);
+pub type PointShadowTextureArray = Image!(cube, type = f32, depth = true, arrayed = true, sampled = true);
 
 impl PointShadowTextures for PointShadowTextureArray {
     fn sample_depth_reference(