src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.m

rev 54094 : 8257853: Remove dependencies on JNF's JNI utility functions in AWT and 2D code
rev 54096 : 8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros
rev 54097 : 8259869: [macOS] Remove desktop module dependencies on JNF Reference APIs

*** 26,35 ****
--- 26,36 ----
  #import "CGLGraphicsConfig.h"
  #import "CGLLayer.h"
  #import "ThreadUtilities.h"
  #import "LWCToolkit.h"
  #import "CGLSurfaceData.h"
+ #import "JNIUtilities.h"
  
  
  extern NSOpenGLPixelFormat *sharedPixelFormat;
  extern NSOpenGLContext *sharedContext;
  
*** 44,54 ****
  @synthesize parentLayer;
  @synthesize remoteLayer;
  @synthesize jrsRemoteLayer;
  #endif
  
! - (id) initWithJavaLayer:(JNFWeakJObjectWrapper *)layer;
  {
  AWT_ASSERT_APPKIT_THREAD;
      // Initialize ourselves
      self = [super init];
      if (self == nil) return self;
--- 45,55 ----
  @synthesize parentLayer;
  @synthesize remoteLayer;
  @synthesize jrsRemoteLayer;
  #endif
  
! - (id) initWithJavaLayer:(jobject)layer;
  {
  AWT_ASSERT_APPKIT_THREAD;
      // Initialize ourselves
      self = [super init];
      if (self == nil) return self;
*** 81,90 ****
--- 82,93 ----
  
      return self;
  }
  
  - (void) dealloc {
+     JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
+     (*env)->DeleteWeakGlobalRef(env, self.javaLayer);
      self.javaLayer = nil;
      [super dealloc];
  }
  
  - (CGLPixelFormatObj)copyCGLPixelFormatForDisplayMask:(uint32_t)mask {
*** 132,145 ****
  -(void)drawInCGLContext:(CGLContextObj)glContext pixelFormat:(CGLPixelFormatObj)pixelFormat forLayerTime:(CFTimeInterval)timeInterval displayTime:(const CVTimeStamp *)timeStamp
  {
      AWT_ASSERT_APPKIT_THREAD;
  
      JNIEnv *env = [ThreadUtilities getJNIEnv];
!     static JNF_CLASS_CACHE(jc_JavaLayer, "sun/java2d/opengl/CGLLayer");
!     static JNF_MEMBER_CACHE(jm_drawInCGLContext, jc_JavaLayer, "drawInCGLContext", "()V");
  
!     jobject javaLayerLocalRef = [self.javaLayer jObjectWithEnv:env];
      if ((*env)->IsSameObject(env, javaLayerLocalRef, NULL)) {
          return;
      }
  
      // Set the current context to the one given to us.
--- 135,148 ----
  -(void)drawInCGLContext:(CGLContextObj)glContext pixelFormat:(CGLPixelFormatObj)pixelFormat forLayerTime:(CFTimeInterval)timeInterval displayTime:(const CVTimeStamp *)timeStamp
  {
      AWT_ASSERT_APPKIT_THREAD;
  
      JNIEnv *env = [ThreadUtilities getJNIEnv];
!     DECLARE_CLASS(jc_JavaLayer, "sun/java2d/opengl/CGLLayer");
!     DECLARE_METHOD(jm_drawInCGLContext, jc_JavaLayer, "drawInCGLContext", "()V");
  
!     jobject javaLayerLocalRef = (*env)->NewLocalRef(env, self.javaLayer);
      if ((*env)->IsSameObject(env, javaLayerLocalRef, NULL)) {
          return;
      }
  
      // Set the current context to the one given to us.
*** 149,159 ****
      glClearColor(0.0, 0.0, 0.0, 0.0);
      glClear(GL_COLOR_BUFFER_BIT);
  
      glViewport(0, 0, textureWidth, textureHeight);
  
!     JNFCallVoidMethod(env, javaLayerLocalRef, jm_drawInCGLContext);
      (*env)->DeleteLocalRef(env, javaLayerLocalRef);
  
      // Call super to finalize the drawing. By default all it does is call glFlush().
      [super drawInCGLContext:glContext pixelFormat:pixelFormat forLayerTime:timeInterval displayTime:timeStamp];
  
--- 152,163 ----
      glClearColor(0.0, 0.0, 0.0, 0.0);
      glClear(GL_COLOR_BUFFER_BIT);
  
      glViewport(0, 0, textureWidth, textureHeight);
  
!     (*env)->CallVoidMethod(env, javaLayerLocalRef, jm_drawInCGLContext);
!     CHECK_EXCEPTION();
      (*env)->DeleteLocalRef(env, javaLayerLocalRef);
  
      // Call super to finalize the drawing. By default all it does is call glFlush().
      [super drawInCGLContext:glContext pixelFormat:pixelFormat forLayerTime:timeInterval displayTime:timeStamp];
  
*** 171,191 ****
  Java_sun_java2d_opengl_CGLLayer_nativeCreateLayer
  (JNIEnv *env, jobject obj)
  {
      __block CGLLayer *layer = nil;
  
! JNF_COCOA_ENTER(env);
  
!     JNFWeakJObjectWrapper *javaLayer = [JNFWeakJObjectWrapper wrapperWithJObject:obj withEnv:env];
  
      [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
              AWT_ASSERT_APPKIT_THREAD;
          
              layer = [[CGLLayer alloc] initWithJavaLayer: javaLayer];
      }];
      
! JNF_COCOA_EXIT(env);
  
      return ptr_to_jlong(layer);
  }
  
  // Must be called under the RQ lock.
--- 175,195 ----
  Java_sun_java2d_opengl_CGLLayer_nativeCreateLayer
  (JNIEnv *env, jobject obj)
  {
      __block CGLLayer *layer = nil;
  
! JNI_COCOA_ENTER(env);
  
!     jobject javaLayer = (*env)->NewWeakGlobalRef(env, obj);
  
      [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
              AWT_ASSERT_APPKIT_THREAD;
          
              layer = [[CGLLayer alloc] initWithJavaLayer: javaLayer];
      }];
      
! JNI_COCOA_EXIT(env);
  
      return ptr_to_jlong(layer);
  }
  
  // Must be called under the RQ lock.
*** 218,233 ****
  
  JNIEXPORT void JNICALL
  Java_sun_java2d_opengl_CGLLayer_nativeSetScale
  (JNIEnv *env, jclass cls, jlong layerPtr, jdouble scale)
  {
!     JNF_COCOA_ENTER(env);
      CGLLayer *layer = jlong_to_ptr(layerPtr);
      // We always call all setXX methods asynchronously, exception is only in 
      // this method where we need to change native texture size and layer's scale
      // in one call on appkit, otherwise we'll get window's contents blinking, 
      // during screen-2-screen moving.
      [ThreadUtilities performOnMainThreadWaiting:[NSThread isMainThread] block:^(){
          layer.contentsScale = scale;
      }];
!     JNF_COCOA_EXIT(env);
  }
--- 222,237 ----
  
  JNIEXPORT void JNICALL
  Java_sun_java2d_opengl_CGLLayer_nativeSetScale
  (JNIEnv *env, jclass cls, jlong layerPtr, jdouble scale)
  {
!     JNI_COCOA_ENTER(env);
      CGLLayer *layer = jlong_to_ptr(layerPtr);
      // We always call all setXX methods asynchronously, exception is only in 
      // this method where we need to change native texture size and layer's scale
      // in one call on appkit, otherwise we'll get window's contents blinking, 
      // during screen-2-screen moving.
      [ThreadUtilities performOnMainThreadWaiting:[NSThread isMainThread] block:^(){
          layer.contentsScale = scale;
      }];
!     JNI_COCOA_EXIT(env);
  }