backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[hud] remove unused texture

Browse Source
This commit is contained in:
Georg Lehmann 2020-04-08 19:23:53 +02:00 committed by Philip Rebohle
parent 3f4ffdfba8
commit e95e4ca225
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dxvk/hud/dxvk_hud_renderer.cpp
View File

@ -28,8 +28,8 @@ namespace dxvk::hud {
void HudRenderer::beginFrame(const Rc<DxvkContext>& context, VkExtent2D surfaceSize) { void HudRenderer::beginFrame(const Rc<DxvkContext>& context, VkExtent2D surfaceSize) {
context->bindResourceSampler(1, m_fontSampler); context->bindResourceSampler(0, m_fontSampler);
context->bindResourceView (1, m_fontView, nullptr); context->bindResourceView (0, m_fontView, nullptr);
m_mode = Mode::RenderNone; m_mode = Mode::RenderNone;
m_surfaceSize = surfaceSize; m_surfaceSize = surfaceSize;
@ -220,7 +220,7 @@ namespace dxvk::hud {
// Two shader resources: Font texture and sampler // Two shader resources: Font texture and sampler
const std::array<DxvkResourceSlot, 1> fsResources = {{ const std::array<DxvkResourceSlot, 1> fsResources = {{
{ 1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_IMAGE_VIEW_TYPE_2D }, { 0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_IMAGE_VIEW_TYPE_2D },
}}; }};
result.vert = device->createShader( result.vert = device->createShader(
@ -360,4 +360,4 @@ namespace dxvk::hud {
m_charMap.at(g_hudFont.glyphs[i].codePoint) = i; m_charMap.at(g_hudFont.glyphs[i].codePoint) = i;
} }
} }

5
src/dxvk/hud/shaders/hud_text_frag.frag
View File

@ -2,8 +2,7 @@
layout(constant_id = 1249) const bool srgbSwapchain = false; layout(constant_id = 1249) const bool srgbSwapchain = false;
layout(set = 0, binding = 0) uniform texture2D s_base; layout(set = 0, binding = 0) uniform sampler2D s_font;
layout(set = 0, binding = 1) uniform sampler2D s_font;
layout(location = 0) in vec2 v_texcoord; layout(location = 0) in vec2 v_texcoord;
layout(location = 1) in vec4 v_color; layout(location = 1) in vec4 v_color;
@ -36,4 +35,4 @@ void main() {
if (!srgbSwapchain) if (!srgbSwapchain)
o_color.rgb = linearToSrgb(o_color.rgb); o_color.rgb = linearToSrgb(o_color.rgb);
} }