summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3D12
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-01-29 06:59:57 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-01-29 06:59:57 +0000
commit47ebe9b545d2efa9b60a735ee261d78eaa54aa57 (patch)
tree87c7a295204d514ab214c33ab8306d1e4d414f55 /Graphics/GraphicsEngineD3D12
parentReworked C interface to optimize inheritance handling (diff)
downloadDiligentCore-47ebe9b545d2efa9b60a735ee261d78eaa54aa57.tar.gz
DiligentCore-47ebe9b545d2efa9b60a735ee261d78eaa54aa57.zip
Fixed a number of minor issues
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
-rw-r--r--Graphics/GraphicsEngineD3D12/readme.md5
-rw-r--r--Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp9
2 files changed, 8 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineD3D12/readme.md b/Graphics/GraphicsEngineD3D12/readme.md
index 42ec0005..84d747c7 100644
--- a/Graphics/GraphicsEngineD3D12/readme.md
+++ b/Graphics/GraphicsEngineD3D12/readme.md
@@ -13,9 +13,8 @@ using namespace Diligent;
// ...
#if ENGINE_DLL
- GetEngineFactoryD3D12Type GetEngineFactoryD3D12 = nullptr;
- // Load the dll and import GetEngineFactoryD3D12() function
- LoadGraphicsEngineD3D12(GetEngineFactoryD3D12);
+ // Load the dll and import GetEngineFactoryD3D12() function
+ auto GetEngineFactoryD3D12 = LoadGraphicsEngineD3D12();
#endif
auto* pFactoryD3D12 = GetEngineFactoryD3D12();
EngineD3D12CreateInfo EngineCI;
diff --git a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
index bed9a84b..227dc3c2 100644
--- a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
@@ -511,15 +511,18 @@ void EngineFactoryD3D12Impl::EnumerateDisplayModes(DIRECT3D_FEATURE_LEVEL MinFea
#ifdef DOXYGEN
/// Loads Direct3D12-based engine implementation and exports factory functions
-/// \param [out] GetFactoryFunc - Pointer to the function that returns factory for D3D12 engine implementation.
-/// See EngineFactoryD3D12Impl.
+///
+/// \return - Pointer to the function that returns factory for D3D12 engine implementation.
+/// See Duiligent::EngineFactoryD3D12Impl.
+///
/// \remarks Depending on the configuration and platform, the function loads different dll:
+///
/// Platform\\Configuration | Debug | Release
/// --------------------------|-------------------------------|----------------------------
/// x86 | GraphicsEngineD3D12_32d.dll | GraphicsEngineD3D12_32r.dll
/// x64 | GraphicsEngineD3D12_64d.dll | GraphicsEngineD3D12_64r.dll
///
-void LoadGraphicsEngineD3D12(GetEngineFactoryD3D12Type& GetFactoryFunc)
+GetEngineFactoryD3D12Type LoadGraphicsEngineD3D12()
{
// This function is only required because DoxyGen refuses to generate documentation for a static function when SHOW_FILES==NO
# error This function must never be compiled;