Attachment #77298 for bug #111333

View | Details | Raw Unified | Return to bug 111333
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-2 / +2 lines)
7		7
8	PORTNAME= dri	8	PORTNAME= dri
9	PORTVERSION= 6.4.1	9	PORTVERSION= 6.4.1
10	PORTEPOCH= 2	10	PORTEPOCH= 3
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR=mesa3d	13	MASTER_SITE_SUBDIR=mesa3d
Lines 37-43 Link Here
37	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
38		38
39	.if ${X_WINDOW_SYSTEM:L} != xorg	39	.if ${X_WINDOW_SYSTEM:L} != xorg
40	IGNORE= requires libGL from X.Org.	40	IGNORE= requires libGL from X.Org
41	.endif	41	.endif
42		42
43	do-install:	43	do-install:




--- src/mesa/drivers/dri/i915/intel_screen.c.orig	Fri Apr  6 16:49:46 2007
+++ src/mesa/drivers/dri/i915/intel_screen.c	Fri Apr  6 16:50:04 2007
@@ -340,6 +340,7 @@
    case PCI_CHIP_I915_G:
    case PCI_CHIP_I915_GM:
    case PCI_CHIP_I945_G:
+   case PCI_CHIP_I945_GM:
       return i915CreateContext( mesaVis, driContextPriv, 
 			       sharedContextPrivate );
  
--- src/mesa/drivers/dri/i915/intel_context.c.orig	Fri Apr  6 16:45:51 2007
+++ src/mesa/drivers/dri/i915/intel_context.c	Fri Apr  6 16:46:20 2007
@@ -118,6 +118,8 @@
 	 chipset = "Intel(R) 915GM"; break;
       case PCI_CHIP_I945_G:
 	 chipset = "Intel(R) 945G"; break;
+      case PCI_CHIP_I945_GM:
+	 chipset = "Intel(R) 945GM"; break;
       default:
 	 chipset = "Unknown Intel Chipset"; break;
       }
--- src/mesa/drivers/dri/i915/i915_texstate.c.orig	Fri Apr  6 16:48:21 2007
+++ src/mesa/drivers/dri/i915/i915_texstate.c	Fri Apr  6 16:48:48 2007
@@ -496,7 +496,8 @@
    }
 
 
-   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G)
+   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G ||
+       i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM)
       i945LayoutTextureImages( i915, tObj );	 
    else
       i915LayoutTextureImages( i915, tObj );
--- src/mesa/drivers/dri/i915/intel_context.h.orig	Fri Apr  6 16:49:05 2007
+++ src/mesa/drivers/dri/i915/intel_context.h	Fri Apr  6 16:49:31 2007
@@ -413,6 +413,7 @@
 #define PCI_CHIP_I915_G			0x2582
 #define PCI_CHIP_I915_GM		0x2592
 #define PCI_CHIP_I945_G			0x2772
+#define PCI_CHIP_I945_GM			0x27A2
 
 
 /* ================================================================

Return to bug 111333

Added Link Here

(-)files/patch-945gm (+43 lines)
1	--- src/mesa/drivers/dri/i915/intel_screen.c.orig Fri Apr 6 16:49:46 2007
2	+++ src/mesa/drivers/dri/i915/intel_screen.c Fri Apr 6 16:50:04 2007
3	@@ -340,6 +340,7 @@
4	case PCI_CHIP_I915_G:
5	case PCI_CHIP_I915_GM:
6	case PCI_CHIP_I945_G:
7	+ case PCI_CHIP_I945_GM:
8	return i915CreateContext( mesaVis, driContextPriv,
9	sharedContextPrivate );
10
11	--- src/mesa/drivers/dri/i915/intel_context.c.orig Fri Apr 6 16:45:51 2007
12	+++ src/mesa/drivers/dri/i915/intel_context.c Fri Apr 6 16:46:20 2007
13	@@ -118,6 +118,8 @@
14	chipset = "Intel(R) 915GM"; break;
15	case PCI_CHIP_I945_G:
16	chipset = "Intel(R) 945G"; break;
17	+ case PCI_CHIP_I945_GM:
18	+ chipset = "Intel(R) 945GM"; break;
19	default:
20	chipset = "Unknown Intel Chipset"; break;
21	}
22	--- src/mesa/drivers/dri/i915/i915_texstate.c.orig Fri Apr 6 16:48:21 2007
23	+++ src/mesa/drivers/dri/i915/i915_texstate.c Fri Apr 6 16:48:48 2007
24	@@ -496,7 +496,8 @@
25	}
26
27
28	- if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G)
29	+ if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G \|\|
30	+ i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM)
31	i945LayoutTextureImages( i915, tObj );
32	else
33	i915LayoutTextureImages( i915, tObj );
34	--- src/mesa/drivers/dri/i915/intel_context.h.orig Fri Apr 6 16:49:05 2007
35	+++ src/mesa/drivers/dri/i915/intel_context.h Fri Apr 6 16:49:31 2007
36	@@ -413,6 +413,7 @@
37	#define PCI_CHIP_I915_G 0x2582
38	#define PCI_CHIP_I915_GM 0x2592
39	#define PCI_CHIP_I945_G 0x2772
40	+#define PCI_CHIP_I945_GM 0x27A2
41
42
43	/* ================================================================