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

i965: Add new interface for full color resolves

Browse source 
Upcoming patches will introduce fast clear in level/layer
granularity like the driver does already for depth/hiz. This patch
introduces equivalent full resolve option.

Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Topi Pohjolainen 2016-06-10 08:23:40 +03:00
parent 71d48d6f42
commit 12010b9226
8 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -263,7 +263,7 @@ intel_update_state(struct gl_context * ctx, GLuint new_state)
*/
const int flags = intel_texture_view_requires_resolve(brw, tex_obj) ?
0 : INTEL_MIPTREE_IGNORE_CCS_E;
intel_miptree_resolve_color(brw, tex_obj->mt, flags);
intel_miptree_all_slices_resolve_color(brw, tex_obj->mt, flags);
brw_render_cache_set_check_flush(brw, tex_obj->mt->bo);
if (tex_obj->base.StencilSampling ||
@ -291,7 +291,7 @@ intel_update_state(struct gl_context * ctx, GLuint new_state)
* compressed surfaces need to be resolved prior to accessing
* them. Hence skip setting INTEL_MIPTREE_IGNORE_CCS_E.
*/
intel_miptree_resolve_color(brw, tex_obj->mt, 0);
intel_miptree_all_slices_resolve_color(brw, tex_obj->mt, 0);
if (intel_miptree_is_lossless_compressed(brw, tex_obj->mt) &&
intel_disable_rb_aux_buffer(brw, tex_obj->mt->bo)) {
@ -348,7 +348,7 @@ intel_update_state(struct gl_context * ctx, GLuint new_state)
* should be impossible to get here with such surfaces.
*/
assert(!intel_miptree_is_lossless_compressed(brw, mt));
intel_miptree_resolve_color(brw, mt, 0);
intel_miptree_all_slices_resolve_color(brw, mt, 0);
brw_render_cache_set_check_flush(brw, mt->bo);
}
}

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

@ -227,11 +227,11 @@ copy_miptrees(struct brw_context *brw,
*/
intel_miptree_all_slices_resolve_hiz(brw, src_mt);
intel_miptree_all_slices_resolve_depth(brw, src_mt);
intel_miptree_resolve_color(brw, src_mt, 0);
intel_miptree_all_slices_resolve_color(brw, src_mt, 0);
intel_miptree_all_slices_resolve_hiz(brw, dst_mt);
intel_miptree_all_slices_resolve_depth(brw, dst_mt);
intel_miptree_resolve_color(brw, dst_mt, 0);
intel_miptree_all_slices_resolve_color(brw, dst_mt, 0);
_mesa_get_format_block_size(src_mt->format, &bw, &bh);

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

@ -2237,6 +2237,13 @@ intel_miptree_resolve_color(struct brw_context *brw,
}
}
void
intel_miptree_all_slices_resolve_color(struct brw_context *brw,
struct intel_mipmap_tree *mt,
int flags)
{
intel_miptree_resolve_color(brw, mt, flags);
}
/**
* Make it possible to share the BO backing the given miptree with another
@ -2259,7 +2266,7 @@ intel_miptree_make_shareable(struct brw_context *brw,
assert(mt->msaa_layout == INTEL_MSAA_LAYOUT_NONE);
if (mt->mcs_buf) {
intel_miptree_resolve_color(brw, mt, 0);
intel_miptree_all_slices_resolve_color(brw, mt, 0);
mt->fast_clear_state = INTEL_FAST_CLEAR_STATE_NO_MCS;
}
}
@ -2416,7 +2423,7 @@ intel_miptree_map_raw(struct brw_context *brw, struct intel_mipmap_tree *mt)
/* CPU accesses to color buffers don't understand fast color clears, so
* resolve any pending fast color clears before we map.
*/
intel_miptree_resolve_color(brw, mt, 0);
intel_miptree_all_slices_resolve_color(brw, mt, 0);
drm_intel_bo *bo = mt->bo;

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

@ -993,6 +993,11 @@ intel_miptree_resolve_color(struct brw_context *brw,
struct intel_mipmap_tree *mt,
int flags);
void
intel_miptree_all_slices_resolve_color(struct brw_context *brw,
struct intel_mipmap_tree *mt,
int flags);
void
intel_miptree_make_shareable(struct brw_context *brw,
struct intel_mipmap_tree *mt);

2
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
View file

@ -256,7 +256,7 @@ do_blit_bitmap( struct gl_context *ctx,
/* The blitter has no idea about fast color clears, so we need to resolve
* the miptree before we do anything.
*/
intel_miptree_resolve_color(brw, irb->mt, 0);
intel_miptree_all_slices_resolve_color(brw, irb->mt, 0);
/* Chop it all into chunks that can be digested by hardware: */
for (py = 0; py < height; py += DY) {

2
src/mesa/drivers/dri/i965/intel_pixel_read.c
View file

@ -138,7 +138,7 @@ intel_readpixels_tiled_memcpy(struct gl_context * ctx,
/* Since we are going to read raw data to the miptree, we need to resolve
* any pending fast color clears before we start.
*/
intel_miptree_resolve_color(brw, irb->mt, 0);
intel_miptree_all_slices_resolve_color(brw, irb->mt, 0);
bo = irb->mt->bo;

2
src/mesa/drivers/dri/i965/intel_tex_image.c
View file

@ -523,7 +523,7 @@ intel_gettexsubimage_tiled_memcpy(struct gl_context *ctx,
/* Since we are going to write raw data to the miptree, we need to resolve
* any pending fast color clears before we start.
*/
intel_miptree_resolve_color(brw, image->mt, 0);
intel_miptree_all_slices_resolve_color(brw, image->mt, 0);
bo = image->mt->bo;

2
src/mesa/drivers/dri/i965/intel_tex_subimage.c
View file

@ -139,7 +139,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
/* Since we are going to write raw data to the miptree, we need to resolve
* any pending fast color clears before we start.
*/
intel_miptree_resolve_color(brw, image->mt, 0);
intel_miptree_all_slices_resolve_color(brw, image->mt, 0);
bo = image->mt->bo;