From aa061562cd647e7dee6caf2faf2aae8f4a8e3c32 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 14 Jan 2023 11:23:02 -0500 Subject: [PATCH] - manually reimplement pull request #1850 --- src/common/rendering/gl/gl_shader.cpp | 1 + src/common/rendering/vulkan/shaders/vk_shader.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/common/rendering/gl/gl_shader.cpp b/src/common/rendering/gl/gl_shader.cpp index c69aa79b2..7a8e3baae 100644 --- a/src/common/rendering/gl/gl_shader.cpp +++ b/src/common/rendering/gl/gl_shader.cpp @@ -328,6 +328,7 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char * uniform sampler2D texture9; uniform sampler2D texture10; uniform sampler2D texture11; + uniform sampler2D texture12; // timer data uniform float timer; diff --git a/src/common/rendering/vulkan/shaders/vk_shader.cpp b/src/common/rendering/vulkan/shaders/vk_shader.cpp index 1c6df42f1..753229e41 100644 --- a/src/common/rendering/vulkan/shaders/vk_shader.cpp +++ b/src/common/rendering/vulkan/shaders/vk_shader.cpp @@ -244,6 +244,7 @@ static const char *shaderBindings = R"( layout(set = 2, binding = 8) uniform sampler2D texture9; layout(set = 2, binding = 9) uniform sampler2D texture10; layout(set = 2, binding = 10) uniform sampler2D texture11; + layout(set = 2, binding = 11) uniform sampler2D texture12; // This must match the PushConstants struct layout(push_constant) uniform PushConstants