Wang Zhenyu wrote:
> Attach patches for adding support of these chips.
>
> Can I apply checkin permission to mesa?
Yes - I think you need to submit a bug report to fd.o asking for git
access, or something along those lines.
The patches look good though.
Keith
> ------------------------------------------------------------------------
>
> From 846daa132131a7043edffb1f85ac960318da5cac Mon Sep 17 00:00:00 2001
> From: Wang Zhenyu <[EMAIL PROTECTED]>
> Date: Wed, 30 May 2007 16:03:50 +0800
> Subject: [PATCH 1/3] i965: Add pci info for 965GME/GLE chip.
>
> ---
> src/mesa/drivers/dri/i965/intel_context.c | 13 ++++++++-----
> src/mesa/drivers/dri/i965/intel_context.h | 1 +
> 2 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_context.c
> b/src/mesa/drivers/dri/i965/intel_context.c
> index 10eb9a2..4f51fef 100644
> --- a/src/mesa/drivers/dri/i965/intel_context.c
> +++ b/src/mesa/drivers/dri/i965/intel_context.c
> @@ -106,20 +106,23 @@ static const GLubyte *intelGetString( GLcontext *ctx,
> GLenum name )
> case GL_RENDERER:
> switch (intel_context(ctx)->intelScreen->deviceID) {
> case PCI_CHIP_I965_Q:
> - chipset = "Intel(R) 965Q"; break;
> + chipset = "Intel(R) 965Q";
> break;
> case PCI_CHIP_I965_G:
> case PCI_CHIP_I965_G_1:
> - chipset = "Intel(R) 965G"; break;
> + chipset = "Intel(R) 965G";
> break;
> case PCI_CHIP_I946_GZ:
> - chipset = "Intel(R) 946GZ"; break;
> + chipset = "Intel(R) 946GZ";
> break;
> case PCI_CHIP_I965_GM:
> - chipset = "Intel(R) 965GM"; break;
> + chipset = "Intel(R) 965GM";
> + break;
> + case PCI_CHIP_I965_GME:
> + chipset = "Intel(R) 965GME/GLE";
> break;
> default:
> - chipset = "Unknown Intel Chipset"; break;
> + chipset = "Unknown Intel Chipset";
> }
>
> (void) driGetRendererString( buffer, chipset, DRIVER_VERSION, 0 );
> diff --git a/src/mesa/drivers/dri/i965/intel_context.h
> b/src/mesa/drivers/dri/i965/intel_context.h
> index a3c65b6..406f848 100644
> --- a/src/mesa/drivers/dri/i965/intel_context.h
> +++ b/src/mesa/drivers/dri/i965/intel_context.h
> @@ -385,6 +385,7 @@ extern int INTEL_DEBUG;
> #define PCI_CHIP_I965_G_1 0x2982
> #define PCI_CHIP_I946_GZ 0x2972
> #define PCI_CHIP_I965_GM 0x2A02
> +#define PCI_CHIP_I965_GME 0x2A12
>
>
> /* ================================================================
>
>
> ------------------------------------------------------------------------
>
> From 0d91379d1d716b6c87ae3573ca0c41882f01c664 Mon Sep 17 00:00:00 2001
> From: Wang Zhenyu <[EMAIL PROTECTED]>
> Date: Wed, 30 May 2007 16:11:12 +0800
> Subject: [PATCH 2/3] i915: Add support for 945GME chip
>
> ---
> src/mesa/drivers/dri/i915/i915_texstate.c | 3 ++-
> src/mesa/drivers/dri/i915/intel_context.c | 2 ++
> src/mesa/drivers/dri/i915/intel_context.h | 1 +
> src/mesa/drivers/dri/i915/intel_screen.c | 1 +
> src/mesa/drivers/dri/i915/intel_tex.c | 3 ++-
> 5 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c
> b/src/mesa/drivers/dri/i915/i915_texstate.c
> index 9f0c949..d0e8474 100644
> --- 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 e747fc6..9f25b09 100644
> --- 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 c48b074..ae05145 100644
> --- 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 67e176a..d6c1cfe 100644
> --- 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 98ddc79..d75ebd8 100644
> --- 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;
>
>
> ------------------------------------------------------------------------
>
> From 0983aef6530b7ca5d56f2029b571de48a725b228 Mon Sep 17 00:00:00 2001
> From: Wang Zhenyu <[EMAIL PROTECTED]>
> Date: Wed, 30 May 2007 16:18:26 +0800
> Subject: [PATCH 3/3] i915tex: Add support for 945GME
>
> ---
> src/mesa/drivers/dri/i915tex/intel_context.c | 3 +++
> src/mesa/drivers/dri/i915tex/intel_context.h | 1 +
> src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c | 1 +
> src/mesa/drivers/dri/i915tex/intel_screen.c | 1 +
> 4 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i915tex/intel_context.c
> b/src/mesa/drivers/dri/i915tex/intel_context.c
> index 20b2b41..e581cb0 100644
> --- a/src/mesa/drivers/dri/i915tex/intel_context.c
> +++ b/src/mesa/drivers/dri/i915tex/intel_context.c
> @@ -130,6 +130,9 @@ intelGetString(GLcontext * ctx, GLenum name)
> 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/i915tex/intel_context.h
> b/src/mesa/drivers/dri/i915tex/intel_context.h
> index e61d72e..24e2b37 100644
> --- a/src/mesa/drivers/dri/i915tex/intel_context.h
> +++ b/src/mesa/drivers/dri/i915tex/intel_context.h
> @@ -385,6 +385,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/i915tex/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c
> index 8e83028..9e90dd1 100644
> --- a/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c
> @@ -79,6 +79,7 @@ intel_miptree_create(struct intel_context *intel,
> switch (intel->intelScreen->deviceID) {
> case PCI_CHIP_I945_G:
> case PCI_CHIP_I945_GM:
> + case PCI_CHIP_I945_GME:
> ok = i945_miptree_layout(mt);
> break;
> case PCI_CHIP_I915_G:
> diff --git a/src/mesa/drivers/dri/i915tex/intel_screen.c
> b/src/mesa/drivers/dri/i915tex/intel_screen.c
> index 5e6df81..5840d62 100644
> --- a/src/mesa/drivers/dri/i915tex/intel_screen.c
> +++ b/src/mesa/drivers/dri/i915tex/intel_screen.c
> @@ -752,6 +752,7 @@ 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);
>
> default:
>
>
> ------------------------------------------------------------------------
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by DB2 Express
> Download DB2 Express C - the FREE version of DB2 express and take
> control of your XML. No limits. Just data. Click to get it now.
> http://sourceforge.net/powerbar/db2/
>
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> Mesa3d-dev mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
