--- old/src/share/native/sun/java2d/opengl/OGLBlitLoops.c 2014-04-24 00:01:28.810066400 +0400 +++ new/src/share/native/sun/java2d/opengl/OGLBlitLoops.c 2014-04-24 00:01:28.665459000 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. 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 @@ -34,6 +34,9 @@ #include "OGLSurfaceData.h" #include "GraphicsPrimitiveMgr.h" +#include // malloc +#include // memcpy + extern OGLPixelFormat PixelFormats[]; /** @@ -750,6 +753,8 @@ dstOps->GetRasInfo(env, dstOps, &dstInfo); if (dstInfo.rasBase) { void *pDst = dstInfo.rasBase; + void* tempRow; + jint clippedStride; srcx = srcInfo.bounds.x1; srcy = srcInfo.bounds.y1; @@ -758,7 +763,7 @@ width = srcInfo.bounds.x2 - srcInfo.bounds.x1; height = srcInfo.bounds.y2 - srcInfo.bounds.y1; - j2d_glPixelStorei(GL_PACK_SKIP_PIXELS, dstx); + pDst = PtrAddBytes(pDst, dstx * dstInfo.pixelStride); j2d_glPixelStorei(GL_PACK_ROW_LENGTH, dstInfo.scanStride / dstInfo.pixelStride); j2d_glPixelStorei(GL_PACK_ALIGNMENT, pf.alignment); @@ -780,16 +785,37 @@ // this accounts for lower-left origin of the source region srcx = srcOps->xOffset + srcx; srcy = srcOps->yOffset + srcOps->height - (srcy + 1); - - // we must read one scanline at a time because there is no way - // to read starting at the top-left corner of the source region - while (height > 0) { - j2d_glPixelStorei(GL_PACK_SKIP_ROWS, dsty); - j2d_glReadPixels(srcx, srcy, width, 1, + + // Note that glReadPixels() is extremely slow! + // So we try to call it only once and flip the image using memcpy. + clippedStride = dstInfo.pixelStride * width; + if (tempRow = malloc(clippedStride)) { + // fast path + jint i; + srcy = srcy - height + 1; + pDst = PtrAddBytes(pDst, dsty * dstInfo.scanStride); + j2d_glReadPixels(srcx, srcy, width, height, pf.format, pf.type, pDst); - srcy--; - dsty++; - height--; + for (i = 0; i < height / 2; ++i) { + void * row1 = PtrAddBytes(pDst, (i * dstInfo.scanStride)); + void * row2 = PtrAddBytes(pDst,(height - i - 1) * dstInfo.scanStride); + memcpy(tempRow, row1, clippedStride); + memcpy(row1, row2, clippedStride); + memcpy(row2, tempRow, clippedStride); + } + free(tempRow); + } else { + // slow path + // we must read one scanline at a time because there is no way + // to read starting at the top-left corner of the source region + while (height > 0) { + j2d_glPixelStorei(GL_PACK_SKIP_ROWS, dsty); + j2d_glReadPixels(srcx, srcy, width, 1, + pf.format, pf.type, pDst); + srcy--; + dsty++; + height--; + } } #ifdef MACOSX --- /dev/null 2014-04-24 00:01:30.000000000 +0400 +++ new/test/java/awt/image/DrawImage/IncorrectDestinationOffset.java 2014-04-24 00:01:30.279921900 +0400 @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsEnvironment; +import java.awt.image.BufferedImage; +import java.awt.image.VolatileImage; +import java.io.File; +import java.io.IOException; + +import javax.imageio.ImageIO; + +/** + * @test + * @bug 8041129 + * @summary Destination offset should be correct in case of Surface->SW blit. + * Destination outside of the drawing area should be untouched. + * @author Sergey Bylokhov + */ +public final class IncorrectDestinationOffset { + + private static final int SIZE = 128; + private static final double[] SCALES = {0.25, 0.5, 1, 1.5, 2.0, 4}; + + public static void main(final String[] args) throws IOException { + GraphicsEnvironment ge = GraphicsEnvironment + .getLocalGraphicsEnvironment(); + GraphicsConfiguration gc = ge.getDefaultScreenDevice() + .getDefaultConfiguration(); + VolatileImage vi = gc.createCompatibleVolatileImage(SIZE, SIZE); + BufferedImage bi = new BufferedImage(SIZE, SIZE, + BufferedImage.TYPE_INT_ARGB); + for (double scale : SCALES) { + while (true) { + // initialize Volatile Image + vi.validate(gc); + Graphics2D g2d = vi.createGraphics(); + g2d.setColor(Color.green); + g2d.fillRect(0, 0, SIZE, SIZE); + g2d.dispose(); + + if (vi.validate(gc) != VolatileImage.IMAGE_OK) { + try { + Thread.sleep(100); + } catch (InterruptedException ignored) { + } + continue; + } + // Draw the VolatileImage to BI with scale and offsets + Graphics2D g = bi.createGraphics(); + g.setComposite(AlphaComposite.Src); + g.setColor(Color.RED); + g.fillRect(0, 0, SIZE / 2, SIZE / 2); + g.setColor(Color.BLUE); + g.fillRect(SIZE / 2, 0, SIZE / 2, SIZE / 2); + g.setColor(Color.ORANGE); + g.fillRect(0, SIZE / 2, SIZE / 2, SIZE / 2); + g.setColor(Color.MAGENTA); + g.fillRect(SIZE / 2, SIZE / 2, SIZE / 2, SIZE / 2); + + int point2draw = (int) (100 * scale); + int size2draw = (int) (SIZE * scale); + g.drawImage(vi, point2draw, point2draw, size2draw, size2draw, + null); + g.dispose(); + + if (vi.contentsLost()) { + try { + Thread.sleep(100); + } catch (InterruptedException ignored) { + } + continue; + } + validate(bi, point2draw, size2draw); + break; + } + } + } + + private static void validate(BufferedImage bi, int point2draw, + int size2draw) + throws IOException { + for (int x = 0; x < SIZE; ++x) { + for (int y = 0; y < SIZE; ++y) { + if (isInsideGreenArea(point2draw, size2draw, x, y)) { + if (bi.getRGB(x, y) != Color.green.getRGB()) { + ImageIO.write(bi, "png", new File("image.png")); + throw new RuntimeException("Test failed."); + } + } else { + if (isRedArea(x, y)) { + if (bi.getRGB(x, y) != Color.red.getRGB()) { + ImageIO.write(bi, "png", new File("image.png")); + throw new RuntimeException("Test failed."); + } + } + if (isBlueArea(x, y)) { + if (bi.getRGB(x, y) != Color.blue.getRGB()) { + ImageIO.write(bi, "png", new File("image.png")); + throw new RuntimeException("Test failed."); + } + } + if (isOrangeArea(x, y)) { + if (bi.getRGB(x, y) != Color.orange.getRGB()) { + ImageIO.write(bi, "png", new File("image.png")); + throw new RuntimeException("Test failed."); + } + } + if (isMagentaArea(x, y)) { + if (bi.getRGB(x, y) != Color.magenta.getRGB()) { + ImageIO.write(bi, "png", new File("image.png")); + throw new RuntimeException("Test failed."); + } + } + } + } + } + } + + private static boolean isRedArea(int x, int y) { + return x < SIZE / 2 && y < SIZE / 2; + } + + private static boolean isBlueArea(int x, int y) { + return x >= SIZE / 2 && y < SIZE / 2; + } + + private static boolean isOrangeArea(int x, int y) { + return x < SIZE / 2 && y >= SIZE / 2; + } + + private static boolean isMagentaArea(int x, int y) { + return x >= SIZE / 2 && y >= SIZE / 2; + } + + private static boolean isInsideGreenArea(int point2draw, int size2draw, + int x, int y) { + return x >= point2draw && x < point2draw + size2draw && y >= + point2draw && y < point2draw + size2draw; + } +} --- /dev/null 2014-04-24 00:01:31.000000000 +0400 +++ new/test/java/awt/image/DrawImage/IncorrectSourceOffset.java 2014-04-24 00:01:31.453549300 +0400 @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsEnvironment; +import java.awt.Image; +import java.awt.image.BufferedImage; +import java.awt.image.VolatileImage; +import java.io.File; +import java.io.IOException; + +import javax.imageio.ImageIO; + +/** + * @test + * @bug 8041129 + * @summary Tests asymmetric source offsets. + * @author Sergey Bylokhov + */ +public final class IncorrectSourceOffset { + + public static void main(final String[] args) throws IOException { + GraphicsEnvironment ge = GraphicsEnvironment + .getLocalGraphicsEnvironment(); + GraphicsConfiguration gc = ge.getDefaultScreenDevice() + .getDefaultConfiguration(); + VolatileImage vi = gc.createCompatibleVolatileImage(511, 255); + BufferedImage bi = new BufferedImage(511, 255, + BufferedImage.TYPE_INT_ARGB); + BufferedImage gold = new BufferedImage(511, 255, + BufferedImage.TYPE_INT_ARGB); + fill(gold); + while (true) { + vi.validate(gc); + fill(vi); + if (vi.validate(gc) != VolatileImage.IMAGE_OK) { + try { + Thread.sleep(100); + } catch (final InterruptedException ignored) { + } + continue; + } + + Graphics2D big = bi.createGraphics(); + big.drawImage(vi, 7, 11, 127, 111, 7, 11, 127, 111, null); + big.dispose(); + if (vi.contentsLost()) { + try { + Thread.sleep(100); + } catch (final InterruptedException ignored) { + } + continue; + } + break; + } + + for (int x = 7; x < 127; ++x) { + for (int y = 11; y < 111; ++y) { + if (gold.getRGB(x, y) != bi.getRGB(x, y)) { + ImageIO.write(gold, "png", new File("gold.png")); + ImageIO.write(bi, "png", new File("bi.png")); + throw new RuntimeException("Test failed."); + } + } + } + } + + private static void fill(Image image) { + Graphics2D graphics = (Graphics2D) image.getGraphics(); + graphics.setComposite(AlphaComposite.Src); + for (int i = 0; i < image.getHeight(null); ++i) { + graphics.setColor(new Color(i, 0, 0)); + graphics.fillRect(0, i, image.getWidth(null), 1); + } + graphics.dispose(); + } +}