src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java

*** 49,63 ****
  import sun.java2d.Disposer;
  import sun.java2d.DisposerRecord;
  import sun.java2d.Surface;
  import sun.java2d.SurfaceData;
  import sun.java2d.opengl.OGLContext.OGLContextCaps;
- import sun.java2d.metal.MetalLayer;
  import sun.java2d.pipe.hw.AccelSurface;
  import sun.java2d.pipe.hw.AccelTypedVolatileImage;
  import sun.java2d.pipe.hw.ContextCapabilities;
  import sun.lwawt.LWComponentPeer;
  import sun.lwawt.macosx.CPlatformView;
  
  import static sun.java2d.opengl.OGLContext.OGLContextCaps.CAPS_DOUBLEBUFFERED;
  import static sun.java2d.opengl.OGLContext.OGLContextCaps.CAPS_EXT_FBOBJECT;
  import static sun.java2d.opengl.OGLSurfaceData.FBOBJECT;
--- 49,63 ----
  import sun.java2d.Disposer;
  import sun.java2d.DisposerRecord;
  import sun.java2d.Surface;
  import sun.java2d.SurfaceData;
  import sun.java2d.opengl.OGLContext.OGLContextCaps;
  import sun.java2d.pipe.hw.AccelSurface;
  import sun.java2d.pipe.hw.AccelTypedVolatileImage;
  import sun.java2d.pipe.hw.ContextCapabilities;
  import sun.lwawt.LWComponentPeer;
+ import sun.lwawt.macosx.CFRetainedResource;
  import sun.lwawt.macosx.CPlatformView;
  
  import static sun.java2d.opengl.OGLContext.OGLContextCaps.CAPS_DOUBLEBUFFERED;
  import static sun.java2d.opengl.OGLContext.OGLContextCaps.CAPS_EXT_FBOBJECT;
  import static sun.java2d.opengl.OGLSurfaceData.FBOBJECT;
*** 263,279 ****
      public SurfaceData createSurfaceData(CPlatformView pView) {
          return CGLSurfaceData.createData(pView);
      }
  
      @Override
!     public SurfaceData createSurfaceData(CGLLayer layer) {
!         return CGLSurfaceData.createData(layer);
!     }
! 
!     @Override
!     public SurfaceData createSurfaceData(MetalLayer layer) {
!         return null;
      }
  
      @Override
      public Image createAcceleratedImage(Component target,
                                          int width, int height)
--- 263,274 ----
      public SurfaceData createSurfaceData(CPlatformView pView) {
          return CGLSurfaceData.createData(pView);
      }
  
      @Override
!     public SurfaceData createSurfaceData(CFRetainedResource layer) {
!         return CGLSurfaceData.createData((CGLLayer) layer);
      }
  
      @Override
      public Image createAcceleratedImage(Component target,
                                          int width, int height)