diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-08-25 01:07:40 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-08-25 01:30:09 +0000 |
| commit | 142c7880f92c3517a8897d2601336f6dba319c17 (patch) | |
| tree | 55fd757db90d80fe2a72b54970e95764f181bbfb /BuildTools/Scripts | |
| parent | Updated description of DrawMeshIndirect command (diff) | |
| parent | Fixed test crash in d3d11 mode on Intel GPU (diff) | |
| download | DiligentCore-142c7880f92c3517a8897d2601336f6dba319c17.tar.gz DiligentCore-142c7880f92c3517a8897d2601336f6dba319c17.zip | |
Merge branch 'master' into mesh_shader
# Conflicts:
# Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
# Graphics/GraphicsEngineD3D12/include/CommandContext.hpp
# Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.hpp
Diffstat (limited to 'BuildTools/Scripts')
0 files changed, 0 insertions, 0 deletions