From c9833a811e5820b18365f8fa48a9ae40039b876f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 9 Jun 2020 20:40:43 +0200 Subject: [PATCH] - added 3 more texture samplers to the shaders to compensate for the now always occupied slots for brightmap, glow and detail. --- src/common/rendering/gl/gl_shader.cpp | 3 +++ src/common/rendering/vulkan/shaders/vk_shader.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/common/rendering/gl/gl_shader.cpp b/src/common/rendering/gl/gl_shader.cpp index 0505a1d2e..fdcad50ab 100644 --- a/src/common/rendering/gl/gl_shader.cpp +++ b/src/common/rendering/gl/gl_shader.cpp @@ -306,6 +306,9 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char * uniform sampler2D texture6; uniform sampler2D texture7; uniform sampler2D texture8; + uniform sampler2D texture9; + uniform sampler2D texture10; + uniform sampler2D texture11; // 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 7f9fa9a6f..cff13547f 100644 --- a/src/common/rendering/vulkan/shaders/vk_shader.cpp +++ b/src/common/rendering/vulkan/shaders/vk_shader.cpp @@ -183,6 +183,9 @@ static const char *shaderBindings = R"( layout(set = 1, binding = 5) uniform sampler2D texture6; layout(set = 1, binding = 6) uniform sampler2D texture7; layout(set = 1, binding = 7) uniform sampler2D texture8; + layout(set = 1, binding = 8) uniform sampler2D texture9; + layout(set = 1, binding = 9) uniform sampler2D texture10; + layout(set = 1, binding = 10) uniform sampler2D texture11; // This must match the PushConstants struct layout(push_constant) uniform PushConstants