From 300018fd42c74cf80d9991d4341723883446c66c Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 12 Jun 2018 16:51:57 -0400 Subject: [PATCH] [corevideo] Update for beta 1 (#4232) --- src/CoreVideo/CVOpenGLESTexture.cs | 2 ++ src/CoreVideo/CVOpenGLESTextureCache.cs | 2 ++ src/corevideo.cs | 4 +++ tests/xtro-sharpie/iOS-CoreVideo.todo | 1 - tests/xtro-sharpie/macOS-CoreVideo.ignore | 42 +++++++++++++---------- tests/xtro-sharpie/macOS-CoreVideo.todo | 1 - tests/xtro-sharpie/tvOS-CoreVideo.todo | 1 - tests/xtro-sharpie/watchOS-CoreVideo.todo | 1 - 8 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/CoreVideo/CVOpenGLESTexture.cs b/src/CoreVideo/CVOpenGLESTexture.cs index 4d75f8ad15..e7c41bfeb3 100644 --- a/src/CoreVideo/CVOpenGLESTexture.cs +++ b/src/CoreVideo/CVOpenGLESTexture.cs @@ -34,6 +34,8 @@ namespace MonoTouch.CoreVideo { #endif // CVOpenGLESTexture.h + [Deprecated (PlatformName.iOS, 12,0, message: "Use 'CVMetalTexture' instead.")] + [Deprecated (PlatformName.TvOS, 12,0, message: "Use 'CVMetalTexture' instead.")] public class CVOpenGLESTexture : INativeObject, IDisposable { internal IntPtr handle; diff --git a/src/CoreVideo/CVOpenGLESTextureCache.cs b/src/CoreVideo/CVOpenGLESTextureCache.cs index 0452f93162..0c00677e94 100644 --- a/src/CoreVideo/CVOpenGLESTextureCache.cs +++ b/src/CoreVideo/CVOpenGLESTextureCache.cs @@ -33,6 +33,8 @@ namespace MonoTouch.CoreVideo { #endif // CVOpenGLESTextureCache.h + [Deprecated (PlatformName.iOS, 12,0, message: "Use 'CVMetalTextureCache' instead.")] + [Deprecated (PlatformName.TvOS, 12,0, message: "Use 'CVMetalTextureCache' instead.")] public class CVOpenGLESTextureCache : INativeObject, IDisposable { internal IntPtr handle; diff --git a/src/corevideo.cs b/src/corevideo.cs index 178b3b9b29..cb543c104d 100644 --- a/src/corevideo.cs +++ b/src/corevideo.cs @@ -294,6 +294,10 @@ namespace CoreVideo { [iOS (11,0), Mac (10,13), TV (11,0)] [Field ("kCVImageBufferTransferFunction_ITU_R_2100_HLG")] ItuR2100Hlg, + + [iOS (12,0)][Mac (10,14)][TV (12,0)][Watch (5,0)] + [Field ("kCVImageBufferTransferFunction_Linear")] + Linear, } [Watch (4,0)] diff --git a/tests/xtro-sharpie/iOS-CoreVideo.todo b/tests/xtro-sharpie/iOS-CoreVideo.todo index cc57f2996d..e69de29bb2 100644 --- a/tests/xtro-sharpie/iOS-CoreVideo.todo +++ b/tests/xtro-sharpie/iOS-CoreVideo.todo @@ -1 +0,0 @@ -!missing-field! kCVImageBufferTransferFunction_Linear not bound diff --git a/tests/xtro-sharpie/macOS-CoreVideo.ignore b/tests/xtro-sharpie/macOS-CoreVideo.ignore index 633335a2a2..30ea36edc4 100644 --- a/tests/xtro-sharpie/macOS-CoreVideo.ignore +++ b/tests/xtro-sharpie/macOS-CoreVideo.ignore @@ -1,31 +1,15 @@ -!missing-field! kCVImageBufferTransferFunction_EBU_3213 not bound -!missing-field! kCVImageBufferTransferFunction_SMPTE_C not bound -!missing-field! kCVMetalTextureCacheMaximumTextureAgeKey not bound +## deprecated in favor of metal !missing-field! kCVOpenGLBufferHeight not bound !missing-field! kCVOpenGLBufferInternalFormat not bound !missing-field! kCVOpenGLBufferMaximumMipmapLevel not bound -!missing-field! kCVOpenGLBufferPoolMaximumBufferAgeKey not bound -!missing-field! kCVOpenGLBufferPoolMinimumBufferCountKey not bound !missing-field! kCVOpenGLBufferTarget not bound !missing-field! kCVOpenGLBufferWidth not bound +!missing-field! kCVOpenGLBufferPoolMaximumBufferAgeKey not bound +!missing-field! kCVOpenGLBufferPoolMinimumBufferCountKey not bound !missing-field! kCVOpenGLTextureCacheChromaSamplingModeAutomatic not bound !missing-field! kCVOpenGLTextureCacheChromaSamplingModeBestPerformance not bound !missing-field! kCVOpenGLTextureCacheChromaSamplingModeHighestQuality not bound !missing-field! kCVOpenGLTextureCacheChromaSamplingModeKey not bound -!missing-field! kCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey not bound -!missing-field! kCVPixelBufferIOSurfaceOpenGLTextureCompatibilityKey not bound -!missing-pinvoke! CVDisplayLinkCreateWithCGDisplay is not bound -!missing-pinvoke! CVDisplayLinkCreateWithCGDisplays is not bound -!missing-pinvoke! CVDisplayLinkCreateWithOpenGLDisplayMask is not bound -!missing-pinvoke! CVDisplayLinkGetTypeID is not bound -!missing-pinvoke! CVDisplayLinkSetOutputHandler is not bound -!missing-pinvoke! CVDisplayLinkTranslateTime is not bound -!missing-pinvoke! CVMetalTextureCacheCreate is not bound -!missing-pinvoke! CVMetalTextureCacheCreateTextureFromImage is not bound -!missing-pinvoke! CVMetalTextureCacheFlush is not bound -!missing-pinvoke! CVMetalTextureGetCleanTexCoords is not bound -!missing-pinvoke! CVMetalTextureGetTexture is not bound -!missing-pinvoke! CVMetalTextureIsFlipped is not bound !missing-pinvoke! CVOpenGLBufferAttach is not bound !missing-pinvoke! CVOpenGLBufferCreate is not bound !missing-pinvoke! CVOpenGLBufferGetAttributes is not bound @@ -52,3 +36,23 @@ !missing-pinvoke! CVOpenGLTextureIsFlipped is not bound !missing-pinvoke! CVOpenGLTextureRelease is not bound !missing-pinvoke! CVOpenGLTextureRetain is not bound + +## unsorted + +!missing-field! kCVImageBufferTransferFunction_EBU_3213 not bound +!missing-field! kCVImageBufferTransferFunction_SMPTE_C not bound +!missing-field! kCVMetalTextureCacheMaximumTextureAgeKey not bound +!missing-field! kCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey not bound +!missing-field! kCVPixelBufferIOSurfaceOpenGLTextureCompatibilityKey not bound +!missing-pinvoke! CVDisplayLinkCreateWithCGDisplay is not bound +!missing-pinvoke! CVDisplayLinkCreateWithCGDisplays is not bound +!missing-pinvoke! CVDisplayLinkCreateWithOpenGLDisplayMask is not bound +!missing-pinvoke! CVDisplayLinkGetTypeID is not bound +!missing-pinvoke! CVDisplayLinkSetOutputHandler is not bound +!missing-pinvoke! CVDisplayLinkTranslateTime is not bound +!missing-pinvoke! CVMetalTextureCacheCreate is not bound +!missing-pinvoke! CVMetalTextureCacheCreateTextureFromImage is not bound +!missing-pinvoke! CVMetalTextureCacheFlush is not bound +!missing-pinvoke! CVMetalTextureGetCleanTexCoords is not bound +!missing-pinvoke! CVMetalTextureGetTexture is not bound +!missing-pinvoke! CVMetalTextureIsFlipped is not bound diff --git a/tests/xtro-sharpie/macOS-CoreVideo.todo b/tests/xtro-sharpie/macOS-CoreVideo.todo index cc57f2996d..e69de29bb2 100644 --- a/tests/xtro-sharpie/macOS-CoreVideo.todo +++ b/tests/xtro-sharpie/macOS-CoreVideo.todo @@ -1 +0,0 @@ -!missing-field! kCVImageBufferTransferFunction_Linear not bound diff --git a/tests/xtro-sharpie/tvOS-CoreVideo.todo b/tests/xtro-sharpie/tvOS-CoreVideo.todo index cc57f2996d..e69de29bb2 100644 --- a/tests/xtro-sharpie/tvOS-CoreVideo.todo +++ b/tests/xtro-sharpie/tvOS-CoreVideo.todo @@ -1 +0,0 @@ -!missing-field! kCVImageBufferTransferFunction_Linear not bound diff --git a/tests/xtro-sharpie/watchOS-CoreVideo.todo b/tests/xtro-sharpie/watchOS-CoreVideo.todo index cc57f2996d..e69de29bb2 100644 --- a/tests/xtro-sharpie/watchOS-CoreVideo.todo +++ b/tests/xtro-sharpie/watchOS-CoreVideo.todo @@ -1 +0,0 @@ -!missing-field! kCVImageBufferTransferFunction_Linear not bound