summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-11-11 04:28:55 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-11-11 04:28:55 +0000
commit44fed82c44b6dc9e4759d00bbfb7806779f761ba (patch)
treeaf38d71b0c96482be473c913b3ed4a8b445eaf9c
parentUpdated submodules and readme (diff)
downloadDiligentEngine-44fed82c44b6dc9e4759d00bbfb7806779f761ba.tar.gz
DiligentEngine-44fed82c44b6dc9e4759d00bbfb7806779f761ba.zip
Updated submodules + added tutorial 17
m---------DiligentCore0
m---------DiligentSamples0
m---------DiligentTools0
-rw-r--r--Projects/Asteroids/src/asteroids_DE.cpp1
-rw-r--r--README.md1
-rw-r--r--Tests/TestApp/src/TestApp.cpp1
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp3
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp1
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp3
9 files changed, 3 insertions, 7 deletions
diff --git a/DiligentCore b/DiligentCore
-Subproject 4657c47c66b5556dd95388a7b13d1abb593e131
+Subproject 81618891065f897e238039b4ed2312eaf3e4910
diff --git a/DiligentSamples b/DiligentSamples
-Subproject 587f54b074b4132ec33577be29c7529881458ec
+Subproject d351434fa67e3cccdcd831f03dbb79d92fc2a59
diff --git a/DiligentTools b/DiligentTools
-Subproject 10ee5619e0d79cd7fe251087d8fff890508cd23
+Subproject 52fb48fa410b3bb773511ea2d8cd469795483cd
diff --git a/Projects/Asteroids/src/asteroids_DE.cpp b/Projects/Asteroids/src/asteroids_DE.cpp
index 4710333..7f55a28 100644
--- a/Projects/Asteroids/src/asteroids_DE.cpp
+++ b/Projects/Asteroids/src/asteroids_DE.cpp
@@ -102,7 +102,6 @@ struct SkyboxConstantBuffer {
void Asteroids::InitDevice(HWND hWnd, DeviceType DevType)
{
SwapChainDesc SwapChainDesc;
- SwapChainDesc.SamplesCount = 1;
SwapChainDesc.BufferCount = NUM_SWAP_CHAIN_BUFFERS;
SwapChainDesc.ColorBufferFormat = TEX_FORMAT_RGBA8_UNORM_SRGB;
SwapChainDesc.DepthBufferFormat = TEX_FORMAT_D32_FLOAT;
diff --git a/README.md b/README.md
index 1663418..563371b 100644
--- a/README.md
+++ b/README.md
@@ -588,6 +588,7 @@ Please refer to [this page](https://github.com/DiligentGraphics/DiligentCore#api
| [14 - Compute Shader](https://github.com/DiligentGraphics/DiligentSamples/tree/master/Tutorials/Tutorial14_ComputeShader) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial14_ComputeShader/Animation_Small.gif) | This tutorial shows how to implement a simple particle simulation system using compute shaders. |
| [15 - Multiple Windows](https://github.com/DiligentGraphics/DiligentSamples/tree/master/Tutorials/Tutorial15_MultipleWindows) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial15_MultipleWindows/Screenshot.png) | This tutorial demonstrates how to use Diligent Engine to render to multiple windows. |
| [16 - Bindless Resources](https://github.com/DiligentGraphics/DiligentSamples/tree/master/Tutorials/Tutorial16_BindlessResources) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial16_BindlessResources/Animation_Small.gif) | This tutorial shows how to implement bindless resources, a technique that leverages dynamic shader resource indexing feature enabled by the next-gen APIs to significantly improve rendering performance. |
+| [17 - MSAA](https://github.com/DiligentGraphics/DiligentSamples/tree/master/Tutorials/Tutorial17_MSAA) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial17_MSAA/Animation_Small.gif) | This tutorial demonstrates how to use multisample anti-aliasing (MSAA) to make geometrical edges look smoother and more temporarily stable. |
<a name="samples"></a>
# [Samples](https://github.com/DiligentGraphics/DiligentSamples)
diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp
index 623233e..ea8dc0f 100644
--- a/Tests/TestApp/src/TestApp.cpp
+++ b/Tests/TestApp/src/TestApp.cpp
@@ -157,7 +157,6 @@ void TestApp::InitializeDiligentEngine(
)
{
SwapChainDesc SCDesc;
- SCDesc.SamplesCount = 1;
Uint32 NumDeferredCtx = 0;
std::vector<IDeviceContext*> ppContexts;
std::vector<HardwareAdapterAttribs> Adapters;
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
index 5c5b253..c01ff0a 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
@@ -127,8 +127,7 @@ void DiligentGraphicsAdapterD3D11::InitProxySwapChain()
SCDesc.DepthBufferFormat = DXGI_FormatToTexFormat(DSVDesc.Format);
SCDesc.Width = GraphicsD3D11Impl->GetBackBufferWidth();
SCDesc.Height = GraphicsD3D11Impl->GetBackBufferHeight();
- // These fields are irrelevant
- SCDesc.SamplesCount = 0;
+ // This field is irrelevant
SCDesc.BufferCount = 0;
auto &DefaultAllocator = DefaultRawMemoryAllocator::GetAllocator();
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
index 1495f5c..6c09f5c 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
@@ -145,7 +145,6 @@ public:
DXGI_SWAP_CHAIN_DESC1 SwapChainDesc;
pDXGISwapChain->GetDesc1(&SwapChainDesc);
m_SwapChainDesc.BufferCount = SwapChainDesc.BufferCount;
- m_SwapChainDesc.SamplesCount = SwapChainDesc.SampleDesc.Count;
m_SwapChainDesc.Width = SwapChainDesc.Width;
m_SwapChainDesc.Height = SwapChainDesc.Height;
m_SwapChainDesc.ColorBufferFormat = DXGI_FormatToTexFormat(SwapChainDesc.Format);
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
index 43cd75e..0e81625 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
@@ -96,8 +96,7 @@ DiligentGraphicsAdapterGL::DiligentGraphicsAdapterGL(const UnityGraphicsGLCoreES
SCDesc.Width = UnityGraphicsGLImpl->GetBackBufferWidth();
SCDesc.Height = UnityGraphicsGLImpl->GetBackBufferHeight();
- // These fields are irrelevant
- SCDesc.SamplesCount = 0;
+ // This field is irrelevant
SCDesc.BufferCount = 0;
auto &DefaultAllocator = DefaultRawMemoryAllocator::GetAllocator();