infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-09 07:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8041987: [macosx] setDisplayMode crashes

Browse Source 
Reviewed-by: anthony, serb
This commit is contained in:
Petr Pchelko 2014-04-28 16:45:43 +04:00
parent 844cf2d704
commit 01e8b57668
2 changed files with 250 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
View File

@ -237,17 +237,19 @@ Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode
{
JNF_COCOA_ENTER(env);
CFArrayRef allModes = getAllValidDisplayModes(displayID);
CGDisplayModeRef closestMatch = getBestModeForParameters(allModes, (int)w, (int)h, (int)bpp, (int)refrate);
__block CGError retCode = kCGErrorSuccess;
if (closestMatch != NULL) {
[JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
CGDisplayModeRetain(closestMatch);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
CGDisplayConfigRef config;
retCode = CGBeginDisplayConfiguration(&config);
if (retCode == kCGErrorSuccess) {
CGConfigureDisplayWithDisplayMode(config, displayID, closestMatch, NULL);
retCode = CGCompleteDisplayConfiguration(config, kCGConfigureForAppOnly);
}
CGDisplayModeRelease(closestMatch);
}];
} else {
[JNFException raise:env as:kIllegalArgumentException reason:"Invalid display mode"];
@ -255,8 +257,7 @@ Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode
if (retCode != kCGErrorSuccess){
[JNFException raise:env as:kIllegalArgumentException reason:"Unable to set display mode!"];
}
}
CFRelease(allModes);
JNF_COCOA_EXIT(env);
}

245
jdk/test/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java Normal file
View File

@ -0,0 +1,245 @@
/*
* Copyright (c) 2006, 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.
*/
/**
* @test
* @bug 6366359
* @summary Test that we don't crash when changing from 8 to 16/32 bit modes
* @author Dmitri.Trembovetski@Sun.COM area=FullScreen
* @run main/othervm/timeout=200 DisplayChangeVITest
* @run main/othervm/timeout=200 -Dsun.java2d.d3d=false DisplayChangeVITest
* @run main/othervm/timeout=200 -Dsun.java2d.opengl=true DisplayChangeVITest
*/
import java.awt.Color;
import java.awt.DisplayMode;
import java.awt.Graphics;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
import java.awt.image.VolatileImage;
import java.lang.Exception;
import java.lang.Thread;
import java.util.ArrayList;
import java.util.Random;
import javax.swing.JFrame;
/**
* The test enters fullscreen mode (if it's supported) and then tries
* to switch between display moes with different depths and dimensions
* while doing both rendering to the screen (via a VolatileImage)
* and Swing repainting just to make things more chaotic.
*
* The procedure is repeated TEST_REPS times (3 by default).
*
* Don't pay attention to what happens on the screen, it won't be pretty.
* If the test doesn't crash or throw exceptions, it passes, otherwise
* it fails.
*/
public class DisplayChangeVITest extends JFrame implements Runnable {
private final Random rnd = new Random();
private VolatileImage bb;
private BufferedImage sprite;
private VolatileImage volSprite;
private static boolean done = false;
private static final Object lock = new Object();
private static final int TEST_REPS = 3;
private ArrayList<DisplayMode> dms;
DisplayChangeVITest() {
selectDisplayModes();
addKeyListener(new KeyAdapter() {
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
synchronized (lock) {
done = true;
}
}
}
});
sprite = new BufferedImage(200, 200, BufferedImage.TYPE_INT_RGB);
sprite.getRaster().getDataBuffer();
Graphics g = sprite.getGraphics();
g.setColor(Color.yellow);
g.fillRect(0, 0, sprite.getWidth(), sprite.getHeight());
}
void render(Graphics g) {
do {
// volatile images validated here
initBackbuffer();
g.setColor(Color.black);
g.fillRect(0, 0, getWidth(), getHeight());
Graphics gg = bb.getGraphics();
gg.setColor(new Color(rnd.nextInt(0x00ffffff)));
gg.fillRect(0, 0, bb.getWidth(), bb.getHeight());
for (int x = 0; x < 10; x++) {
gg.drawImage(sprite, x*200, 0, null);
gg.drawImage(volSprite, x*200, 500, null);
}
g.drawImage(bb, 0, 0, null);
} while (bb.contentsLost());
}
private static void sleep(long msec) {
try { Thread.sleep(msec); } catch (InterruptedException e) {}
}
private int reps = 0;
public void run() {
GraphicsDevice gd = getGraphicsConfiguration().getDevice();
if (gd.isDisplayChangeSupported() && dms.size() > 0) {
while (!done && reps++ < TEST_REPS) {
for (DisplayMode dm : dms) {
System.err.printf("Entering DisplayMode[%dx%dx%d]\n",
dm.getWidth(), dm.getHeight(), dm.getBitDepth());
gd.setDisplayMode(dm);
initBackbuffer();
for (int i = 0; i < 10; i++) {
// render to the screen
render(getGraphics());
// ask Swing to repaint
repaint();
sleep(100);
}
sleep(1500);
}
}
} else {
System.err.println("Display mode change " +
"not supported. Test passed.");
}
dispose();
synchronized (lock) {
done = true;
lock.notify();
}
}
private void createBackbuffer() {
if (bb == null ||
bb.getWidth() != getWidth() || bb.getHeight() != getHeight())
{
bb = createVolatileImage(getWidth(), getHeight());
}
}
private void initBackbuffer() {
createBackbuffer();
int res = bb.validate(getGraphicsConfiguration());
if (res == VolatileImage.IMAGE_INCOMPATIBLE) {
bb = null;
createBackbuffer();
bb.validate(getGraphicsConfiguration());
res = VolatileImage.IMAGE_RESTORED;
}
if (res == VolatileImage.IMAGE_RESTORED) {
Graphics g = bb.getGraphics();
g.setColor(new Color(rnd.nextInt(0x00ffffff)));
g.fillRect(0, 0, bb.getWidth(), bb.getHeight());
volSprite = createVolatileImage(100, 100);
}
volSprite.validate(getGraphicsConfiguration());
}
private void selectDisplayModes() {
GraphicsDevice gd =
GraphicsEnvironment.getLocalGraphicsEnvironment().
getDefaultScreenDevice();
dms = new ArrayList<DisplayMode>();
DisplayMode dmArray[] = gd.getDisplayModes();
boolean found8 = false, found16 = false,
found24 = false, found32 = false;
for (DisplayMode dm : dmArray) {
if (!found8 &&
(dm.getBitDepth() == 8 ||
dm.getBitDepth() == DisplayMode.BIT_DEPTH_MULTI) &&
(dm.getWidth() >= 800 && dm.getWidth() < 1024))
{
dms.add(dm);
found8 = true;
continue;
}
if (!found32 &&
(dm.getBitDepth() == 32 ||
dm.getBitDepth() == DisplayMode.BIT_DEPTH_MULTI) &&
dm.getWidth() >= 1280)
{
dms.add(dm);
found32 = true;
continue;
}
if (!found16 &&
dm.getBitDepth() == 16 &&
(dm.getWidth() >= 1024 && dm.getWidth() < 1280))
{
dms.add(dm);
found16 = true;
continue;
}
if (found8 && found16 && found32) {
break;
}
}
System.err.println("Found display modes:");
for (DisplayMode dm : dms) {
System.err.printf("DisplayMode[%dx%dx%d]\n",
dm.getWidth(), dm.getHeight(), dm.getBitDepth());
}
}
public static void main(String[] args) throws Exception {
DisplayChangeVITest test = new DisplayChangeVITest();
GraphicsDevice gd =
GraphicsEnvironment.getLocalGraphicsEnvironment().
getDefaultScreenDevice();
if (gd.isFullScreenSupported()) {
gd.setFullScreenWindow(test);
Thread t = new Thread(test);
t.run();
synchronized (lock) {
while (!done) {
try {
lock.wait(50);
} catch (InterruptedException ex) {
ex.printStackTrace();
}
}
}
System.err.println("Test Passed.");
} else {
System.err.println("Full screen not supported. Test passed.");
}
}
}