jdk-sandbox: comparison src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java

equal deleted inserted replaced

-:978ffc56771f
+:e153174dba06
 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.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;
 import static sun.java2d.opengl.OGLSurfaceData.TEXTURE;
 public final class CGLGraphicsConfig extends CGraphicsConfig
 implements OGLGraphicsConfig
 {
 //private static final int kOpenGLSwapInterval =
 // RuntimeOptions.getCurrentOptions().OpenGLSwapInterval;
 private static final int kOpenGLSwapInterval = 0; // TODO
 private static boolean cglAvailable;
 context = new OGLContext(OGLRenderQueue.getInstance(), this);
 // add a record to the Disposer so that we destroy the native
 // CGLGraphicsConfigInfo data when this object goes away
 Disposer.addRecord(disposerReferent,
 new CGLGCDisposerRecord(pConfigInfo));
 }
 @Override
 public Object getProxyKey() {
 return this;
 }
 @Override
 public SurfaceData createManagedSurface(int w, int h, int transparency) {
 return CGLSurfaceData.createData(this, w, h,
 getColorModel(transparency),
 null,
 OGLSurfaceData.TEXTURE);
 }
 public static CGLGraphicsConfig getConfig(CGraphicsDevice device,
 int displayID, int pixfmt)
 {
 @Override
 public BufferedImage createCompatibleImage(int width, int height) {
 ColorModel model = new DirectColorModel(24, 0xff0000, 0xff00, 0xff);
 WritableRaster
 raster = model.createCompatibleWritableRaster(width, height);
 return new BufferedImage(model, raster, model.isAlphaPremultiplied(),
 null);
 }
 @Override
 public ColorModel getColorModel(int transparency) {
 switch (transparency) {
 case Transparency.OPAQUE:
 // REMIND: once the ColorModel spec is changed, this should be
 //         an opaque premultiplied DCM...
 return new DirectColorModel(24, 0xff0000, 0xff00, 0xff);
 case Transparency.BITMASK:
 return new DirectColorModel(25, 0xff0000, 0xff00, 0xff, 0x1000000);
 case Transparency.TRANSLUCENT:
 ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
 return new DirectColorModel(cs, 32,
 0xff0000, 0xff00, 0xff, 0xff000000,
 true, DataBuffer.TYPE_INT);
 default:
 return null;
 }
 }
 public boolean isDoubleBuffered() {
 return isCapPresent(CAPS_DOUBLEBUFFERED);
 public SurfaceData createSurfaceData(CPlatformView pView) {
 return CGLSurfaceData.createData(pView);
 }
 @Override
-public SurfaceData createSurfaceData(CGLLayer layer) {
+public SurfaceData createSurfaceData(CFRetainedResource layer) {
-return CGLSurfaceData.createData(layer);
+return CGLSurfaceData.createData((CGLLayer) layer);
-}
-@Override
-public SurfaceData createSurfaceData(MetalLayer layer) {
-return null;
 }
 @Override
 public Image createAcceleratedImage(Component target,
 int width, int height)
 {
 ColorModel model = getColorModel(Transparency.OPAQUE);
 WritableRaster wr = model.createCompatibleWritableRaster(width, height);
 return new OffScreenImage(target, model, wr,
 model.isAlphaPremultiplied());
 }
 @Override
 public void assertOperationSupported(final int numBuffers,
 final BufferCapabilities caps)
 // It is possible for the component to have size 0x0, adjust it to
 // be at least 1x1 to avoid IAE
 final int w = Math.max(1, r.width);
 final int h = Math.max(1, r.height);
 final int transparency = peer.isTranslucent() ? Transparency.TRANSLUCENT
 : Transparency.OPAQUE;
 return new SunVolatileImage(this, w, h, transparency, null);
 }
 @Override
 public void destroyBackBuffer(final Image backBuffer) {
 if (flipAction == BufferCapabilities.FlipContents.BACKGROUND) {
 final Graphics2D bg = (Graphics2D) backBuffer.getGraphics();
 try {
 bg.setBackground(peer.getBackground());
 bg.clearRect(0, 0, backBuffer.getWidth(null),
 backBuffer.getHeight(null));
 } finally {
 bg.dispose();
 }
 }
 }
 private static class CGLBufferCaps extends BufferCapabilities {
 public CGLBufferCaps(boolean dblBuf) {
 super(imageCaps, imageCaps,
 dblBuf ? FlipContents.UNDEFINED : null);
 }
 }
 @Override
 public BufferCapabilities getBufferCapabilities() {
 || transparency == Transparency.BITMASK
 || type == FBOBJECT && !isCapPresent(CAPS_EXT_FBOBJECT)) {
 return null;
 }
 SunVolatileImage vi = new AccelTypedVolatileImage(this, width, height,
 transparency, type);
 Surface sd = vi.getDestSurface();
 if (!(sd instanceof AccelSurface) ||
 ((AccelSurface)sd).getType() != type)
 {
 vi.flush();
 vi = null;
 }
 }
 @Override
 public int getMaxTextureWidth() {
 return Math.max(maxTextureSize / getDevice().getScaleFactor(),
 getBounds().width);
 }
 @Override
 public int getMaxTextureHeight() {
 return Math.max(maxTextureSize / getDevice().getScaleFactor(),
 getBounds().height);
 }
 }

branch	metal-prototype-branch
changeset 57416	e153174dba06
parent 57196	a95707a39ff5