--- a/ChangeLog	Tue Jul 12 02:01:39 2011 +0100
+++ b/ChangeLog	Tue Jul 12 09:52:46 2011 +0200
@@ -1,3 +1,10 @@
+2011-07-12  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* Makefile.am: added new patch
+	* NEWS: updated with backport
+	* patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch:
+	Backport of 6758179.
+
 2011-05-25  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:

--- a/Makefile.am	Tue Jul 12 02:01:39 2011 +0100
+++ b/Makefile.am	Tue Jul 12 09:52:46 2011 +0200
@@ -361,7 +361,8 @@
 	patches/openjdk/7036220-shark_llvm_29_headers.patch \
 	patches/openjdk/7029152-String_intrinsics_miss_optimization.patch \
 	patches/openjdk/6711682-JCheckBox_in_JTable_does_not_respond_to_click.patch \
-	patches/jtreg-7020373-add-ignore-tag.patch
+	patches/jtreg-7020373-add-ignore-tag.patch \
+	patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \

--- a/NEWS	Tue Jul 12 02:01:39 2011 +0100
+++ b/NEWS	Tue Jul 12 09:52:46 2011 +0200
@@ -52,6 +52,7 @@
   - S6711682: JCheckBox in JTable: checkbox doesn't always respond to the first mouse click
   - S7016856: fix dashing performance regression. Improve other rendering performance.
   - S6934977: MappedByteBuffer.load crashes with SIGBUS.
+  - S6758179: D3D: AlphaComposite is applied incorrectly for uncached opaque BufferedImage
 * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
 * CACAO
   - Threadlist & threadobject improvements.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch	Tue Jul 12 09:52:46 2011 +0200
@@ -0,0 +1,107 @@
+# HG changeset patch
+# User tdv
+# Date 1227057387 28800
+# Node ID 8eb24fc882427ce5907083866b0d3b7a82ed8659
+# Parent  3a9d06af8830c488de1700130c88ee463d06e1a4
+6758179: D3D: AlphaComposite is applied incorrectly for uncached opaque BufferedImage
+Reviewed-by: campbell, flar
+
+diff -r 3a9d06af8830 -r 8eb24fc88242 src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp
+--- openjdk.orig/jdk/src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp	Sat Nov 01 20:42:18 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp	Tue Nov 18 17:16:27 2008 -0800
+@@ -252,11 +252,15 @@
+                                        pSrcInfo, &dstInfo, NULL, NULL);
+             break;
+         case ST_INT_ARGB_PRE:
+-        case ST_INT_RGB:
+             AnyIntIsomorphicCopy(pSrcBase, pDstBase,
+                                  srcWidth, srcHeight,
+                                  pSrcInfo, &dstInfo, NULL, NULL);
+             break;
++        case ST_INT_RGB:
++            IntRgbToIntArgbConvert(pSrcBase, pDstBase,
++                                   srcWidth, srcHeight,
++                                   pSrcInfo, &dstInfo, NULL, NULL);
++            break;
+         case ST_INT_ARGB_BM:
+             // REMIND: we don't have such sw loop
+             // so this path is disabled for now on java level
+diff -r 3a9d06af8830 -r 8eb24fc88242 test/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java	Tue Nov 18 17:16:27 2008 -0800
+@@ -0,0 +1,75 @@
++/*
++ * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ * @test
++ * @bug 6764257
++ * @summary Tests that the alpha in opaque images doesn't affect result of alpha
++ * compositing
++ * @author Dmitri.Trembovetski@sun.com: area=Graphics
++ * @run main/othervm OpaqueImageToSurfaceBlitTest
++ * @run main/othervm -Dsun.java2d.noddraw=true OpaqueImageToSurfaceBlitTest
++ * @run main/othervm -Dsun.java2d.opengl=True OpaqueImageToSurfaceBlitTest
++ */
++
++import java.awt.AlphaComposite;
++import java.awt.Graphics2D;
++import java.awt.GraphicsConfiguration;
++import java.awt.GraphicsDevice;
++import java.awt.GraphicsEnvironment;
++import java.awt.image.BufferedImage;
++import java.awt.image.DataBufferInt;
++import java.awt.image.VolatileImage;
++
++public class OpaqueImageToSurfaceBlitTest {
++
++    public static void main(String[] args) {
++
++        GraphicsEnvironment ge =
++            GraphicsEnvironment.getLocalGraphicsEnvironment();
++        GraphicsDevice gd = ge.getDefaultScreenDevice();
++        GraphicsConfiguration gc = gd.getDefaultConfiguration();
++        VolatileImage vi = gc.createCompatibleVolatileImage(16, 16);
++        vi.validate(gc);
++
++        BufferedImage bi =
++            new BufferedImage(2, 2, BufferedImage.TYPE_INT_RGB);
++        int data[] = ((DataBufferInt)bi.getRaster().getDataBuffer()).getData();
++        data[0] = 0x0000007f;
++        data[1] = 0x0000007f;
++        data[2] = 0xff00007f;
++        data[3] = 0xff00007f;
++        Graphics2D g = vi.createGraphics();
++        g.setComposite(AlphaComposite.SrcOver.derive(0.999f));
++        g.drawImage(bi, 0, 0, null);
++
++        bi = vi.getSnapshot();
++        if (bi.getRGB(0, 0) != bi.getRGB(1, 1)) {
++            throw new RuntimeException("Test FAILED: color at 0x0 ="+
++                Integer.toHexString(bi.getRGB(0, 0))+" differs from 1x1 ="+
++                Integer.toHexString(bi.getRGB(1,1)));
++        }
++
++        System.out.println("Test PASSED.");
++    }
++}