Merge remote-tracking branch 'origin/master' into claude/issue-46
# Conflicts: # shaders/ui-text.comp.glsl
This commit is contained in:
commit
256ce56f1d
15 changed files with 983 additions and 112 deletions
|
|
@ -76,9 +76,12 @@ void main() {
|
|||
vec2 t = (sp - s_rect[c].xy) / s_rect[c].zw;
|
||||
vec2 uv = mix(s_uv[c].xy, s_uv[c].zw, t);
|
||||
|
||||
// Font slots are push constants — provably dynamically uniform, so no
|
||||
// nonuniformEXT: lets the compiler hoist the descriptor load out of the
|
||||
// per-pixel glyph loop and avoid the divergent-descriptor path.
|
||||
float sdf = texture(
|
||||
sampler2D(uiTextures[nonuniformEXT(pc.fontTextureSlot)],
|
||||
uiSamplers[nonuniformEXT(pc.fontSamplerSlot)]),
|
||||
sampler2D(uiTextures[pc.fontTextureSlot],
|
||||
uiSamplers[pc.fontSamplerSlot]),
|
||||
uv
|
||||
).r;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue