From philip.race at oracle.com Wed Jun 9 12:46:59 2010 From: philip.race at oracle.com (Phil Race) Date: Wed, 09 Jun 2010 12:46:59 -0700 Subject: Xrender is now integrated into JDK 7 master Message-ID: <4C0FEFB3.2080600@oracle.com> Thank you Clemens. Enable it with -Dsun.java2d.xrender=True (verbose mode) or -Dsun.java2d.xrender=true (silent mode) -phil. Changeset: 5294c7067018 Author: ceisserer Date: 2010-05-28 11:37 -0700 URL: http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/5294c7067018 6307603: [X11] Use RENDER extension for complex operations done in software Reviewed-by: bae, igor, prr ! make/common/Defs-solaris.gmk ! make/sun/awt/mapfile-mawt-vers ! make/sun/awt/mapfile-vers-linux ! make/sun/headless/mapfile-vers ! make/sun/jawt/Makefile ! make/sun/xawt/FILES_c_unix.gmk ! make/sun/xawt/Makefile ! make/sun/xawt/mapfile-vers + src/share/classes/sun/font/GlyphDisposedListener.java ! src/share/classes/sun/font/StrikeCache.java ! src/share/classes/sun/java2d/pipe/BufferedPaints.java ! src/share/classes/sun/java2d/pipe/RenderBuffer.java ! src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine ! src/share/native/sun/font/AccelGlyphCache.c ! src/share/native/sun/font/fontscalerdefs.h ! src/share/native/sun/font/freetypeScaler.c ! src/share/native/sun/font/sunFont.c ! src/share/native/sun/java2d/opengl/OGLTextRenderer.c ! src/solaris/classes/sun/awt/X11GraphicsDevice.java ! src/solaris/classes/sun/awt/X11GraphicsEnvironment.java + src/solaris/classes/sun/font/XRGlyphCache.java + src/solaris/classes/sun/font/XRGlyphCacheEntry.java + src/solaris/classes/sun/font/XRTextRenderer.java ! src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java + src/solaris/classes/sun/java2d/jules/IdleTileCache.java + src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java + src/solaris/classes/sun/java2d/jules/JulesPathBuf.java + src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java + src/solaris/classes/sun/java2d/jules/JulesShapePipe.java + src/solaris/classes/sun/java2d/jules/JulesTile.java + src/solaris/classes/sun/java2d/jules/TileWorker.java + src/solaris/classes/sun/java2d/jules/TrapezoidList.java ! src/solaris/classes/sun/java2d/x11/X11SurfaceData.java + src/solaris/classes/sun/java2d/x11/XSurfaceData.java + src/solaris/classes/sun/java2d/xr/DirtyRegion.java + src/solaris/classes/sun/java2d/xr/GrowableByteArray.java + src/solaris/classes/sun/java2d/xr/GrowableEltArray.java + src/solaris/classes/sun/java2d/xr/GrowableIntArray.java + src/solaris/classes/sun/java2d/xr/GrowablePointArray.java + src/solaris/classes/sun/java2d/xr/GrowableRectArray.java + src/solaris/classes/sun/java2d/xr/MaskTile.java + src/solaris/classes/sun/java2d/xr/MaskTileManager.java + src/solaris/classes/sun/java2d/xr/MutableInteger.java + src/solaris/classes/sun/java2d/xr/XIDGenerator.java + src/solaris/classes/sun/java2d/xr/XRBackend.java + src/solaris/classes/sun/java2d/xr/XRBackendNative.java + src/solaris/classes/sun/java2d/xr/XRColor.java + src/solaris/classes/sun/java2d/xr/XRCompositeManager.java + src/solaris/classes/sun/java2d/xr/XRDrawImage.java + src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java + src/solaris/classes/sun/java2d/xr/XRMaskBlit.java + src/solaris/classes/sun/java2d/xr/XRMaskFill.java + src/solaris/classes/sun/java2d/xr/XRMaskImage.java + src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java + src/solaris/classes/sun/java2d/xr/XRPaints.java + src/solaris/classes/sun/java2d/xr/XRRenderer.java + src/solaris/classes/sun/java2d/xr/XRSurfaceData.java + src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java + src/solaris/classes/sun/java2d/xr/XRUtils.java + src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java + src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java ! src/solaris/native/sun/java2d/x11/X11SurfaceData.c ! src/solaris/native/sun/java2d/x11/X11SurfaceData.h + src/solaris/native/sun/java2d/x11/XRBackendNative.c + src/solaris/native/sun/java2d/x11/XRSurfaceData.c From ahughes at redhat.com Wed Jun 9 13:56:07 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 9 Jun 2010 21:56:07 +0100 Subject: Xrender is now integrated into JDK 7 master In-Reply-To: <4C0FEFB3.2080600@oracle.com> References: <4C0FEFB3.2080600@oracle.com> Message-ID: On 9 June 2010 20:46, Phil Race wrote: > Thank you Clemens. > > Enable it with > -Dsun.java2d.xrender=True (verbose mode) > or > -Dsun.java2d.xrender=true (silent mode) > > -phil. > > Changeset: 5294c7067018 > Author: ? ?ceisserer > Date: ? ? ?2010-05-28 11:37 -0700 > URL: ? ? ? http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/5294c7067018 > > 6307603: [X11] Use RENDER extension for complex operations done in software > Reviewed-by: bae, igor, prr > > ! make/common/Defs-solaris.gmk > ! make/sun/awt/mapfile-mawt-vers > ! make/sun/awt/mapfile-vers-linux > ! make/sun/headless/mapfile-vers > ! make/sun/jawt/Makefile > ! make/sun/xawt/FILES_c_unix.gmk > ! make/sun/xawt/Makefile > ! make/sun/xawt/mapfile-vers > + src/share/classes/sun/font/GlyphDisposedListener.java > ! src/share/classes/sun/font/StrikeCache.java > ! src/share/classes/sun/java2d/pipe/BufferedPaints.java > ! src/share/classes/sun/java2d/pipe/RenderBuffer.java > ! > src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine > ! src/share/native/sun/font/AccelGlyphCache.c > ! src/share/native/sun/font/fontscalerdefs.h > ! src/share/native/sun/font/freetypeScaler.c > ! src/share/native/sun/font/sunFont.c > ! src/share/native/sun/java2d/opengl/OGLTextRenderer.c > ! src/solaris/classes/sun/awt/X11GraphicsDevice.java > ! src/solaris/classes/sun/awt/X11GraphicsEnvironment.java > + src/solaris/classes/sun/font/XRGlyphCache.java > + src/solaris/classes/sun/font/XRGlyphCacheEntry.java > + src/solaris/classes/sun/font/XRTextRenderer.java > ! src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java > + src/solaris/classes/sun/java2d/jules/IdleTileCache.java > + src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java > + src/solaris/classes/sun/java2d/jules/JulesPathBuf.java > + src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java > + src/solaris/classes/sun/java2d/jules/JulesShapePipe.java > + src/solaris/classes/sun/java2d/jules/JulesTile.java > + src/solaris/classes/sun/java2d/jules/TileWorker.java > + src/solaris/classes/sun/java2d/jules/TrapezoidList.java > ! src/solaris/classes/sun/java2d/x11/X11SurfaceData.java > + src/solaris/classes/sun/java2d/x11/XSurfaceData.java > + src/solaris/classes/sun/java2d/xr/DirtyRegion.java > + src/solaris/classes/sun/java2d/xr/GrowableByteArray.java > + src/solaris/classes/sun/java2d/xr/GrowableEltArray.java > + src/solaris/classes/sun/java2d/xr/GrowableIntArray.java > + src/solaris/classes/sun/java2d/xr/GrowablePointArray.java > + src/solaris/classes/sun/java2d/xr/GrowableRectArray.java > + src/solaris/classes/sun/java2d/xr/MaskTile.java > + src/solaris/classes/sun/java2d/xr/MaskTileManager.java > + src/solaris/classes/sun/java2d/xr/MutableInteger.java > + src/solaris/classes/sun/java2d/xr/XIDGenerator.java > + src/solaris/classes/sun/java2d/xr/XRBackend.java > + src/solaris/classes/sun/java2d/xr/XRBackendNative.java > + src/solaris/classes/sun/java2d/xr/XRColor.java > + src/solaris/classes/sun/java2d/xr/XRCompositeManager.java > + src/solaris/classes/sun/java2d/xr/XRDrawImage.java > + src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java > + src/solaris/classes/sun/java2d/xr/XRMaskBlit.java > + src/solaris/classes/sun/java2d/xr/XRMaskFill.java > + src/solaris/classes/sun/java2d/xr/XRMaskImage.java > + src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java > + src/solaris/classes/sun/java2d/xr/XRPaints.java > + src/solaris/classes/sun/java2d/xr/XRRenderer.java > + src/solaris/classes/sun/java2d/xr/XRSurfaceData.java > + src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java > + src/solaris/classes/sun/java2d/xr/XRUtils.java > + src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java > + src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java > ! src/solaris/native/sun/java2d/x11/X11SurfaceData.c > ! src/solaris/native/sun/java2d/x11/X11SurfaceData.h > + src/solaris/native/sun/java2d/x11/XRBackendNative.c > + src/solaris/native/sun/java2d/x11/XRSurfaceData.c > > > Good news! Did I miss the public review of this? What list was it on? Which version went in - the old or the refactored one? Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From philip.race at oracle.com Wed Jun 9 14:17:33 2010 From: philip.race at oracle.com (Phil Race) Date: Wed, 09 Jun 2010 14:17:33 -0700 Subject: Xrender is now integrated into JDK 7 master In-Reply-To: References: <4C0FEFB3.2080600@oracle.com> Message-ID: <4C1004ED.9010502@oracle.com> It was reviewed more than once over some months on the 2D list and only some final emails to get it in went off list. The only notable changes that happened to it there were that I found some tweaks were necessary so it could build at all on Solaris 10 and I found a minor fix to make LCD text work with the closed rasteriser. -phil. On 6/9/2010 1:56 PM, Andrew John Hughes wrote: > On 9 June 2010 20:46, Phil Race wrote: > >> Thank you Clemens. >> >> Enable it with >> -Dsun.java2d.xrender=True (verbose mode) >> or >> -Dsun.java2d.xrender=true (silent mode) >> >> -phil. >> >> Changeset: 5294c7067018 >> Author: ceisserer >> Date: 2010-05-28 11:37 -0700 >> URL: http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/5294c7067018 >> >> 6307603: [X11] Use RENDER extension for complex operations done in software >> Reviewed-by: bae, igor, prr >> >> ! make/common/Defs-solaris.gmk >> ! make/sun/awt/mapfile-mawt-vers >> ! make/sun/awt/mapfile-vers-linux >> ! make/sun/headless/mapfile-vers >> ! make/sun/jawt/Makefile >> ! make/sun/xawt/FILES_c_unix.gmk >> ! make/sun/xawt/Makefile >> ! make/sun/xawt/mapfile-vers >> + src/share/classes/sun/font/GlyphDisposedListener.java >> ! src/share/classes/sun/font/StrikeCache.java >> ! src/share/classes/sun/java2d/pipe/BufferedPaints.java >> ! src/share/classes/sun/java2d/pipe/RenderBuffer.java >> ! >> src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine >> ! src/share/native/sun/font/AccelGlyphCache.c >> ! src/share/native/sun/font/fontscalerdefs.h >> ! src/share/native/sun/font/freetypeScaler.c >> ! src/share/native/sun/font/sunFont.c >> ! src/share/native/sun/java2d/opengl/OGLTextRenderer.c >> ! src/solaris/classes/sun/awt/X11GraphicsDevice.java >> ! src/solaris/classes/sun/awt/X11GraphicsEnvironment.java >> + src/solaris/classes/sun/font/XRGlyphCache.java >> + src/solaris/classes/sun/font/XRGlyphCacheEntry.java >> + src/solaris/classes/sun/font/XRTextRenderer.java >> ! src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java >> + src/solaris/classes/sun/java2d/jules/IdleTileCache.java >> + src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java >> + src/solaris/classes/sun/java2d/jules/JulesPathBuf.java >> + src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java >> + src/solaris/classes/sun/java2d/jules/JulesShapePipe.java >> + src/solaris/classes/sun/java2d/jules/JulesTile.java >> + src/solaris/classes/sun/java2d/jules/TileWorker.java >> + src/solaris/classes/sun/java2d/jules/TrapezoidList.java >> ! src/solaris/classes/sun/java2d/x11/X11SurfaceData.java >> + src/solaris/classes/sun/java2d/x11/XSurfaceData.java >> + src/solaris/classes/sun/java2d/xr/DirtyRegion.java >> + src/solaris/classes/sun/java2d/xr/GrowableByteArray.java >> + src/solaris/classes/sun/java2d/xr/GrowableEltArray.java >> + src/solaris/classes/sun/java2d/xr/GrowableIntArray.java >> + src/solaris/classes/sun/java2d/xr/GrowablePointArray.java >> + src/solaris/classes/sun/java2d/xr/GrowableRectArray.java >> + src/solaris/classes/sun/java2d/xr/MaskTile.java >> + src/solaris/classes/sun/java2d/xr/MaskTileManager.java >> + src/solaris/classes/sun/java2d/xr/MutableInteger.java >> + src/solaris/classes/sun/java2d/xr/XIDGenerator.java >> + src/solaris/classes/sun/java2d/xr/XRBackend.java >> + src/solaris/classes/sun/java2d/xr/XRBackendNative.java >> + src/solaris/classes/sun/java2d/xr/XRColor.java >> + src/solaris/classes/sun/java2d/xr/XRCompositeManager.java >> + src/solaris/classes/sun/java2d/xr/XRDrawImage.java >> + src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java >> + src/solaris/classes/sun/java2d/xr/XRMaskBlit.java >> + src/solaris/classes/sun/java2d/xr/XRMaskFill.java >> + src/solaris/classes/sun/java2d/xr/XRMaskImage.java >> + src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java >> + src/solaris/classes/sun/java2d/xr/XRPaints.java >> + src/solaris/classes/sun/java2d/xr/XRRenderer.java >> + src/solaris/classes/sun/java2d/xr/XRSurfaceData.java >> + src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java >> + src/solaris/classes/sun/java2d/xr/XRUtils.java >> + src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java >> + src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java >> ! src/solaris/native/sun/java2d/x11/X11SurfaceData.c >> ! src/solaris/native/sun/java2d/x11/X11SurfaceData.h >> + src/solaris/native/sun/java2d/x11/XRBackendNative.c >> + src/solaris/native/sun/java2d/x11/XRSurfaceData.c >> >> >> >> > Good news! Did I miss the public review of this? What list was it on? > > Which version went in - the old or the refactored one? > > Thanks, > From linuxhippy at gmail.com Fri Jun 11 01:00:10 2010 From: linuxhippy at gmail.com (Clemens Eisserer) Date: Fri, 11 Jun 2010 10:00:10 +0200 Subject: Xrender is now integrated into JDK 7 master In-Reply-To: References: <4C0FEFB3.2080600@oracle.com> Message-ID: Hi Andrew, > Good news! ?Did I miss the public review of this? What list was it on? It happend on the 2D list. However there wasn't a lot traffic, as was very busy and Phil solved most if not all of the problems found himself. Thanks again :) > Which version went in - the old or the refactored one? Its the refactored one, including the java-glue for the cairo based "jules" rasterizer. - Clemens From philip.race at oracle.com Thu Jun 17 13:11:58 2010 From: philip.race at oracle.com (Phil Race) Date: Thu, 17 Jun 2010 13:11:58 -0700 Subject: Please review fix Message-ID: <4C1A818E.7060009@oracle.com> Clemens and Andrew, http://cr.openjdk.java.net/~prr/6961633/ has the fix for being unable to load the JulesRenderingEngine as service in openjdk on windows. The fix is simply to revert the shared file and make a new solaris/linux file which references Jules. Without this fix openjdk is dead on Windows. -phil. From linuxhippy at gmail.com Thu Jun 17 13:47:34 2010 From: linuxhippy at gmail.com (Clemens Eisserer) Date: Thu, 17 Jun 2010 22:47:34 +0200 Subject: Please review fix In-Reply-To: <4C1A818E.7060009@oracle.com> References: <4C1A818E.7060009@oracle.com> Message-ID: Looks fine to me. Thanks and sorry for the mess. - Clemens 2010/6/17 Phil Race : > Clemens and Andrew, > > http://cr.openjdk.java.net/~prr/6961633/ > > has the fix for being unable to load the JulesRenderingEngine > as service in openjdk on windows. > The fix is simply to revert the shared file and make a new > solaris/linux file which references Jules. > > Without this fix openjdk is dead on Windows. > > -phil. > From Andrew.Brygin at Sun.COM Fri Jun 18 00:58:41 2010 From: Andrew.Brygin at Sun.COM (Andrew Brygin) Date: Fri, 18 Jun 2010 11:58:41 +0400 Subject: Please review fix - approved In-Reply-To: <4C1A818E.7060009@oracle.com> References: <4C1A818E.7060009@oracle.com> Message-ID: <4C1B2731.5070004@sun.com> Hi Phil, fix looks fine to me. BTW, it looks like that 'New' representation for src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine misses the last line, that looks a bit misleading. Corresponding raw file and patch look fine though. Thanks, Andrew Phil Race wrote: > Clemens and Andrew, > > http://cr.openjdk.java.net/~prr/6961633/ > > has the fix for being unable to load the JulesRenderingEngine > as service in openjdk on windows. > The fix is simply to revert the shared file and make a new > solaris/linux file which references Jules. > > Without this fix openjdk is dead on Windows. > > -phil. From philip.race at oracle.com Fri Jun 18 10:38:05 2010 From: philip.race at oracle.com (Phil Race) Date: Fri, 18 Jun 2010 10:38:05 -0700 Subject: Please review fix - approved In-Reply-To: <4C1B2731.5070004@sun.com> References: <4C1A818E.7060009@oracle.com> <4C1B2731.5070004@sun.com> Message-ID: <4C1BAEFD.2080203@oracle.com> I see what you mean. I'm not sure how the raw file was created or last edited but that is actually the original shared file, and its like that in the "raw_files" from Clemen's last webrev generated on 20th April. So the new solaris one is really a just "cp'd" to the solaris location and I then edited the shared one which does have a final newline. So it does work, I guess a missing final newline messes up at least my version of webrev .. which is the shared one on the internal devtools server. But I'll give it a trailing new line anyway. -phil. On 6/18/2010 12:58 AM, Andrew Brygin wrote: > Hi Phil, > > fix looks fine to me. > > BTW, it looks like that 'New' representation for > src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine > > misses the last line, that looks a bit misleading. Corresponding raw > file and patch look fine though. > > Thanks, > Andrew > > Phil Race wrote: >> Clemens and Andrew, >> >> http://cr.openjdk.java.net/~prr/6961633/ >> >> has the fix for being unable to load the JulesRenderingEngine >> as service in openjdk on windows. >> The fix is simply to revert the shared file and make a new >> solaris/linux file which references Jules. >> >> Without this fix openjdk is dead on Windows. >> >> -phil. >