Mercurial > hg > release > icedtea6-1.13

changeset 2247:423423aec247

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backport of 6755274 a 6791612 patches to fix OpenGL-related failures.
author ptisnovs
date Wed, 01 Sep 2010 11:50:21 +0200
parents 17e622c24432
children a6b05ef50569
files ChangeLog Makefile.am patches/opengl-jni-fix.patch patches/openjdk/6755274-glgetstring-crash.patch patches/openjdk/6791612-opengl-jni-fix.patch
diffstat 5 files changed, 94 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Aug 28 12:58:17 2010 +0200
+++ b/ChangeLog	Wed Sep 01 11:50:21 2010 +0200
@@ -1,3 +1,11 @@
+2010-09-01  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* Makefile.am: Add two new patches, removed one unused patch.
+	* patches/openjdk/6755274-glgetstring-crash.patch:
+	* patches/openjdk/6791612-opengl-jni-fix.patch:
+	Backport of 6755274 and 6791612 patches to fix OpenGL-related failures
+	(improper OpenGL initialization and missing link to native functions)
+
 2010-08-27  Andrew John Hughes  <ahughes@redhat.com>
 
 	PR398, S6951319:
@@ -27,7 +35,7 @@
 	(activateJars): Process nested jar only if size > 0 bytes.
 	* plugin/icedteanp/IcedTeaNPPlugin.cc: Fixed file name in header. 
 
-2010-08-16  Pavel Tisnovsky  <ptisnovs@redhat.com>
+2010-08-26  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* Makefile.am:
 	* patches/opengl-jni-fix.patch:
--- a/Makefile.am	Sat Aug 28 12:58:17 2010 +0200
+++ b/Makefile.am	Wed Sep 01 11:50:21 2010 +0200
@@ -327,7 +327,8 @@
 ICEDTEA_PATCHES += patches/openjdk/6725214-direct3d-01.patch \
 	patches/openjdk/6307603-xrender-01.patch \
 	patches/openjdk/6961633-xrender-02.patch \
-        patches/opengl-jni-fix.patch
+        patches/openjdk/6791612-opengl-jni-fix.patch \
+        patches/openjdk/6755274-glgetstring-crash.patch
 endif
 
 if ENABLE_NIO2
--- a/patches/opengl-jni-fix.patch	Sat Aug 28 12:58:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- openjdk-old/jdk/make/sun/xawt/mapfile-vers	2010-08-16 16:54:21.000000000 +0200
-+++ openjdk/jdk/make/sun/xawt/mapfile-vers	2010-08-16 16:54:21.000000000 +0200
-@@ -300,6 +300,7 @@
-         Java_java_awt_FileDialog_initIDs;
-         Java_sun_awt_X11_XWindow_initIDs;
- 
-+        Java_sun_java2d_opengl_OGLContext_getOGLIdString;
-         Java_sun_java2d_opengl_OGLMaskFill_maskFill;
-         Java_sun_java2d_opengl_OGLRenderer_drawPoly;
-         Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6755274-glgetstring-crash.patch	Wed Sep 01 11:50:21 2010 +0200
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User tdv
+# Date 1224602738 25200
+# Node ID 452c58b2f5334bb357f778e319b5dfffe7b4c696
+# Parent  665850610378a6e9a46b7df1ce04d4fc6edfd236
+6755274: 6u10b33 2d tests fails on sles10x64 with jvm crash
+Reviewed-by: campbell
+
+diff -r 665850610378 -r 452c58b2f533 src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java
+--- openjdk.old/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java	2010-08-30 11:47:11.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java	2010-08-30 11:47:11.000000000 +0200
+@@ -120,12 +120,14 @@
+                 new GLXGetConfigInfo(device.getScreen(), visualnum);
+             rq.flushAndInvokeNow(action);
+             cfginfo = action.getConfigInfo();
+-            OGLContext.setScratchSurface(cfginfo);
+-            rq.flushAndInvokeNow(new Runnable() {
+-                public void run() {
+-                    ids[0] = OGLContext.getOGLIdString();
+-                }
+-            });
++            if (cfginfo != 0L) {
++                OGLContext.setScratchSurface(cfginfo);
++                rq.flushAndInvokeNow(new Runnable() {
++                    public void run() {
++                        ids[0] = OGLContext.getOGLIdString();
++                    }
++                });
++            }
+         } finally {
+             rq.unlock();
+         }
+diff -r 665850610378 -r 452c58b2f533 src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
+--- openjdk-old/jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java	2010-08-30 11:47:11.000000000 +0200
++++ openjdk/jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java	2010-08-30 11:47:11.000000000 +0200
+@@ -127,12 +127,14 @@
+                 new WGLGetConfigInfo(device.getScreen(), pixfmt);
+             rq.flushAndInvokeNow(action);
+             cfginfo = action.getConfigInfo();
+-            OGLContext.setScratchSurface(cfginfo);
+-            rq.flushAndInvokeNow(new Runnable() {
+-                public void run() {
+-                    ids[0] = OGLContext.getOGLIdString();
+-                }
+-            });
++            if (cfginfo != 0L) {
++                OGLContext.setScratchSurface(cfginfo);
++                rq.flushAndInvokeNow(new Runnable() {
++                    public void run() {
++                        ids[0] = OGLContext.getOGLIdString();
++                    }
++                });
++            }
+         } finally {
+             rq.unlock();
+         }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6791612-opengl-jni-fix.patch	Wed Sep 01 11:50:21 2010 +0200
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User tdv
+# Date 1235684318 28800
+# Node ID 0c856354b66924ad99e106ad0b99b1d263ef2eab
+# Parent  ff2afd0551c97282f5bc0939eda439166bfa71b4
+6791612: OGLBat tests are failed in jdk 7 b42
+Reviewed-by: tdv
+Contributed-by: ceisserer <linuxhippy@gmail.com>
+
+diff -r ff2afd0551c9 -r 0c856354b669 make/sun/xawt/mapfile-vers
+--- openjdk-old/jdk/make/sun/xawt/mapfile-vers	2010-08-16 16:54:21.000000000 +0200
++++ openjdk/jdk/make/sun/xawt/mapfile-vers	2010-08-16 16:54:21.000000000 +0200
+@@ -302,12 +302,14 @@
+         Java_java_awt_FileDialog_initIDs;
+         Java_sun_awt_X11_XWindow_initIDs;
+ 
++        Java_sun_java2d_opengl_OGLContext_getOGLIdString;
+         Java_sun_java2d_opengl_OGLMaskFill_maskFill;
+         Java_sun_java2d_opengl_OGLRenderer_drawPoly;
+         Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;
+         Java_sun_java2d_opengl_OGLSurfaceData_initTexture;
+         Java_sun_java2d_opengl_OGLSurfaceData_initFBObject;
+         Java_sun_java2d_opengl_OGLSurfaceData_initFlipBackbuffer;
++        Java_sun_java2d_opengl_OGLSurfaceData_getTextureID;
+         Java_sun_java2d_opengl_OGLSurfaceData_getTextureTarget;
+         Java_sun_java2d_opengl_OGLTextRenderer_drawGlyphList;
+         Java_sun_java2d_opengl_GLXGraphicsConfig_getGLXConfigInfo;