diff --git a/shaders/glsl/distancefieldfonts/sdf.frag b/shaders/glsl/distancefieldfonts/sdf.frag index c8d42870..d161ebe1 100644 --- a/shaders/glsl/distancefieldfonts/sdf.frag +++ b/shaders/glsl/distancefieldfonts/sdf.frag @@ -2,8 +2,10 @@ layout (binding = 1) uniform sampler2D samplerColor; -layout (binding = 2) uniform UBO +layout (binding = 0) uniform UBO { + mat4 projection; + mat4 model; vec4 outlineColor; float outlineWidth; float outline; diff --git a/shaders/glsl/distancefieldfonts/sdf.frag.spv b/shaders/glsl/distancefieldfonts/sdf.frag.spv index f16588d1..6230e0a7 100644 Binary files a/shaders/glsl/distancefieldfonts/sdf.frag.spv and b/shaders/glsl/distancefieldfonts/sdf.frag.spv differ diff --git a/shaders/glsl/distancefieldfonts/sdf.vert b/shaders/glsl/distancefieldfonts/sdf.vert index 1418d5c5..b09e4cf9 100644 --- a/shaders/glsl/distancefieldfonts/sdf.vert +++ b/shaders/glsl/distancefieldfonts/sdf.vert @@ -7,6 +7,9 @@ layout (binding = 0) uniform UBO { mat4 projection; mat4 model; + vec4 outlineColor; + float outlineWidth; + float outline; } ubo; layout (location = 0) out vec2 outUV; diff --git a/shaders/glsl/distancefieldfonts/sdf.vert.spv b/shaders/glsl/distancefieldfonts/sdf.vert.spv index 0872996a..076d2c2c 100644 Binary files a/shaders/glsl/distancefieldfonts/sdf.vert.spv and b/shaders/glsl/distancefieldfonts/sdf.vert.spv differ diff --git a/shaders/hlsl/distancefieldfonts/sdf.frag b/shaders/hlsl/distancefieldfonts/sdf.frag index 104284a9..b645912c 100644 --- a/shaders/hlsl/distancefieldfonts/sdf.frag +++ b/shaders/hlsl/distancefieldfonts/sdf.frag @@ -1,16 +1,19 @@ // Copyright 2020 Google LLC +// Copyright 2023 Sascha Willems Texture2D textureColor : register(t1); SamplerState samplerColor : register(s1); struct UBO { + float4x4 projection; + float4x4 model; float4 outlineColor; float outlineWidth; float outline; }; -cbuffer ubo : register(b2) { UBO ubo; } +cbuffer ubo : register(b0) { UBO ubo; } float4 main([[vk::location(0)]] float2 inUV : TEXCOORD0) : SV_TARGET { diff --git a/shaders/hlsl/distancefieldfonts/sdf.frag.spv b/shaders/hlsl/distancefieldfonts/sdf.frag.spv index 5a1f75cd..562614d5 100644 Binary files a/shaders/hlsl/distancefieldfonts/sdf.frag.spv and b/shaders/hlsl/distancefieldfonts/sdf.frag.spv differ diff --git a/shaders/hlsl/distancefieldfonts/sdf.vert b/shaders/hlsl/distancefieldfonts/sdf.vert index 379daee9..a16d01d3 100644 --- a/shaders/hlsl/distancefieldfonts/sdf.vert +++ b/shaders/hlsl/distancefieldfonts/sdf.vert @@ -1,4 +1,5 @@ // Copyright 2020 Google LLC +// Copyright 2023 Sascha Willems struct VSInput { @@ -10,6 +11,9 @@ struct UBO { float4x4 projection; float4x4 model; + float4 outlineColor; + float outlineWidth; + float outline; }; cbuffer ubo : register(b0) { UBO ubo; } diff --git a/shaders/hlsl/distancefieldfonts/sdf.vert.spv b/shaders/hlsl/distancefieldfonts/sdf.vert.spv index 5b4eecdc..44a1115d 100644 Binary files a/shaders/hlsl/distancefieldfonts/sdf.vert.spv and b/shaders/hlsl/distancefieldfonts/sdf.vert.spv differ