From b76a8b9854c54e0e84a80870ace62741fc7eb8b6 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Fri, 26 Jan 2024 13:51:57 -0800 Subject: [PATCH] oops - do not ring_write in reader path... also fix silly shader thing --- src/render/d3d11/generated/render_d3d11.meta.h | 12 ++++++------ src/render/d3d11/render_d3d11.mdesk | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/render/d3d11/generated/render_d3d11.meta.h b/src/render/d3d11/generated/render_d3d11.meta.h index 7fb24282..033faa3e 100644 --- a/src/render/d3d11/generated/render_d3d11.meta.h +++ b/src/render/d3d11/generated/render_d3d11.meta.h @@ -175,13 +175,13 @@ str8_lit_comp( " float corner_sdf_t = 1-smoothstep(0, 2*vertex2pixel.softness_px, corner_sdf_s);\n" " \n" " // rjf: sample for borders\n" -" float border_sdf_s = rect_sdf(sdf_sample_pos,\n" -" vertex2pixel.rect_half_size_px - float2(vertex2pixel.softness_px*2.f, vertex2pixel.softness_px*2.f) - vertex2pixel.border_thickness_px,\n" -" max(vertex2pixel.corner_radius_px-vertex2pixel.border_thickness_px, 0));\n" -" float border_sdf_t = smoothstep(0, 2*vertex2pixel.softness_px, border_sdf_s);\n" -" if(vertex2pixel.border_thickness_px == 0)\n" +" float border_sdf_t = 1;\n" +" if(vertex2pixel.border_thickness_px > 0)\n" " {\n" -" border_sdf_t = 1;\n" +" float border_sdf_s = rect_sdf(sdf_sample_pos,\n" +" vertex2pixel.rect_half_size_px - float2(vertex2pixel.softness_px*2.f, vertex2pixel.softness_px*2.f) - vertex2pixel.border_thickness_px,\n" +" max(vertex2pixel.corner_radius_px-vertex2pixel.border_thickness_px, 0));\n" +" border_sdf_t = smoothstep(0, 2*vertex2pixel.softness_px, border_sdf_s);\n" " }\n" " if(border_sdf_t < 0.001f)\n" " {\n" diff --git a/src/render/d3d11/render_d3d11.mdesk b/src/render/d3d11/render_d3d11.mdesk index b3c78332..35694248 100644 --- a/src/render/d3d11/render_d3d11.mdesk +++ b/src/render/d3d11/render_d3d11.mdesk @@ -174,13 +174,13 @@ ps_main(Vertex2Pixel vertex2pixel) : SV_TARGET float corner_sdf_t = 1-smoothstep(0, 2*vertex2pixel.softness_px, corner_sdf_s); // rjf: sample for borders - float border_sdf_s = rect_sdf(sdf_sample_pos, - vertex2pixel.rect_half_size_px - float2(vertex2pixel.softness_px*2.f, vertex2pixel.softness_px*2.f) - vertex2pixel.border_thickness_px, - max(vertex2pixel.corner_radius_px-vertex2pixel.border_thickness_px, 0)); - float border_sdf_t = smoothstep(0, 2*vertex2pixel.softness_px, border_sdf_s); - if(vertex2pixel.border_thickness_px == 0) + float border_sdf_t = 1; + if(vertex2pixel.border_thickness_px > 0) { - border_sdf_t = 1; + float border_sdf_s = rect_sdf(sdf_sample_pos, + vertex2pixel.rect_half_size_px - float2(vertex2pixel.softness_px*2.f, vertex2pixel.softness_px*2.f) - vertex2pixel.border_thickness_px, + max(vertex2pixel.corner_radius_px-vertex2pixel.border_thickness_px, 0)); + border_sdf_t = smoothstep(0, 2*vertex2pixel.softness_px, border_sdf_s); } if(border_sdf_t < 0.001f) {