diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-08-19 15:02:00 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-08-19 15:02:00 +0000 |
| commit | 0703251a71c8cea898358abb9ecb7460c8655718 (patch) | |
| tree | 7f429c6e9871790fc9491c31bac0c1ca90e96873 /BuildTools/Scripts | |
| parent | formatting (diff) | |
| parent | Updated description of indirect draw/dispatch commands to specify the argumen... (diff) | |
| download | DiligentCore-0703251a71c8cea898358abb9ecb7460c8655718.tar.gz DiligentCore-0703251a71c8cea898358abb9ecb7460c8655718.zip | |
Merge branch 'master' into mesh_shader
# Conflicts:
# Graphics/GraphicsEngine/include/PipelineStateBase.hpp
# Graphics/GraphicsEngine/interface/PipelineState.h
# Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
# Graphics/GraphicsEngineD3D12/include/CommandContext.hpp
Diffstat (limited to 'BuildTools/Scripts')
0 files changed, 0 insertions, 0 deletions