fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "i965: Reset miptree aux state on update_image_buffer"

Browse source 
This reverts commit e97f4b7480.
This commit is contained in:
Jason Ekstrand 2017-09-19 06:55:32 -07:00
parent 7343d27136
commit 1746671a76
3 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -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))) {

19
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -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.

3
src/mesa/drivers/dri/i965/intel_mipmap_tree.h
View file

@ -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,