diff options
| author | Jason Ekstrand <[email protected]> | 2017-05-25 12:30:50 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-06-07 22:18:53 -0700 |
| commit | 170e4b366af76983caca5daff236b00e9b19ffee (patch) | |
| tree | 295c86a23e41524f23a5e1108c64052c1c5705db | |
| parent | 8cb3b4a586c9b5caca323814e18aa057c9c2ed0b (diff) | |
i965: Move images to the new resolve functions
Reviewed-by: Topi Pohjolainen <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 3 |
3 files changed, 13 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index c7dfe14e245..0cc72bfc83b 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -253,14 +253,7 @@ intel_update_state(struct gl_context * ctx, GLuint new_state) tex_obj = intel_texture_object(u->TexObj); if (tex_obj && tex_obj->mt) { - /* Access to images is implemented using indirect messages - * against data port. Normal render target write understands - * lossless compression but unfortunately the typed/untyped - * read/write interface doesn't. Therefore even lossless - * compressed surfaces need to be resolved prior to accessing - * them. Hence skip setting INTEL_MIPTREE_IGNORE_CCS_E. - */ - intel_miptree_all_slices_resolve_color(brw, tex_obj->mt, 0); + intel_miptree_prepare_image(brw, tex_obj->mt); if (intel_miptree_is_lossless_compressed(brw, tex_obj->mt) && intel_disable_rb_aux_buffer(brw, tex_obj->mt->bo)) { diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index c8fddc27030..4e913882fff 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -2469,6 +2469,15 @@ intel_miptree_prepare_texture(struct brw_context *brw, } void +intel_miptree_prepare_image(struct brw_context *brw, + struct intel_mipmap_tree *mt) +{ + /* The data port doesn't understand any compression */ + intel_miptree_prepare_access(brw, mt, 0, INTEL_REMAINING_LEVELS, + 0, INTEL_REMAINING_LAYERS, false, false); +} + +void intel_miptree_prepare_fb_fetch(struct brw_context *brw, struct intel_mipmap_tree *mt, uint32_t level, uint32_t start_layer, uint32_t num_layers) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h index 7613db57def..799695d0a01 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h @@ -1051,6 +1051,9 @@ intel_miptree_prepare_texture(struct brw_context *brw, mesa_format view_format, bool *aux_supported_out); void +intel_miptree_prepare_image(struct brw_context *brw, + struct intel_mipmap_tree *mt); +void intel_miptree_prepare_fb_fetch(struct brw_context *brw, struct intel_mipmap_tree *mt, uint32_t level, uint32_t start_layer, uint32_t num_layers); |