zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 00:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- backend update.

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-11 09:15:44 +02:00
parent f41e0f9f50
commit a9141af545
28 changed files with 128 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/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 = 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

2
source/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h vendored
View file

@ -2229,7 +2229,7 @@ remove them if not needed.
#include <mutex> // for std::mutex
#include <atomic> // for std::atomic
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
#include <malloc.h> // for aligned_alloc()
#endif