Skip to content

Commit 8d303fb

Browse files
TheMostDiligentTheMostDiligent
committed
Updated modules to API250000
1 parent 29c34ef commit 8d303fb

14 files changed

Lines changed: 109 additions & 78 deletions

File tree

‎.github/workflows/linux.yml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,23 @@ jobs:
2828
run: |
2929
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
3030
./validate_format_linux.sh
31-
31+
3232
- name: DiligentFX format validation
3333
shell: bash
3434
run: |
3535
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
3636
./validate_format_linux.sh
37-
37+
3838
- name: DiligentSamples format validation
3939
shell: bash
4040
run: |
4141
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
4242
./validate_format_linux.sh
43-
43+
4444
- name: Configure dependencies
4545
if: success()
4646
run: |
47-
sudo apt-get install build-essential pkg-config libx11-dev libxcursor-dev \
48-
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm
47+
sudo apt-get install build-essential libx11-dev libgl1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
4948
5049
- name: Configure CMake
5150
if: success()
@@ -68,15 +67,15 @@ jobs:
6867
if: success()
6968
shell: bash
7069
run: ${{runner.workspace}}/build/DiligentCore/Tests/DiligentCoreTest/DiligentCoreTest
71-
7270

73-
build-clang-9:
71+
72+
build-clang-10:
7473
strategy:
7574
matrix:
7675
config: [Debug, Release]
7776

7877
runs-on: ubuntu-latest
79-
name: Linux x64, Clang 9, ${{ matrix.config }}
78+
name: Linux x64, Clang 10, ${{ matrix.config }}
8079

8180
steps:
8281
- name: Clone repository
@@ -95,13 +94,13 @@ jobs:
9594
run: |
9695
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
9796
./validate_format_linux.sh
98-
97+
9998
- name: DiligentFX format validation
10099
shell: bash
101100
run: |
102101
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
103102
./validate_format_linux.sh
104-
103+
105104
- name: DiligentSamples format validation
106105
shell: bash
107106
run: |
@@ -111,14 +110,13 @@ jobs:
111110
- name: Configure dependencies
112111
if: success()
113112
run: |
114-
sudo apt-get install build-essential pkg-config libx11-dev libxcursor-dev \
115-
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm
113+
sudo apt-get install build-essential libx11-dev libgl1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
116114
117115
- name: Configure CMake
118116
if: success()
119117
env:
120-
CC: clang-9
121-
CXX: clang++-9
118+
CC: clang-10
119+
CXX: clang++-10
122120
shell: bash
123121
run: |
124122
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/Scripts/github_actions

‎DiligentCore‎

Submodule DiligentCore updated 358 files

‎DiligentFX‎

‎DiligentSamples‎

Submodule DiligentSamples updated 55 files

‎DiligentTools‎

Submodule DiligentTools updated 16 files

‎Projects/Asteroids/src/asteroids_DE.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ void Asteroids::InitDevice(HWND hWnd, RENDER_DEVICE_TYPE DevType)
201201
}
202202
}
203203

204-
Asteroids::Asteroids(const Settings& settings, AsteroidsSimulation* asteroids, GUI* gui, HWND hWnd, Diligent::RENDER_DEVICE_TYPE DevType) :
204+
Asteroids::Asteroids(const Settings& settings, AsteroidsSimulation* asteroids, GUI* gui, HWND hWnd, RENDER_DEVICE_TYPE DevType) :
205205
mAsteroids(asteroids), mGUI(gui)
206206
{
207207
QueryPerformanceFrequency((LARGE_INTEGER*)&mPerfCounterFreq);
@@ -212,7 +212,7 @@ Asteroids::Asteroids(const Settings& settings, AsteroidsSimulation* asteroids, G
212212
InitDevice(hWnd, DevType);
213213

214214
m_BindingMode = static_cast<BindingMode>(settings.resourceBindingMode);
215-
if (m_BindingMode == BindingMode::Bindless && !mDevice->GetDeviceCaps().Features.BindlessResources)
215+
if (m_BindingMode == BindingMode::Bindless && !mDevice->GetDeviceInfo().Features.BindlessResources)
216216
m_BindingMode = BindingMode::TextureMutable;
217217

218218
mCmdLists.resize(mDeferredCtxt.size());
@@ -818,7 +818,7 @@ void Asteroids::CreateGUIResources()
818818

819819
static_assert(sizeof(IndexType) == 2, "Expecting 16-bit index buffer");
820820

821-
void Asteroids::WorkerThreadFunc(Asteroids* pThis, Diligent::Uint32 ThreadNum)
821+
void Asteroids::WorkerThreadFunc(Asteroids* pThis, Uint32 ThreadNum)
822822
{
823823
for (;;)
824824
{
@@ -851,12 +851,15 @@ void Asteroids::WorkerThreadFunc(Asteroids* pThis, Diligent::Uint32 ThreadNum)
851851
}
852852
}
853853

854-
void Asteroids::RenderSubset(Diligent::Uint32 SubsetNum,
854+
void Asteroids::RenderSubset(Uint32 SubsetNum,
855855
IDeviceContext* pCtx,
856856
const OrbitCamera& camera,
857857
Uint32 startIdx,
858858
Uint32 numAsteroids)
859859
{
860+
if (pCtx->GetDesc().IsDeferred)
861+
pCtx->Begin(0);
862+
860863
auto* pRTV = mSwapChain->GetCurrentBackBufferRTV();
861864
auto* pDSV = mSwapChain->GetDepthBufferDSV();
862865
pCtx->SetRenderTargets(1, &pRTV, pDSV, RESOURCE_STATE_TRANSITION_MODE_VERIFY);

‎README.md‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Diligent Engine <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/diligentgraphics-logo.png" height=64 align="right" valign="middle">
2-
**A Modern Cross-Platform Low-Level 3D Graphics Library** [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=An%20easy-to-use%20cross-platform%20graphics%20library%20that%20takes%20full%20advantage%20of%20%23Direct3D12%20and%20%23VulkanAPI&url=https://github.com/DiligentGraphics/DiligentEngine)
2+
**A Modern Cross-Platform Low-Level 3D Graphics Library and Rendering Framework**
3+
[![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=An%20easy-to-use%20cross-platform%20graphics%20library%20that%20takes%20full%20advantage%20of%20%23Direct3D12%20and%20%23VulkanAPI&url=https://github.com/DiligentGraphics/DiligentEngine)
34

45
[Diligent Engine](http://diligentgraphics.com/diligent-engine/) is a lightweight cross-platform graphics
56
API abstraction library and rendering framework. It is designed to take full advantage of Direct3D12, Vulkan
@@ -16,6 +17,22 @@ It is distributed under [Apache 2.0 license](License.txt) and is free to use.
1617
[![Build Status](https://travis-ci.org/DiligentGraphics/DiligentEngine.svg?branch=master)](https://travis-ci.org/DiligentGraphics/DiligentEngine)
1718
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/978eebabb2fc438f9d736443b71127aa)](https://www.codacy.com/manual/DiligentGraphics/DiligentEngine?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=DiligentGraphics/DiligentEngine&amp;utm_campaign=Badge_Grade)
1819

20+
## Supported Platforms and Low-Level Graphics APIs
21+
22+
| Platform | D3D11 | D3D12 | OpenGL/GLES | Vulkan | Metal | Build Status |
23+
| -------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |------------------- | ------------------ | ------------------------------- | ------------------------------- | -------------------------------- |
24+
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/windows-logo.png" width=24 valign="middle"> Windows | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/Windows/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/windows.yml?query=branch%3Amaster) |
25+
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/uwindows-logo.png" width=24 valign="middle"> Universal Windows | :heavy_check_mark: | :heavy_check_mark: | - | - | - | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/UWP/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/uwp.yml?query=branch%3Amaster) |
26+
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/linux-logo.png" width=24 valign="middle"> Linux | - | - | :heavy_check_mark: | :heavy_check_mark: | - | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/Linux/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/linux.yml?query=branch%3Amaster) |
27+
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/macos-logo.png" width=24 valign="middle"> MacOS | - | - | :heavy_check_mark: | :heavy_check_mark: <sup>1</sup> | :heavy_check_mark: <sup>2</sup> | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/MacOS/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/macos.yml?query=branch%3Amaster) |
28+
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/android-logo.png" width=24 valign="middle"> Android | - | - | :heavy_check_mark: | :heavy_check_mark: | - | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/Android/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/android.yml?query=branch%3Amaster) |
29+
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/apple-logo.png" width=24 valign="middle"> iOS | - | - | :heavy_check_mark: | :heavy_check_mark: <sup>1</sup> | :heavy_check_mark: <sup>2</sup> | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/iOS/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/ios.yml?query=branch%3Amaster) |
30+
31+
<sup>1</sup> Vulkan API is not natively supported on MacOS and iOS platforms and requires a Vulkan portability implementation such as [MoltenVK](https://github.com/KhronosGroup/MoltenVK)
32+
or [gfx-portability](https://github.com/gfx-rs/portability).
33+
34+
<sup>2</sup> Available under commercial license - please contact us for details.
35+
1936
## Features
2037

2138
* Cross-platform
@@ -39,7 +56,8 @@ It is distributed under [Apache 2.0 license](License.txt) and is free to use.
3956
* [Automatic or explicit control over resource state transitions](http://diligentgraphics.com/2018/12/09/resource-state-management/)
4057
* Descriptor and memory management
4158
* Shader resource reflection
42-
* Ray-tracing, mesh shaders, bindless resources, and other state of the art capabilities
59+
* Async compute and multiple command queues
60+
* Ray-tracing, mesh shaders, tile shaders, bindless resources, and other state of the art capabilities
4361
* Extensive validation and error reporting
4462
* Modern c++ features to make the code fast and reliable
4563
* Consistent high quality is ensured by continuous integration
@@ -56,21 +74,6 @@ It is distributed under [Apache 2.0 license](License.txt) and is free to use.
5674
* [Integration with Dear Imgui](https://github.com/DiligentGraphics/DiligentSamples/tree/master/Samples/ImguiDemo)
5775
[and Nuklear](https://github.com/DiligentGraphics/DiligentSamples/tree/master/Samples/NuklearDemo)
5876

59-
## Supported Platforms and Low-Level Graphics APIs
60-
61-
| Platform | D3D11 | D3D12 | OpenGL/GLES | Vulkan | Metal | Build Status |
62-
| -------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |------------------- | ------------------ | ------------------------------- | ------------------------------- | -------------------------------- |
63-
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/windows-logo.png" width=24 valign="middle"> Windows | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/Windows/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/windows.yml?query=branch%3Amaster) |
64-
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/uwindows-logo.png" width=24 valign="middle"> Universal Windows | :heavy_check_mark: | :heavy_check_mark: | - | - | - | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/UWP/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/uwp.yml?query=branch%3Amaster) |
65-
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/linux-logo.png" width=24 valign="middle"> Linux | - | - | :heavy_check_mark: | :heavy_check_mark: | - | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/Linux/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/linux.yml?query=branch%3Amaster) |
66-
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/macos-logo.png" width=24 valign="middle"> MacOS | - | - | :heavy_check_mark: | :heavy_check_mark: <sup>1</sup> | :heavy_check_mark: <sup>2</sup> | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/MacOS/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/macos.yml?query=branch%3Amaster) |
67-
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/android-logo.png" width=24 valign="middle"> Android | - | - | :heavy_check_mark: | :heavy_check_mark: | - | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/Android/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/android.yml?query=branch%3Amaster) |
68-
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/apple-logo.png" width=24 valign="middle"> iOS | - | - | :heavy_check_mark: | :heavy_check_mark: <sup>1</sup> | :heavy_check_mark: <sup>2</sup> | [![Build Status](https://github.com/DiligentGraphics/DiligentEngine/workflows/iOS/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentEngine/actions/workflows/ios.yml?query=branch%3Amaster) |
69-
70-
<sup>1</sup> Vulkan API is not natively supported on MacOS and iOS platforms and requires a Vulkan portability implementation such as [MoltenVK](https://github.com/KhronosGroup/MoltenVK)
71-
or [gfx-portability](https://github.com/gfx-rs/portability).
72-
73-
<sup>2</sup> Available under commercial license - please contact us for details.
7477

7578
# Table of Contents
7679

@@ -525,6 +528,9 @@ CMake option. Note that any pull request will fail if formatting issues are foun
525528
Diligent Engine uses extensive validation that is always enabled in Debug build. Some of the checks may be
526529
enabled in release configurations by setting `DILIGENT_DEVELOPMENT` CMake option.
527530

531+
To enable PIX events support, download [WinPixEventRuntime](https://devblogs.microsoft.com/pix/winpixeventruntime/)
532+
and set `DILIGENT_PIX_EVENT_RUNTIME_PATH` CMake variable to the root folder of the package.
533+
528534
<a name="build_and_run_customizing"></a>
529535
## Customizing Build
530536

0 commit comments

Comments
 (0)