diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-11-18 01:53:50 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-11-18 01:53:50 +0000 |
| commit | 392e0a83119c67118bca0f5bf7d77069cf103024 (patch) | |
| tree | cc6e08ef3cda27784354c532bcef889f5e608f61 /Graphics/GraphicsEngineOpenGL | |
| parent | Some fixes for PSO (diff) | |
| parent | Moved GetBufferToTextureCopyInfo to GraphicsAccessories (diff) | |
| download | DiligentCore-392e0a83119c67118bca0f5bf7d77069cf103024.tar.gz DiligentCore-392e0a83119c67118bca0f5bf7d77069cf103024.zip | |
Merge branch 'master' into ray_tracing_2
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/GLContextMacOS.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLContextMacOS.mm b/Graphics/GraphicsEngineOpenGL/src/GLContextMacOS.mm index c3e63f88..d950f302 100644 --- a/Graphics/GraphicsEngineOpenGL/src/GLContextMacOS.mm +++ b/Graphics/GraphicsEngineOpenGL/src/GLContextMacOS.mm @@ -101,6 +101,6 @@ namespace Diligent GLContext::NativeGLContextType GLContext::GetCurrentNativeGLContext() { NSOpenGLContext* CurrentCtx = [NSOpenGLContext currentContext]; - return CurrentCtx; + return (__bridge void*) CurrentCtx; } } |