diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-14 11:22:05 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-14 11:22:05 +0200 |
| commit | 9f273f109875cd9208d4c1c8f5939fb5e507c230 (patch) | |
| tree | 35c8adedcf44cf8eb3bddbb51b5efa766539a07b /src/mesa/drivers/dri/intel/intel_context.c | |
| parent | fab99092a0879531442d1dd20f971ae7eda824eb (diff) | |
| parent | aad0deee4b2d347bdfc536fe98938ed825bf0f6b (diff) | |
Merge commit 'origin/master' into glsl-pp-rework-2
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 89f99f7ffd..7e21b94acc 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; @@ -641,10 +644,6 @@ intelInitContext(struct intel_context *intel, intel->maxBatchSize = BATCH_SZ; intel->bufmgr = intelScreen->bufmgr; - - if (0) /* for debug */ - drm_intel_bufmgr_set_debug(intel->bufmgr, 1); - intel->ttm = intelScreen->ttm; if (intel->ttm) { int bo_reuse_mode; |