diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-29 06:59:57 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-29 06:59:57 +0000 |
| commit | 47ebe9b545d2efa9b60a735ee261d78eaa54aa57 (patch) | |
| tree | 87c7a295204d514ab214c33ab8306d1e4d414f55 /Graphics/GraphicsEngineOpenGL | |
| parent | Reworked C interface to optimize inheritance handling (diff) | |
| download | DiligentCore-47ebe9b545d2efa9b60a735ee261d78eaa54aa57.tar.gz DiligentCore-47ebe9b545d2efa9b60a735ee261d78eaa54aa57.zip | |
Fixed a number of minor issues
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/readme.md | 6 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp | 13 |
3 files changed, 12 insertions, 9 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h b/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h index 0d42a16e..cff83e54 100644 --- a/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h +++ b/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h @@ -107,7 +107,7 @@ typedef struct IEngineFactoryOpenGL* (*GetEngineFactoryOpenGLType)(); inline GetEngineFactoryOpenGLType LoadGraphicsEngineOpenGL() { - return (GetEngineFactoryOpenGLType)LoadEngineDll("GraphicsEngineGL", "GetEngineFactoryOpenGL"); + return (GetEngineFactoryOpenGLType)LoadEngineDll("GraphicsEngineOpenGL", "GetEngineFactoryOpenGL"); } #else diff --git a/Graphics/GraphicsEngineOpenGL/readme.md b/Graphics/GraphicsEngineOpenGL/readme.md index 0c3c204b..b59cde75 100644 --- a/Graphics/GraphicsEngineOpenGL/readme.md +++ b/Graphics/GraphicsEngineOpenGL/readme.md @@ -14,9 +14,9 @@ using namespace Diligent; // ... #if ENGINE_DLL - GetEngineFactoryOpenGLType GetEngineFactoryOpenGL; - if(!LoadGraphicsEngineOpenGL(GetEngineFactoryOpenGL)) - return FALSE; + auto GetEngineFactoryOpenGL = LoadGraphicsEngineOpenGL(); + if (GetEngineFactoryOpenGL == nullptr) + return false; #endif RefCntAutoPtr<IRenderDevice> pRenderDevice; RefCntAutoPtr<IDeviceContext> pImmediateContext; diff --git a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp index 024a7bfc..85372f5d 100644 --- a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp @@ -248,17 +248,20 @@ void EngineFactoryOpenGLImpl::AttachToActiveGLContext(const EngineGLCreateInfo& #ifdef DOXYGEN /// Loads OpenGL-based engine implementation and exports factory functions -/// \param [out] GetFactoryFunc - Pointer to the function that returns pointer to the factory for -/// the OpenGL engine implementation -/// See EngineFactoryOpenGLImpl::CreateDeviceAndSwapChainGL(). +/// +/// \return - Pointer to the function that returns pointer to the factory for +/// the OpenGL engine implementation +/// See EngineFactoryOpenGLImpl::CreateDeviceAndSwapChainGL(). +/// /// \remarks Depending on the configuration and platform, the function loads different dll: -/// Platform\\Configuration | Debug | Release +/// +/// Platform\\Configuration | Debug | Release /// --------------------------|------------------------------|---------------------------- /// Win32/x86 | GraphicsEngineOpenGL_32d.dll | GraphicsEngineOpenGL_32r.dll /// Win32/x64 | GraphicsEngineOpenGL_64d.dll | GraphicsEngineOpenGL_64r.dll /// /// To load the library on Android, it is necessary to call System.loadLibrary("GraphicsEngineOpenGL") from Java. -void LoadGraphicsEngineOpenGL(GetEngineFactoryOpenGLType& GetFactoryFunc) +GetEngineFactoryOpenGLType LoadGraphicsEngineOpenGL() { // 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; |