Skip to content

Initial OpenGL deprecation #4458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chamons merged 2 commits into from
Jul 20, 2018
Merged

Initial OpenGL deprecation #4458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86bc976
Initial OpenGL deprecation
chamons Jul 16, 2018
3f6bee2
Update deprecation messages
chamons Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/OpenGL/CGLContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
using Foundation;

namespace OpenGL {
[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")]
public class CGLContext : INativeObject, IDisposable {
IntPtr handle;

Expand Down
3 changes: 3 additions & 0 deletions src/OpenGL/CGLEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using ObjCRuntime;

namespace OpenGL {

[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")]
public enum CGLErrorCode : uint
{
NoError = 0, /* no error */
Expand All @@ -48,6 +50,7 @@ public enum CGLErrorCode : uint

}

[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")]
public enum CGLPixelFormatAttribute : uint
{
AllRenderers = 1,
Expand Down
1 change: 1 addition & 0 deletions src/OpenGL/CGLPixelFormat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
using Foundation;

namespace OpenGL {
[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")]
public class CGLPixelFormat : INativeObject, IDisposable {
internal IntPtr handle;

Expand Down
5 changes: 1 addition & 4 deletions src/appkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8466,10 +8466,6 @@ interface NSOpenGLPixelFormat : NSCoding {
[Export ("initWithData:")]
IntPtr Constructor (NSData attribs);

// TODO: wrap the CLContext and take a CLContext here instead.
//[Export ("initWithCGLPixelFormatObj:")]
//IntPtr Constructor (IntPtr cglContextHandle);

[Export ("getValues:forAttribute:forVirtualScreen:")]
void GetValue (ref int /* GLint = int32_t */ vals, NSOpenGLPixelFormatAttribute attrib, int /* GLint = int32_t */ screen);

Expand Down Expand Up @@ -26007,6 +26003,7 @@ interface NSCloudSharingValidation
}
#endif

[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")]
[BaseType (typeof(CAOpenGLLayer))]
interface NSOpenGLLayer
{
Expand Down
1 change: 1 addition & 0 deletions src/coreanimation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,6 +1465,7 @@ interface CAValueFunction : NSSecureCoding {
}

#if MONOMAC
[Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")]
[BaseType (typeof (CALayer))]
interface CAOpenGLLayer {
[Export ("layer"), New, Static]
Expand Down
11 changes: 0 additions & 11 deletions src/coreimage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,6 @@ interface CIColor : NSSecureCoding, NSCopying {
[BaseType (typeof (NSObject))]
[DisableDefaultCtor]
interface CIContext {
// When we bind OpenGL add these:
//[Export ("contextWithCGLContext:pixelFormat:colorSpace:options:")]
//CIContext ContextWithCGLContextpixelFormatcolorSpaceoptions (CGLContextObj ctx, CGLPixelFormatObj pf, CGColorSpaceRef cs, NSDictionary dict, );

#if !MONOMAC || XAMCORE_2_0
[iOS (9,0)][Mac (10,11)]
[Static]
Expand Down Expand Up @@ -361,13 +357,6 @@ interface CIContext {
[Export ("contextForOfflineGPUAtIndex:")]
[Static]
CIContext FromOfflineGpu (int gpuIndex);

// When we bind CGLContext
//+(CIContext *)contextForOfflineGPUAtIndex:(unsigned int)index
// colorSpace:(nullable CGColorSpaceRef)colorSpace
// options:(nullable CI_DICTIONARY(NSString*,id) *)options
// sharedContext:(nullable CGLContextObj)sharedContext NS_AVAILABLE_MAC(10_10);

#endif

[iOS (9,0)][Mac (10,11)]
Expand Down