Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #967 from MaddTheSane/patch-1

Browse source 
Make context_agl.h compatible with ObjC ARC code.
This commit is contained in:
Connor McLaughlin 2020-10-14 00:46:04 +10:00 committed by GitHub
parent 43bafe1a12 5344b44970
commit 49bd23d32c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/gl/context_agl.h
View file

@ -8,6 +8,7 @@
struct NSOpenGLContext; struct NSOpenGLContext;
struct NSOpenGLPixelFormat; struct NSOpenGLPixelFormat;
struct NSView; struct NSView;
#define __bridge
#endif #endif
namespace GL { namespace GL {
@ -31,7 +32,7 @@ public:
std::unique_ptr<Context> CreateSharedContext(const WindowInfo& wi) override; std::unique_ptr<Context> CreateSharedContext(const WindowInfo& wi) override;
private: private:
ALWAYS_INLINE NSView* GetView() const { return static_cast<NSView*>(m_wi.window_handle); } ALWAYS_INLINE NSView* GetView() const { return static_cast<NSView*>((__bridge NSView*)m_wi.window_handle); }
bool Initialize(const Version* versions_to_try, size_t num_versions_to_try); bool Initialize(const Version* versions_to_try, size_t num_versions_to_try);
bool CreateContext(NSOpenGLContext* share_context, int profile, bool make_current); bool CreateContext(NSOpenGLContext* share_context, int profile, bool make_current);
@ -45,4 +46,4 @@ private:
void* m_opengl_module_handle = nullptr; void* m_opengl_module_handle = nullptr;
}; };
} // namespace GL } // namespace GL