8272288: Funky multiresolution image breaks graphics context

Reviewed-by: jdv

src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -32,10 +32,12 @@ import java.awt.ImageCapabilities;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
+
 import sun.awt.DisplayChangedListener;
 import sun.java2d.SunGraphicsEnvironment;
 import sun.java2d.SurfaceData;
-import static sun.java2d.pipe.hw.AccelSurface.*;
+
+import static sun.java2d.pipe.hw.AccelSurface.UNDEFINED;
 
 /**
  * This SurfaceManager variant manages an accelerated volatile surface, if it
@@ -307,6 +309,9 @@ public abstract class VolatileSurfaceManager
      * primary SurfaceData object.
      */
     public SurfaceData restoreContents() {
+        // We're asked to restore contents by the accelerated surface, which
+        // means that it had been lost
+        acceleratedSurfaceLost();
         return getBackupSurface();
     }
 

src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java

@@ -40,10 +40,14 @@ import sun.awt.image.VolatileSurfaceManager;
 import sun.awt.windows.WComponentPeer;
 import sun.java2d.InvalidPipeException;
 import sun.java2d.SurfaceData;
-import static sun.java2d.pipe.hw.AccelSurface.*;
-import static sun.java2d.d3d.D3DContext.D3DContextCaps.*;
 import sun.java2d.windows.GDIWindowSurfaceData;
 
+import static sun.java2d.d3d.D3DContext.D3DContextCaps.CAPS_RT_PLAIN_ALPHA;
+import static sun.java2d.d3d.D3DContext.D3DContextCaps.CAPS_RT_TEXTURE_ALPHA;
+import static sun.java2d.pipe.hw.AccelSurface.RT_TEXTURE;
+import static sun.java2d.pipe.hw.AccelSurface.TEXTURE;
+import static sun.java2d.pipe.hw.AccelSurface.UNDEFINED;
+
 public class D3DVolatileSurfaceManager
     extends VolatileSurfaceManager
 {
@@ -160,16 +164,6 @@ public class D3DVolatileSurfaceManager
         }
     }
 
-    /**
-     * We're asked to restore contents by the accelerated surface, which means
-     * that it had been lost.
-     */
-    @Override
-    public SurfaceData restoreContents() {
-        acceleratedSurfaceLost();
-        return super.restoreContents();
-    }
-
     /**
      * If the destination surface's peer can potentially handle accelerated
      * on-screen rendering then it is likely that the condition which resulted

test/jdk/java/awt/image/VolatileImage/ReportRenderingError.java

@@ -0,0 +1,132 @@
+/*
+ * Copyright Amazon.com Inc. 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.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
+
+/*
+ * @test id=default
+ * @bug 8272288
+ * @key headful
+ * @summary Broken rendering should be reported by the contentsLost()
+ *
+ * @run main/othervm ReportRenderingError
+ */
+
+/*
+ * @test id=windows
+ * @bug 8272288
+ * @key headful
+ * @summary Broken rendering should be reported by the contentsLost()
+ * @requires (os.family == "windows")
+ *
+ * @run main/othervm -Dsun.java2d.opengl=True ReportRenderingError
+ * @run main/othervm -Dsun.java2d.d3d=True    ReportRenderingError
+ * @run main/othervm -Dsun.java2d.d3d=false   ReportRenderingError
+ */
+
+/*
+ * @test id=macos
+ * @bug 8272288
+ * @key headful
+ * @summary Broken rendering should be reported by the contentsLost()
+ *
+ * @requires (os.family == "mac")
+ * @run main/othervm -Dsun.java2d.opengl=True ReportRenderingError
+ * @run main/othervm -Dsun.java2d.metal=True  ReportRenderingError
+ */
+
+/*
+ * @test id=linux
+ * @bug 8272288
+ * @key headful
+ * @summary Broken rendering should be reported by the contentsLost()
+ *
+ * @requires (os.family == "linux")
+ * @run main/othervm -Dsun.java2d.opengl=True   ReportRenderingError
+ * @run main/othervm -Dsun.java2d.xrender=True  ReportRenderingError
+ * @run main/othervm -Dsun.java2d.xrender=false ReportRenderingError
+ */
+public final class ReportRenderingError {
+
+    public static void main(String[] args) {
+        var gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                                    .getDefaultScreenDevice()
+                                    .getDefaultConfiguration();
+        var vi = gc.createCompatibleVolatileImage(10, 10);
+
+        Image image = new EmptyImage();
+        BufferedImage snapshot;
+        int attempt = 0;
+        do {
+            vi.validate(gc);
+            Graphics2D g = vi.createGraphics();
+            g.setColor(Color.RED);
+            g.drawImage(image, 0, 0, null); // <- can cause InvalidPipeException
+            g.fillRect(0, 0, vi.getWidth(), vi.getHeight());
+            g.dispose();
+            snapshot = vi.getSnapshot();
+        } while (vi.contentsLost() && (++attempt <= 10));
+
+        if (vi.contentsLost()) {
+            System.out.println("Content is lost, skip the pixel validation");
+        } else {
+            if (snapshot.getRGB(5, 5) != Color.RED.getRGB()) {
+                throw new RuntimeException("Test failed");
+            }
+        }
+    }
+
+    private static final class EmptyImage extends Image {
+        @Override
+        public int getWidth(ImageObserver observer) {
+            return 10;
+        }
+
+        @Override
+        public int getHeight(ImageObserver observer) {
+            return 10;
+        }
+
+        @Override
+        public ImageProducer getSource() {
+            return null;
+        }
+
+        @Override
+        public Graphics getGraphics() {
+            return null;
+        }
+
+        @Override
+        public Object getProperty(String name, ImageObserver observer) {
+            return null;
+        }
+    }
+}