diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-26 15:41:24 -0600 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-26 15:41:24 -0600 |
| commit | 2b440d54617bf0020171ce765708e7a9b48f2185 (patch) | |
| tree | f125abe7e2c08ccaee721e895c4adf7f3faac4c2 /src/mesa/drivers/dri/i915/intel_context.c | |
| parent | ab57cbaccccb30fd743ba3283251430e6bc3a071 (diff) | |
| parent | b422e5ad3716d32f2434ca38819f4a877c7eeeeb (diff) | |
| download | external_mesa3d-2b440d54617bf0020171ce765708e7a9b48f2185.zip external_mesa3d-2b440d54617bf0020171ce765708e7a9b48f2185.tar.gz external_mesa3d-2b440d54617bf0020171ce765708e7a9b48f2185.tar.bz2 | |
Merge branch 'master' into autoconf2
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index c67d906..f407f7e 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -202,7 +202,7 @@ const struct dri_extension card_extensions[] = { {"GL_NV_blend_square", NULL}, {"GL_NV_vertex_program", GL_NV_vertex_program_functions}, {"GL_NV_vertex_program1_1", NULL}, -/* { "GL_SGIS_generate_mipmap", NULL }, */ + { "GL_SGIS_generate_mipmap", NULL }, {NULL, NULL} }; @@ -544,8 +544,8 @@ intelInitContext(struct intel_context *intel, #if DO_DEBUG INTEL_DEBUG = driParseDebugString(getenv("INTEL_DEBUG"), debug_control); - if (!intel->ttm && (INTEL_DEBUG & DEBUG_BUFMGR)) - dri_bufmgr_fake_set_debug(intel->bufmgr, GL_TRUE); + if (INTEL_DEBUG & DEBUG_BUFMGR) + dri_bufmgr_set_debug(intel->bufmgr, GL_TRUE); #endif if (getenv("INTEL_NO_RAST")) { @@ -591,8 +591,6 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv) intel->first_swap_fence = NULL; } - dri_bufmgr_destroy(intel->bufmgr); - if (release_texture_heaps) { /* This share group is about to go away, free our private * texture object data. @@ -603,6 +601,8 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv) /* free the Mesa context */ _mesa_free_context_data(&intel->ctx); + + dri_bufmgr_destroy(intel->bufmgr); } } |