zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-11 05:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added 3 more texture samplers to the shaders to compensate for the now always occupied slots for brightmap, glow and detail.

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-09 20:40:43 +02:00
parent 18371fb27a
commit c9833a811e
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/rendering/gl/gl_shader.cpp
View file

@ -306,6 +306,9 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
uniform sampler2D texture6; uniform sampler2D texture6;
uniform sampler2D texture7; uniform sampler2D texture7;
uniform sampler2D texture8; uniform sampler2D texture8;
uniform sampler2D texture9;
uniform sampler2D texture10;
uniform sampler2D texture11;
// timer data // timer data
uniform float timer; uniform float timer;

3
src/common/rendering/vulkan/shaders/vk_shader.cpp
View file

@ -183,6 +183,9 @@ static const char *shaderBindings = R"(
layout(set = 1, binding = 5) uniform sampler2D texture6; layout(set = 1, binding = 5) uniform sampler2D texture6;
layout(set = 1, binding = 6) uniform sampler2D texture7; layout(set = 1, binding = 6) uniform sampler2D texture7;
layout(set = 1, binding = 7) uniform sampler2D texture8; 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 // This must match the PushConstants struct
layout(push_constant) uniform PushConstants layout(push_constant) uniform PushConstants