From 1746671a76f7310d397347ab7c5db0b01706b5c2 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 19 Sep 2017 06:55:32 -0700 Subject: [PATCH] Revert "i965: Reset miptree aux state on update_image_buffer" This reverts commit e97f4b748094466567c7f3bad1a02ecee13db9c8. --- src/mesa/drivers/dri/i965/brw_context.c | 4 +--- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 19 ------------------- src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 3 --- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 9cb16f3fb16..ee1badd94b3 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -1592,10 +1592,8 @@ intel_update_image_buffer(struct brw_context *intel, else last_mt = rb->singlesample_mt; - if (last_mt && last_mt->bo == buffer->bo) { - intel_miptree_finish_external(intel, last_mt); + if (last_mt && last_mt->bo == buffer->bo) return; - } enum isl_colorspace colorspace; switch (_mesa_get_format_color_encoding(intel_rb_format(rb))) { diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 5740f031c49..5b7cde82f65 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -2820,25 +2820,6 @@ intel_miptree_prepare_external(struct brw_context *brw, aux_usage, supports_fast_clear); } -void -intel_miptree_finish_external(struct brw_context *brw, - struct intel_mipmap_tree *mt) -{ - if (!mt->mcs_buf) - return; - - /* We just got this image in from the window system via glxBindTexImageEXT - * or similar and have no idea what the actual aux state is other than that - * we aren't in AUX_INVALID. Reset the aux state to the default for the - * image's modifier. - */ - enum isl_aux_state default_aux_state = - isl_drm_modifier_get_default_aux_state(mt->drm_modifier); - assert(mt->last_level == mt->first_level); - intel_miptree_set_aux_state(brw, mt, 0, 0, INTEL_REMAINING_LAYERS, - default_aux_state); -} - /** * Make it possible to share the BO backing the given miptree with another * process or another miptree. diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h index 08aa9a7b3b2..2fce28c524b 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h @@ -674,9 +674,6 @@ intel_miptree_finish_depth(struct brw_context *brw, void intel_miptree_prepare_external(struct brw_context *brw, struct intel_mipmap_tree *mt); -void -intel_miptree_finish_external(struct brw_context *brw, - struct intel_mipmap_tree *mt); void intel_miptree_make_shareable(struct brw_context *brw, -- 2.30.2