1 files changed, 17 insertions, 7 deletions

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index d3f0681807..e2388dbb09 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -205,7 +205,6 @@ static const struct dri_extension card_extensions[] = {
    {"GL_ARB_texture_rectangle", NULL},
    {"GL_NV_texture_rectangle", NULL},
    {"GL_EXT_texture_rectangle", NULL},
-   {"GL_ARB_point_sprite", NULL},
    {"GL_ARB_point_parameters", NULL}, 
    {"GL_ARB_vertex_buffer_object", GL_ARB_vertex_buffer_object_functions},
    {"GL_ARB_vertex_program", GL_ARB_vertex_program_functions},
@@ -231,7 +230,6 @@ static const struct dri_extension card_extensions[] = {
    {"GL_EXT_texture_env_dot3", NULL},
    {"GL_EXT_texture_filter_anisotropic", NULL},
    {"GL_EXT_texture_lod_bias", NULL},
-   {"GL_EXT_texture_sRGB", NULL},
    {"GL_3DFX_texture_compression_FXT1", NULL},
    {"GL_APPLE_client_storage", NULL},
    {"GL_MESA_pack_invert", NULL},
@@ -248,6 +246,7 @@ static const struct dri_extension brw_extensions[] = {
    { "GL_ARB_shading_language_120",       GL_VERSION_2_1_functions},
    { "GL_ARB_shader_objects",             GL_ARB_shader_objects_functions},
    { "GL_ARB_vertex_shader",              GL_ARB_vertex_shader_functions},
+   { "GL_ARB_point_sprite", 		  NULL},
    { "GL_ARB_fragment_shader",            NULL },
    { "GL_ARB_draw_buffers",               NULL },
    { "GL_ARB_depth_texture",              NULL },
@@ -257,6 +256,7 @@ static const struct dri_extension brw_extensions[] = {
    /* ARB extn won't work if not enabled */
    { "GL_SGIX_depth_texture",             NULL },
    { "GL_ARB_texture_env_crossbar",       NULL },
+   { "GL_EXT_texture_sRGB",		  NULL},
    { NULL,                                NULL }
 };
 
@@ -456,6 +456,7 @@ intel_init_bufmgr(struct intel_context *intel)
        ttm_supported = GL_FALSE;
 
    if (!ttm_disable && ttm_supported) {
+      int bo_reuse_mode;
       intel->bufmgr = intel_bufmgr_ttm_init(intel->driFd,
 					    DRM_FENCE_TYPE_EXE,
 					    DRM_FENCE_TYPE_EXE |
@@ -463,6 +464,15 @@ intel_init_bufmgr(struct intel_context *intel)
 					    BATCH_SZ);
       if (intel->bufmgr != NULL)
 	 intel->ttm = GL_TRUE;
+
+      bo_reuse_mode = driQueryOptioni(&intel->optionCache, "bo_reuse");
+      switch (bo_reuse_mode) {
+      case DRI_CONF_BO_REUSE_DISABLED:
+	 break;
+      case DRI_CONF_BO_REUSE_ALL:
+	 intel_ttm_enable_bo_reuse(intel->bufmgr);
+	 break;
+      }
    }
    /* Otherwise, use the classic buffer manager. */
    if (intel->bufmgr == NULL) {
@@ -548,6 +558,9 @@ intelInitContext(struct intel_context *intel,
    intel->width = intelScreen->width;
    intel->height = intelScreen->height;
 
+   driParseConfigFiles(&intel->optionCache, &intelScreen->optionCache,
+                       intel->driScreen->myNum,
+		       IS_965(intelScreen->deviceID) ? "i965" : "i915");
    if (intelScreen->deviceID == PCI_CHIP_I865_G)
       intel->maxBatchSize = 4096;
    else
@@ -556,10 +569,6 @@ intelInitContext(struct intel_context *intel,
    if (!intel_init_bufmgr(intel))
       return GL_FALSE;
 
-   driParseConfigFiles(&intel->optionCache, &intelScreen->optionCache,
-                       intel->driScreen->myNum,
-		       IS_965(intelScreen->deviceID) ? "i965" : "i915");
-
    ctx->Const.MaxTextureMaxAnisotropy = 2.0;
 
    /* This doesn't yet catch all non-conformant rendering, but it's a
@@ -855,7 +864,7 @@ intelContendedLock(struct intel_context *intel, GLuint flags)
     */
    if (dPriv) {
       if (sPriv->dri2.enabled)
-	 drawable_changed = __driParseEvents(sPriv, dPriv);
+	drawable_changed = __driParseEvents(dPriv->driContextPriv, dPriv);
       else
 	 DRI_VALIDATE_DRAWABLE_INFO(sPriv, dPriv);
    }
@@ -984,6 +993,7 @@ void LOCK_HARDWARE( struct intel_context *intel )
  */
 void UNLOCK_HARDWARE( struct intel_context *intel )
 {
+   intel->vtbl.note_unlock( intel );
    intel->locked = 0;
 
    DRM_UNLOCK(intel->driFd, intel->driHwLock, intel->hHWContext);