diff options
| author | Stenzek <stenzek@gmail.com> | 2017-07-20 15:25:35 +1000 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2017-07-30 17:43:59 +1000 |
| commit | 81b4ed2a81d7bada71a115efc7fb2347378fb975 (patch) | |
| tree | ba6884e584fc23b872f8b4679cd919085b92ddf9 /Source/Core/VideoBackends/Vulkan/RasterFont.cpp | |
| parent | 4bf562589565636382b81313c2de0482e45743c0 (diff) | |
Vulkan: Uber shader support
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/RasterFont.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/RasterFont.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |
