diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 18:57:46 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 19:03:02 +0100 |
| commit | 89ab66448e1bcd78caab6678261c2885dcff741c (patch) | |
| tree | be36d7e3eba3f64e54da34ff7ba64b3eb14e56aa /src/mesa/drivers/dri/intel/intel_screen.c | |
| parent | 1074e8e4e47bb4af73c7ef730d0fec40e826cc7e (diff) | |
| parent | 5e530d8384b0d9bb867d6407315587c84a443902 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/trivial/Makefile
src/mesa/glapi/glthread.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 1de1ac49ea..373e0e155e 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -298,11 +298,6 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv) &intelScreen->irq_active)) return GL_FALSE; - /* Determine if batchbuffers are allowed */ - if (!intel_get_param(sPriv, I915_PARAM_ALLOW_BATCHBUFFER, - &intelScreen->allow_batchbuffer)) - return GL_FALSE; - sPriv->extensions = intelScreenExtensions; return GL_TRUE; @@ -314,6 +309,7 @@ intelDestroyScreen(__DRIscreenPrivate * sPriv) { intelScreenPrivate *intelScreen = (intelScreenPrivate *) sPriv->private; + dri_bufmgr_destroy(intelScreen->bufmgr); intelUnmapScreenRegions(intelScreen); FREE(intelScreen); |