From 81b4ed2a81d7bada71a115efc7fb2347378fb975 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 20 Jul 2017 15:25:35 +1000 Subject: Vulkan: Uber shader support --- Source/Core/VideoBackends/Vulkan/RasterFont.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/Vulkan/RasterFont.cpp') diff --git a/Source/Core/VideoBackends/Vulkan/RasterFont.cpp b/Source/Core/VideoBackends/Vulkan/RasterFont.cpp index def32e5050..97ab4dd6d8 100644 --- a/Source/Core/VideoBackends/Vulkan/RasterFont.cpp +++ b/Source/Core/VideoBackends/Vulkan/RasterFont.cpp @@ -150,7 +150,7 @@ layout(std140, push_constant) uniform PCBlock { vec4 color; } PC; -layout(set = 1, binding = 0) uniform sampler2D samp0; +layout(set = 1, binding = 0) uniform sampler2DArray samp0; layout(location = 0) in vec2 uv0; @@ -158,7 +158,7 @@ layout(location = 0) out vec4 ocol0; void main() { - ocol0 = texture(samp0, uv0) * PC.color; + ocol0 = texture(samp0, float3(uv0, 0.0)) * PC.color; } )"; @@ -209,7 +209,7 @@ bool RasterFont::CreateTexture() // create the actual texture object m_texture = Texture2D::Create(CHARACTER_WIDTH * CHARACTER_COUNT, CHARACTER_HEIGHT, 1, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_SAMPLE_COUNT_1_BIT, - VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_TILING_OPTIMAL, + VK_IMAGE_VIEW_TYPE_2D_ARRAY, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT); if (!m_texture) return false; -- cgit v1.2.3