i915: Add support for 945GME chip

diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index 9f0c9491b22468b00fd7a3f7e98fd9ecf8826ec1..d0e8474b449505dd9fbba4431519a9f8a2e84161 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -493,7 +493,8 @@ static void i915SetTexImages( i915ContextPtr i915,
 
 
    if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G ||
-       i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM)
+       i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM ||
+       i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GME)
       i945LayoutTextureImages( i915, tObj );    
    else
       i915LayoutTextureImages( i915, tObj );

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index e747fc6991b5e0e92bdce8082d961cd6d64cf604..9f25b099b11e92d0bbf10244445b2ad5b6ed03a0 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -123,6 +123,8 @@ const GLubyte *intelGetString( GLcontext *ctx, GLenum name )
         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;
       default:
         chipset = "Unknown Intel Chipset"; break;
       }

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index c48b074cc5147117358e3cca3524da79a5dd2b79..ae05145a56b054492ba9f6c780fd2c8e5f929953 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -454,6 +454,7 @@ extern int INTEL_DEBUG;
 #define PCI_CHIP_I915_GM               0x2592
 #define PCI_CHIP_I945_G                        0x2772
 #define PCI_CHIP_I945_GM               0x27A2
+#define PCI_CHIP_I945_GME              0x27AE
 
 
 /* ================================================================

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 67e176a1c6ff56d2dfd9273b4633d7d4affcb556..d6c1cfe6565249a06aa12b49bc6d89942146d938 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -514,6 +514,7 @@ static GLboolean intelCreateContext( const __GLcontextModes *mesaVis,
    case PCI_CHIP_I915_GM:
    case PCI_CHIP_I945_G:
    case PCI_CHIP_I945_GM:
+   case PCI_CHIP_I945_GME:
       return i915CreateContext( mesaVis, driContextPriv, 
                               sharedContextPrivate );
  

diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c
index 98ddc7967244e873f631ca1a2ae00b8b94e16e2d..d75ebd8ffcfe58309a68b2387f3e256b3da8f392 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_tex.c
+++ b/src/mesa/drivers/dri/i915/intel_tex.c
@@ -677,7 +677,8 @@ static void intelUploadTexImage( intelContextPtr intel,
    /* 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) {
       GLuint row_len = image->Width * image->TexFormat->TexelBytes;
       GLubyte *dst = (GLubyte *)(t->BufAddr + offset);
       GLubyte *src = (GLubyte *)image->Data;