Release 0.16.1 - Fixed VUID-02703 & VUID-02699 (#31)

Author: AustinJ235

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# Version 0.16.1 (July 25th, 2022)
+
+- Fixed `VUID-vkCmdDraw-None-02703` & `VUID-vkCmdDraw-None-02699` validation errors.
+
 # Version 0.16.0 (July 20th, 2022)
 
 - **BREAKING** Update dependency `vulkano` & `vulkano-shaders` to `0.30`.

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "basalt"
 edition = "2021"
-version = "0.16.0"
+version = "0.16.1"
 authors = ["Austin <[email protected]>"]
 repository = "https://github.com/AustinJ235/basalt"
 documentation = "https://docs.rs/basalt"

src/interface/render/layer_fs.rs

@@ -46,10 +46,10 @@ pub mod layer_fs {
 		vec4 s = vec4(xcubic.xz + xcubic.yw, ycubic.xz + ycubic.yw);
 		vec4 offset = c + vec4 (xcubic.yw, ycubic.yw) / s;
 		offset *= invTexSize.xxyy;
-		vec4 sample0 = texture(tex_nearest[tex_i], offset.xz);
-		vec4 sample1 = texture(tex_nearest[tex_i], offset.yz);
-		vec4 sample2 = texture(tex_nearest[tex_i], offset.xw);
-		vec4 sample3 = texture(tex_nearest[tex_i], offset.yw);
+		vec4 sample0 = textureLod(tex_nearest[tex_i], offset.xz, 0);
+		vec4 sample1 = textureLod(tex_nearest[tex_i], offset.yz, 0);
+		vec4 sample2 = textureLod(tex_nearest[tex_i], offset.xw, 0);
+		vec4 sample3 = textureLod(tex_nearest[tex_i], offset.yw, 0);
 		float sx = s.x / (s.x + s.y);
 		float sy = s.z / (s.z + s.w);
 		return mix(mix(sample3, sample2, sx), mix(sample1, sample0, sx), sy);
@@ -88,7 +88,7 @@ pub mod layer_fs {
 			out_std_rgba(clamp(textureBicubic(coords) * color, 0.0, 1.0));
 		}
 		else if(type == 2) { // Glyph
-			vec3 mask = texture(tex_nearest[tex_i], coords).rgb;
+			vec3 mask = textureLod(tex_nearest[tex_i], coords, 0).rgb;
 
 			if(mask.r <= epsilon && mask.g <= epsilon && mask.b <= epsilon) {
 				discard;

src/interface/render/pipeline.rs

@@ -50,6 +50,7 @@ pub(super) struct ItfPipeline {
 	pipeline_cache: Arc<PipelineCache>,
 	image_sampler: Arc<Sampler>,
 	conservative_draw: bool,
+	empty_image: Arc<BstImageView>,
 }
 
 struct Context {
@@ -126,6 +127,7 @@ impl ItfPipeline {
 			.unwrap(),
 			conservative_draw: bst.options_ref().app_loop
 				&& bst.options_ref().conservative_draw,
+			empty_image: bst.atlas_ref().empty_image(),
 			bst,
 		}
 	}
@@ -144,7 +146,7 @@ impl ItfPipeline {
 				&& view.images.len() > self.context.as_ref().unwrap().image_capacity)
 		{
 			let mut image_capacity =
-				self.context.as_ref().map(|c| c.image_capacity).unwrap_or(2);
+				self.context.as_ref().map(|c| c.image_capacity).unwrap_or(1);
 
 			while image_capacity < view.images.len() {
 				image_capacity *= 2;
@@ -541,6 +543,8 @@ impl ItfPipeline {
 						view.images
 							.iter()
 							.cloned()
+							// VUID-vkCmdDraw-None-02699
+							.chain((0..(context.image_capacity - view.images.len())).into_iter().map(|_| self.empty_image.clone()))
 							.map(|image| (image as Arc<_>, nearest_sampler.clone())),
 					),
 				]