Code cleanup, simplified, added code comments

This commit is contained in:
Sascha Willems 2024-01-13 15:59:19 +01:00
parent 4ae651ce51
commit 67820604b8
8 changed files with 14 additions and 2 deletions

View file

@ -2,8 +2,10 @@
layout (binding = 1) uniform sampler2D samplerColor; layout (binding = 1) uniform sampler2D samplerColor;
layout (binding = 2) uniform UBO layout (binding = 0) uniform UBO
{ {
mat4 projection;
mat4 model;
vec4 outlineColor; vec4 outlineColor;
float outlineWidth; float outlineWidth;
float outline; float outline;

View file

@ -7,6 +7,9 @@ layout (binding = 0) uniform UBO
{ {
mat4 projection; mat4 projection;
mat4 model; mat4 model;
vec4 outlineColor;
float outlineWidth;
float outline;
} ubo; } ubo;
layout (location = 0) out vec2 outUV; layout (location = 0) out vec2 outUV;

View file

@ -1,16 +1,19 @@
// Copyright 2020 Google LLC // Copyright 2020 Google LLC
// Copyright 2023 Sascha Willems
Texture2D textureColor : register(t1); Texture2D textureColor : register(t1);
SamplerState samplerColor : register(s1); SamplerState samplerColor : register(s1);
struct UBO struct UBO
{ {
float4x4 projection;
float4x4 model;
float4 outlineColor; float4 outlineColor;
float outlineWidth; float outlineWidth;
float outline; float outline;
}; };
cbuffer ubo : register(b2) { UBO ubo; } cbuffer ubo : register(b0) { UBO ubo; }
float4 main([[vk::location(0)]] float2 inUV : TEXCOORD0) : SV_TARGET float4 main([[vk::location(0)]] float2 inUV : TEXCOORD0) : SV_TARGET
{ {

View file

@ -1,4 +1,5 @@
// Copyright 2020 Google LLC // Copyright 2020 Google LLC
// Copyright 2023 Sascha Willems
struct VSInput struct VSInput
{ {
@ -10,6 +11,9 @@ struct UBO
{ {
float4x4 projection; float4x4 projection;
float4x4 model; float4x4 model;
float4 outlineColor;
float outlineWidth;
float outline;
}; };
cbuffer ubo : register(b0) { UBO ubo; } cbuffer ubo : register(b0) { UBO ubo; }