diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/i915_texstate.c ./i915_texstate.c
--- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/i915_texstate.c	2007-06-22 00:14:38.000000000 +0200
+++ ./i915_texstate.c	2007-06-06 00:55:28.000000000 +0200
@@ -491,12 +491,19 @@
       abort();
    }
 
-
-   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G ||
-       i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM)
-      i945LayoutTextureImages( i915, tObj );	 
-   else
-      i915LayoutTextureImages( i915, tObj );
+   switch (i915->intel.intelScreen->deviceID) {
+   case PCI_CHIP_I945_G:
+   case PCI_CHIP_I945_GM:
+   case PCI_CHIP_I945_GME:
+   case PCI_CHIP_G33_G:
+   case PCI_CHIP_Q33_G:
+   case PCI_CHIP_Q35_G:
+       i945LayoutTextureImages( i915, tObj );
+       break;
+   default:
+       i915LayoutTextureImages( i915, tObj );
+       break;
+   }
 
    t->Setup[I915_TEXREG_MS3] = 
       (((tObj->Image[0][t->intel.base.firstLevel]->Height - 1) << MS3_HEIGHT_SHIFT) |
diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_context.c ./intel_context.c
--- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_context.c	2007-06-22 00:14:38.000000000 +0200
+++ ./intel_context.c	2007-06-06 00:55:28.000000000 +0200
@@ -123,6 +123,14 @@
 	 chipset = "Intel(R) 945G"; break;
       case PCI_CHIP_I945_GM:
 	 chipset = "Intel(R) 945GM"; break;
+      case PCI_CHIP_I945_GME:
+	 chipset = "Intel(R) 945GME"; break;
+      case PCI_CHIP_G33_G:
+	 chipset = "Intel(R) G33"; break;
+      case PCI_CHIP_Q35_G:
+	 chipset = "Intel(R) Q35"; break;
+      case PCI_CHIP_Q33_G:
+	 chipset = "Intel(R) Q33"; break;
       default:
 	 chipset = "Unknown Intel Chipset"; break;
       }
diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_context.h ./intel_context.h
--- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_context.h	2007-06-22 00:14:38.000000000 +0200
+++ ./intel_context.h	2007-06-06 00:55:28.000000000 +0200
@@ -454,6 +454,10 @@
 #define PCI_CHIP_I915_GM		0x2592
 #define PCI_CHIP_I945_G			0x2772
 #define PCI_CHIP_I945_GM		0x27A2
+#define PCI_CHIP_I945_GME		0x27AE
+#define PCI_CHIP_G33_G			0x29C2
+#define PCI_CHIP_Q35_G			0x29B2
+#define PCI_CHIP_Q33_G			0x29D2
 
 
 /* ================================================================
diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_screen.c ./intel_screen.c
--- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_screen.c	2007-06-22 00:14:38.000000000 +0200
+++ ./intel_screen.c	2007-06-06 00:55:28.000000000 +0200
@@ -514,6 +514,10 @@
    case PCI_CHIP_I915_GM:
    case PCI_CHIP_I945_G:
    case PCI_CHIP_I945_GM:
+   case PCI_CHIP_I945_GME:
+   case PCI_CHIP_G33_G:
+   case PCI_CHIP_Q35_G:
+   case PCI_CHIP_Q33_G:
       return i915CreateContext( mesaVis, driContextPriv, 
 			       sharedContextPrivate );
  
diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_tex.c ./intel_tex.c
--- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915/intel_tex.c	2007-06-22 00:14:38.000000000 +0200
+++ ./intel_tex.c	2007-06-06 00:55:28.000000000 +0200
@@ -677,7 +677,11 @@
    /* Time for another vtbl entry:
     */
    else if (intel->intelScreen->deviceID == PCI_CHIP_I945_G ||
-            intel->intelScreen->deviceID == PCI_CHIP_I945_GM) {
+            intel->intelScreen->deviceID == PCI_CHIP_I945_GM ||
+            intel->intelScreen->deviceID == PCI_CHIP_I945_GME ||
+            intel->intelScreen->deviceID == PCI_CHIP_G33_G ||
+            intel->intelScreen->deviceID == PCI_CHIP_Q33_G ||
+            intel->intelScreen->deviceID == PCI_CHIP_Q35_G) {
       GLuint row_len = image->Width * image->TexFormat->TexelBytes;
       GLubyte *dst = (GLubyte *)(t->BufAddr + offset);
       GLubyte *src = (GLubyte *)image->Data;