From d319a08b81b4e57ec41edb5ab46da779ed6da8f5 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Sat, 21 May 2022 13:15:00 -0500 Subject: [PATCH] Merged https://github.com/coelckers/gzdoom/pull/1580 --- 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 e22fb35b3..6e351931c 100644 --- a/src/common/rendering/gl/gl_shader.cpp +++ b/src/common/rendering/gl/gl_shader.cpp @@ -314,6 +314,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 d895b8f9e..ea649c337 100644 --- a/src/common/rendering/vulkan/shaders/vk_shader.cpp +++ b/src/common/rendering/vulkan/shaders/vk_shader.cpp @@ -231,6 +231,7 @@ static const char *shaderBindings = R"( layout(set = 1, binding = 8) uniform sampler2D texture9; layout(set = 1, binding = 9) uniform sampler2D texture10; layout(set = 1, binding = 10) uniform sampler2D texture11; + layout(set = 1, binding = 11) uniform sampler2D texture12; // This must match the PushConstants struct layout(push_constant) uniform PushConstants