diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-05-12 00:31:16 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-05-12 00:31:16 +0000 |
| commit | 095de7682100db812822a43168b78c15fad28d8a (patch) | |
| tree | 1aa156dd410d3547712a733e0958780944916827 /Graphics/GraphicsEngineOpenGL | |
| parent | Added EngineGLCreateInfo::CreateDebugContext member (API Version 240060) (diff) | |
| download | DiligentCore-095de7682100db812822a43168b78c15fad28d8a.tar.gz DiligentCore-095de7682100db812822a43168b78c15fad28d8a.zip | |
Improved Android file loading
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp index 7566a6ce..88dde5f4 100644 --- a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp @@ -92,7 +92,9 @@ public: IDeviceContext** ppImmediateContext) override final; #if PLATFORM_ANDROID - virtual void InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const override final; + virtual void InitAndroidFileSystem(struct ANativeActivity* NativeActivity, + const char* NativeActivityClassName, + struct AAssetManager* AssetManager) const override final; #endif }; @@ -276,9 +278,11 @@ void EngineFactoryOpenGLImpl::CreateHLSL2GLSLConverter(IHLSL2GLSLConverter** ppC } #if PLATFORM_ANDROID -void EngineFactoryOpenGLImpl::InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const +void EngineFactoryOpenGLImpl::InitAndroidFileSystem(struct ANativeActivity* NativeActivity, + const char* NativeActivityClassName, + struct AAssetManager* AssetManager) const { - AndroidFileSystem::Init(Activity, ActivityClassName); + AndroidFileSystem::Init(NativeActivity, NativeActivityClassName, AssetManager); } #endif |