From 6f4894704295b6ac9a117650c8d9d2a503190d60 Mon Sep 17 00:00:00 2001
From: Louis Capitanchik <contact@louiscap.co>
Date: Fri, 19 Aug 2022 15:56:26 +0100
Subject: [PATCH] Rename '_unused' to '_padding'
---
.../src/render/unified/pipeline.rs | 24 +++++++++----------
.../src/render/unified/shader.wgsl | 8 +++----
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/bevy_kayak_renderer/src/render/unified/pipeline.rs b/bevy_kayak_renderer/src/render/unified/pipeline.rs
index a3f4c64..d73a940 100644
--- a/bevy_kayak_renderer/src/render/unified/pipeline.rs
+++ b/bevy_kayak_renderer/src/render/unified/pipeline.rs
@@ -337,9 +337,9 @@ struct QuadVertex {
#[derive(Copy, Clone, ShaderType)]
struct QuadType {
pub t: i32,
- pub _unused_1: i32,
- pub _unused_2: i32,
- pub _unused_3: i32,
+ pub _padding_1: i32,
+ pub _padding_2: i32,
+ pub _padding_3: i32,
}
pub struct QuadMeta {
@@ -381,21 +381,21 @@ pub fn prepare_quads(
// sprite_meta.types_buffer.reserve(2, &render_device);
let quad_type_offset = sprite_meta.types_buffer.push(QuadType {
t: 0,
- _unused_1: 0,
- _unused_2: 0,
- _unused_3: 0,
+ _padding_1: 0,
+ _padding_2: 0,
+ _padding_3: 0,
});
let text_type_offset = sprite_meta.types_buffer.push(QuadType {
t: 1,
- _unused_1: 0,
- _unused_2: 0,
- _unused_3: 0,
+ _padding_1: 0,
+ _padding_2: 0,
+ _padding_3: 0,
});
let image_type_offset = sprite_meta.types_buffer.push(QuadType {
t: 2,
- _unused_1: 0,
- _unused_2: 0,
- _unused_3: 0,
+ _padding_1: 0,
+ _padding_2: 0,
+ _padding_3: 0,
});
sprite_meta
diff --git a/bevy_kayak_renderer/src/render/unified/shader.wgsl b/bevy_kayak_renderer/src/render/unified/shader.wgsl
index 14cbffd..5a8fcf9 100644
--- a/bevy_kayak_renderer/src/render/unified/shader.wgsl
+++ b/bevy_kayak_renderer/src/render/unified/shader.wgsl
@@ -7,9 +7,9 @@ var<uniform> view: View;
struct QuadType {
t: i32,
- _unused_1: i32,
- _unused_2: i32,
- _unused_3: i32,
+ _padding_1: i32,
+ _padding_2: i32,
+ _padding_3: i32,
};
@group(2) @binding(0)
@@ -23,7 +23,6 @@ struct VertexOutput {
@location(3) size: vec2<f32>,
@location(4) border_radius: f32,
@location(5) pixel_position: vec2<f32>,
- @location(6) _unused: f32,
};
@vertex
@@ -41,7 +40,6 @@ fn vertex(
out.uv = vertex_uv.xyz;
out.size = vertex_pos_size.zw;
out.border_radius = vertex_uv.w;
- out._unused = 0.0;
return out;
}
--
GitLab