diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-10 11:24:56 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-10 11:24:56 -0700 |
| commit | 8398535331dae39ff5f52e94a69abdbf7507a343 (patch) | |
| tree | 5e551923af0f9924d66ec8cf36e3486c8825e16f | |
| parent | acfea5c705f383692e661d37c5cd7da2f3db559b (diff) | |
| parent | 2dd3da3a4a2233332219f9da60d18fec79b4b6c7 (diff) | |
| download | external_mesa3d-8398535331dae39ff5f52e94a69abdbf7507a343.zip external_mesa3d-8398535331dae39ff5f52e94a69abdbf7507a343.tar.gz external_mesa3d-8398535331dae39ff5f52e94a69abdbf7507a343.tar.bz2 | |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
src/mesa/drivers/dri/intel/intel_context.c
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_chipset.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h index 3c38f16..3dc8653 100644 --- a/src/mesa/drivers/dri/intel/intel_chipset.h +++ b/src/mesa/drivers/dri/intel/intel_chipset.h @@ -66,6 +66,7 @@ #define PCI_CHIP_Q45_G 0x2E12 #define PCI_CHIP_G45_G 0x2E22 #define PCI_CHIP_G41_G 0x2E32 +#define PCI_CHIP_B43_G 0x2E42 #define PCI_CHIP_ILD_G 0x0042 #define PCI_CHIP_ILM_G 0x0046 @@ -83,7 +84,8 @@ #define IS_G45(devid) (devid == PCI_CHIP_IGD_E_G || \ devid == PCI_CHIP_Q45_G || \ devid == PCI_CHIP_G45_G || \ - devid == PCI_CHIP_G41_G) + devid == PCI_CHIP_G41_G || \ + devid == PCI_CHIP_B43_G) #define IS_GM45(devid) (devid == PCI_CHIP_GM45_GM) #define IS_G4X(devid) (IS_G45(devid) || IS_GM45(devid)) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 89f99f7..2364829 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -162,6 +162,9 @@ intelGetString(GLcontext * ctx, GLenum name) case PCI_CHIP_G41_G: chipset = "Intel(R) G41"; break; + case PCI_CHIP_B43_G: + chipset = "Intel(R) B43"; + break; case PCI_CHIP_ILD_G: chipset = "Intel(R) IGDNG_D"; break; |