# HG changeset patch
# User vadim
# Date 1368785924 -14400
# Node ID bb1047aa94aa10c2f91a48f54579dbcdb04671e0
# Parent  6c19274ebe7d9fba01aeca8ef4f475d4a725d38f
8000936: Enable Java2D D3D pipeline on newer Intel chipsets : Intel HD and later
Reviewed-by: prr, bae

diff -r 6c19274ebe7d -r bb1047aa94aa jdk/src/windows/native/sun/java2d/d3d/D3DBadHardware.h
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DBadHardware.h	Fri May 17 17:19:21 2013 +0400
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DBadHardware.h	Fri May 17 14:18:44 2013 +0400
@@ -51,9 +51,105 @@
 
 static const ADAPTER_INFO badHardware[] = {
 
-    // any Intel chip
-    // Reason: workaround for 6620073, 6612195, 6620073
-    { 0x8086, ALL_DEVICEIDS, NO_VERSION, OS_ALL },
+    // Intel HD
+    // Clarkdale (Desktop) GMA HD Lines
+    { 0x8086, 0x0042, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x0042, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    // Arrandale (Mobile) GMA HD Lines
+    { 0x8086, 0x0046, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x0046, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    // Sandy Bridge GMA HD Lines
+    { 0x8086, 0x0102, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x0102, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x0106, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x0106, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x0112, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x0112, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x0116, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x0116, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x0122, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x0122, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x0126, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x0126, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x010A, D_VERSION(6,14,10,5337), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x010A, D_VERSION(8,15,10,2302), 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, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E42, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x2E43, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E43, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x2E92, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E92, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x2E93, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E93, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x2E12, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E12, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x2E13, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E13, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    // Eaglelake (Desktop) GMA X4500 Lines
+    { 0x8086, 0x2E32, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E32, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x2E33, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E33, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x2E22, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E22, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    // Eaglelake (Desktop) GMA X4500HD Lines
+    { 0x8086, 0x2E23, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2E23, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    // Cantiga (Mobile) GMA 4500MHD Lines
+    { 0x8086, 0x2A42, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2A42, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
+    { 0x8086, 0x2A43, D_VERSION(6,14,10,5303), OS_WINXP | OS_WINXP_64 },
+    { 0x8086, 0x2A43, D_VERSION(8,15,10,2302), OS_VISTA | OS_WINDOWS7 },
 
     // ATI Mobility Radeon X1600, X1400, X1450, X1300, X1350
     // Reason: workaround for 6613066, 6687166