diff --git a/src/dxvk/hud/dxvk_hud_renderer.cpp b/src/dxvk/hud/dxvk_hud_renderer.cpp index cbd4810a..c9425fe7 100644 --- a/src/dxvk/hud/dxvk_hud_renderer.cpp +++ b/src/dxvk/hud/dxvk_hud_renderer.cpp @@ -50,7 +50,7 @@ namespace dxvk::hud { sizeof(HudVertex)); context->bindResourceSampler(1, m_fontSampler); - context->bindResourceView (2, m_fontView, nullptr); + context->bindResourceView (1, m_fontView, nullptr); m_mode = Mode::RenderNone; m_vertexIndex = 0; @@ -203,9 +203,8 @@ namespace dxvk::hud { const SpirvCodeBuffer codeBuffer(hud_text); // Two shader resources: Font texture and sampler - const std::array resourceSlots = {{ - { 1, VK_DESCRIPTOR_TYPE_SAMPLER, VK_IMAGE_VIEW_TYPE_MAX_ENUM }, - { 2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, VK_IMAGE_VIEW_TYPE_2D }, + const std::array resourceSlots = {{ + { 1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_IMAGE_VIEW_TYPE_2D }, }}; return device->createShader( diff --git a/src/dxvk/hud/shaders/hud_text.frag b/src/dxvk/hud/shaders/hud_text.frag index b044e221..573f014d 100644 --- a/src/dxvk/hud/shaders/hud_text.frag +++ b/src/dxvk/hud/shaders/hud_text.frag @@ -1,7 +1,6 @@ #version 450 -layout(set = 0, binding = 1) uniform sampler s_font; -layout(set = 0, binding = 2) uniform texture2D t_font; +layout(set = 0, binding = 1) uniform sampler2D s_font; layout(location = 0) in vec2 v_texcoord; layout(location = 1) in vec4 v_color; @@ -9,7 +8,7 @@ layout(location = 1) in vec4 v_color; layout(location = 0) out vec4 o_color; float sampleAlpha(float alpha_bias, float dist_range) { - float value = texture(sampler2D(t_font, s_font), v_texcoord).r + alpha_bias - 0.5f; + float value = texture(s_font, v_texcoord).r + alpha_bias - 0.5f; float dist = value * dot(vec2(dist_range, dist_range), 1.0f / fwidth(v_texcoord.xy)); return clamp(dist + 0.5f, 0.0f, 1.0f); }