Hello community, here is the log from the commit of package Mesa checked in at Thu Jul 5 01:09:29 CEST 2007. -------- --- Mesa/Mesa.changes 2007-06-23 04:52:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2007-07-04 05:09:30.123325000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 4 05:08:57 CEST 2007 - sndirsch@suse.de + +- i915-g33.diff/i915tex-g33.diff + * support for G33/Q33/Q35 + +------------------------------------------------------------------- New: ---- i915-g33.diff i915tex-g33.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.PQ2711/_old 2007-07-05 01:09:05.000000000 +0200 +++ /var/tmp/diff_new_pack.PQ2711/_new 2007-07-05 01:09:05.000000000 +0200 @@ -19,7 +19,7 @@ Obsoletes: xorg-x11-Mesa Autoreqprov: on Version: 7.0 -Release: 2 +Release: 4 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Source: MesaLib-%{version}.tar.bz2 Source1: MesaDemos-%{version}.tar.bz2 @@ -33,6 +33,8 @@ Patch4: libIndirectGL.diff Patch5: static.diff Patch6: link-shared.diff +Patch7: i915-g33.diff +Patch8: i915tex-g33.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -119,6 +121,12 @@ %ifarch %ix86 x86_64 ppc %patch6 %endif +pushd src/mesa/drivers/dri/i915 +%patch7 +popd +pushd src/mesa/drivers/dri/i915tex +%patch8 +popd %build @@ -265,6 +273,9 @@ /usr/%{_lib}/libMesaGL.a %changelog +* Wed Jul 04 2007 - sndirsch@suse.de +- i915-g33.diff/i915tex-g33.diff + * support for G33/Q33/Q35 * Sat Jun 23 2007 - sndirsch@suse.de - updated to final release 7.0 * Thu Jun 21 2007 - sndirsch@suse.de ++++++ i915-g33.diff ++++++ 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; ++++++ i915tex-g33.diff ++++++ diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_context.c ./intel_context.c --- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_context.c 2007-06-22 00:14:38.000000000 +0200 +++ ./intel_context.c 2007-06-06 00:55:28.000000000 +0200 @@ -130,6 +130,18 @@ 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/i915tex/intel_context.h ./intel_context.h --- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_context.h 2007-06-22 00:14:38.000000000 +0200 +++ ./intel_context.h 2007-06-06 00:55:28.000000000 +0200 @@ -381,6 +385,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/i915tex/intel_mipmap_tree.c ./intel_mipmap_tree.c --- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c 2007-06-22 00:14:38.000000000 +0200 +++ ./intel_mipmap_tree.c 2007-06-06 00:55:28.000000000 +0200 @@ -79,6 +79,10 @@ switch (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: ok = i945_miptree_layout(mt); break; case PCI_CHIP_I915_G: diff -u -r /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_screen.c ./intel_screen.c --- /suse/sndirsch/pkgs/openSUSE/xorg73/Mesa/Mesa-7.0/src/mesa/drivers/dri/i915tex/intel_screen.c 2007-06-22 00:14:38.000000000 +0200 +++ ./intel_screen.c 2007-06-06 00:55:28.000000000 +0200 @@ -752,6 +752,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); default: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org