提交 1332dde9 编写于 作者: P prr

7196866: CTW fails on all Solaris platforms

Reviewed-by: prr, jrose, twisti, kvn
上级 21bd8378
...@@ -926,6 +926,11 @@ void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps) { ...@@ -926,6 +926,11 @@ void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps) {
*shmExt = canUseShmExt = CANT_USE_MITSHM; *shmExt = canUseShmExt = CANT_USE_MITSHM;
*shmPixmaps = canUseShmExtPixmaps = CANT_USE_MITSHM; *shmPixmaps = canUseShmExtPixmaps = CANT_USE_MITSHM;
if (awt_display == (Display *)NULL) {
AWT_NOFLUSH_UNLOCK();
return;
}
/** /**
* XShmQueryExtension returns False in remote server case. * XShmQueryExtension returns False in remote server case.
* Unfortunately it also returns True in ssh case, so * Unfortunately it also returns True in ssh case, so
......
...@@ -267,13 +267,19 @@ Java_sun_java2d_xr_XRBackendNative_initIDs(JNIEnv *env, jclass cls) { ...@@ -267,13 +267,19 @@ Java_sun_java2d_xr_XRBackendNative_initIDs(JNIEnv *env, jclass cls) {
char *maskData; char *maskData;
XImage* defaultImg; XImage* defaultImg;
jfieldID maskImgID; jfieldID maskImgID;
jlong fmt8 = jlong fmt8;
ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardA8)); jlong fmt32;
jlong fmt32 =
ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardARGB32));
jfieldID a8ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_A8", "J"); jfieldID a8ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_A8", "J");
jfieldID argb32ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_ARGB32", "J"); jfieldID argb32ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_ARGB32", "J");
if (awt_display == (Display *)NULL) {
return;
}
fmt8 = ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardA8));
fmt32 = ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardARGB32));
(*env)->SetStaticLongField(env, cls, a8ID, fmt8); (*env)->SetStaticLongField(env, cls, a8ID, fmt8);
(*env)->SetStaticLongField(env, cls, argb32ID, fmt32); (*env)->SetStaticLongField(env, cls, argb32ID, fmt32);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册