zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 12:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- manually reimplement pull request #1850

Browse source
This commit is contained in:
Rachael Alexanderson 2023-01-14 11:23:02 -05:00
parent bdffcedc03
commit aa061562cd
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -328,6 +328,7 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
uniform sampler2D texture9; uniform sampler2D texture9;
uniform sampler2D texture10; uniform sampler2D texture10;
uniform sampler2D texture11; uniform sampler2D texture11;
uniform sampler2D texture12;
// timer data // timer data
uniform float timer; uniform float timer;

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

@ -244,6 +244,7 @@ static const char *shaderBindings = R"(
layout(set = 2, binding = 8) uniform sampler2D texture9; layout(set = 2, binding = 8) uniform sampler2D texture9;
layout(set = 2, binding = 9) uniform sampler2D texture10; layout(set = 2, binding = 9) uniform sampler2D texture10;
layout(set = 2, binding = 10) uniform sampler2D texture11; layout(set = 2, binding = 10) uniform sampler2D texture11;
layout(set = 2, binding = 11) uniform sampler2D texture12;
// This must match the PushConstants struct // This must match the PushConstants struct
layout(push_constant) uniform PushConstants layout(push_constant) uniform PushConstants