From 812a5374b73fce581d8c26f8a2ae99838fba991b Mon Sep 17 00:00:00 2001 From: prr Date: Tue, 11 Nov 2014 12:14:51 -0800 Subject: [PATCH] 8039444: Swing applications not being displayed properly Reviewed-by: serb, vadim --- .../native/sun/java2d/d3d/D3DBadHardware.h | 127 +----------------- 1 file changed, 2 insertions(+), 125 deletions(-) diff --git a/src/windows/native/sun/java2d/d3d/D3DBadHardware.h b/src/windows/native/sun/java2d/d3d/D3DBadHardware.h index 91ee7b358..83aedad8f 100644 --- a/src/windows/native/sun/java2d/d3d/D3DBadHardware.h +++ b/src/windows/native/sun/java2d/d3d/D3DBadHardware.h @@ -51,131 +51,8 @@ typedef struct ADAPTER_INFO { static const ADAPTER_INFO badHardware[] = { - // Intel HD - // Clarkdale (Desktop) GMA HD Lines - { 0x8086, 0x0042, NO_VERSION, OS_ALL }, - // Arrandale (Mobile) GMA HD Lines - { 0x8086, 0x0046, NO_VERSION, OS_ALL }, - - // Sandy Bridge HD Graphics 3000/2000 - { 0x8086, 0x0102, NO_VERSION, OS_ALL }, - { 0x8086, 0x0106, NO_VERSION, OS_ALL }, - { 0x8086, 0x0112, NO_VERSION, OS_ALL }, - { 0x8086, 0x0116, NO_VERSION, OS_ALL }, - { 0x8086, 0x0122, NO_VERSION, OS_ALL }, - { 0x8086, 0x0126, NO_VERSION, OS_ALL }, - { 0x8086, 0x010A, NO_VERSION, OS_ALL }, - - // Ivy Bridge - { 0x8086, 0x0162, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0162, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0166, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0166, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x016A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x016A, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0152, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0152, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0156, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0156, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x015A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x015A, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - - // Haswell - { 0x8086, 0x0402, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0402, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0406, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0406, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0412, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0412, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0416, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0416, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x041E, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x041E, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x040A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x040A, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x041A, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x041A, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0A06, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0A06, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0A16, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0A16, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0A26, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0A26, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0A2E, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0A2E, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0A1E, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0A1E, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0A0E, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0A0E, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0D26, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0D26, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - { 0x8086, 0x0D22, D_VERSION(6,14,10,5437), OS_WINXP | OS_WINXP_64 }, - { 0x8086, 0x0D22, D_VERSION(9,18,10,3257), OS_VISTA | OS_WINDOWS7 }, - - // Reason: workaround for 6620073, 6612195 - // Intel 740 - { 0x8086, 0x7800, NO_VERSION, OS_ALL }, - { 0x8086, 0x1240, NO_VERSION, OS_ALL }, - { 0x8086, 0x7121, NO_VERSION, OS_ALL }, - { 0x8086, 0x7123, NO_VERSION, OS_ALL }, - { 0x8086, 0x7125, NO_VERSION, OS_ALL }, - { 0x8086, 0x1132, NO_VERSION, OS_ALL }, - // IEG - { 0x8086, 0x2562, NO_VERSION, OS_ALL }, - { 0x8086, 0x3577, NO_VERSION, OS_ALL }, - { 0x8086, 0x2572, NO_VERSION, OS_ALL }, - { 0x8086, 0x3582, NO_VERSION, OS_ALL }, - { 0x8086, 0x358E, NO_VERSION, OS_ALL }, - // GMA - { 0x8086, 0x2582, NO_VERSION, OS_ALL }, - { 0x8086, 0x2782, NO_VERSION, OS_ALL }, - { 0x8086, 0x2592, NO_VERSION, OS_ALL }, - { 0x8086, 0x2792, NO_VERSION, OS_ALL }, - { 0x8086, 0x2772, NO_VERSION, OS_ALL }, - { 0x8086, 0x2776, NO_VERSION, OS_ALL }, - { 0x8086, 0x27A2, NO_VERSION, OS_ALL }, - { 0x8086, 0x27A6, NO_VERSION, OS_ALL }, - { 0x8086, 0x27AE, NO_VERSION, OS_ALL }, - { 0x8086, 0x29D2, NO_VERSION, OS_ALL }, - { 0x8086, 0x29D3, NO_VERSION, OS_ALL }, - { 0x8086, 0x29B2, NO_VERSION, OS_ALL }, - { 0x8086, 0x29B3, NO_VERSION, OS_ALL }, - { 0x8086, 0x29C2, NO_VERSION, OS_ALL }, - { 0x8086, 0x29C3, NO_VERSION, OS_ALL }, - { 0x8086, 0xA001, NO_VERSION, OS_ALL }, - { 0x8086, 0xA002, NO_VERSION, OS_ALL }, - { 0x8086, 0xA011, NO_VERSION, OS_ALL }, - { 0x8086, 0xA012, NO_VERSION, OS_ALL }, - // GMA - { 0x8086, 0x2972, NO_VERSION, OS_ALL }, - { 0x8086, 0x2973, NO_VERSION, OS_ALL }, - { 0x8086, 0x2992, NO_VERSION, OS_ALL }, - { 0x8086, 0x2993, NO_VERSION, OS_ALL }, - { 0x8086, 0x29A2, NO_VERSION, OS_ALL }, - { 0x8086, 0x29A3, NO_VERSION, OS_ALL }, - { 0x8086, 0x2982, NO_VERSION, OS_ALL }, - { 0x8086, 0x2983, NO_VERSION, OS_ALL }, - { 0x8086, 0x2A02, NO_VERSION, OS_ALL }, - { 0x8086, 0x2A03, NO_VERSION, OS_ALL }, - { 0x8086, 0x2A12, NO_VERSION, OS_ALL }, - { 0x8086, 0x2A13, NO_VERSION, OS_ALL }, - - // Eaglelake (Desktop) GMA 4500 Lines - { 0x8086, 0x2E42, NO_VERSION, OS_ALL }, - { 0x8086, 0x2E43, NO_VERSION, OS_ALL }, - { 0x8086, 0x2E92, NO_VERSION, OS_ALL }, - { 0x8086, 0x2E93, NO_VERSION, OS_ALL }, - { 0x8086, 0x2E12, NO_VERSION, OS_ALL }, - { 0x8086, 0x2E13, NO_VERSION, OS_ALL }, - // Eaglelake (Desktop) GMA X4500 Lines - { 0x8086, 0x2E32, NO_VERSION, OS_ALL }, - { 0x8086, 0x2E33, NO_VERSION, OS_ALL }, - { 0x8086, 0x2E22, NO_VERSION, OS_ALL }, - // Eaglelake (Desktop) GMA X4500HD Lines - { 0x8086, 0x2E23, NO_VERSION, OS_ALL }, - // Cantiga (Mobile) GMA 4500MHD Lines - { 0x8086, 0x2A42, NO_VERSION, OS_ALL }, - { 0x8086, 0x2A43, NO_VERSION, OS_ALL }, + // All Intel Chips. + { 0x8086, ALL_DEVICEIDS, NO_VERSION, OS_ALL }, // ATI Mobility Radeon X1600, X1400, X1450, X1300, X1350 // Reason: workaround for 6613066, 6687166 -- GitLab