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

i965/miptree: Gather initial aux allocation into a single function

Browse source 
Reviewed-by: Chad Versace <chadversary@chromium.org>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Jason Ekstrand 2017-07-12 16:11:47 -07:00
parent d8f51bfcbf
commit e6b8877a54
1 changed files with 53 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,9 +55,8 @@ static void *intel_miptree_map_raw(struct brw_context *brw,
static void intel_miptree_unmap_raw(struct intel_mipmap_tree *mt);
static bool
intel_miptree_alloc_mcs(struct brw_context *brw,
struct intel_mipmap_tree *mt,
GLuint num_samples);
intel_miptree_alloc_aux(struct brw_context *brw,
struct intel_mipmap_tree *mt);
/**
* Determine which MSAA layout should be used by the MSAA surface being
@ -893,24 +892,9 @@ intel_miptree_create(struct brw_context *brw,
return NULL;
}
if (mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS) {
assert(mt->num_samples > 1);
if (!intel_miptree_alloc_mcs(brw, mt, num_samples)) {
intel_miptree_release(&mt);
return NULL;
}
}
/* Since CCS_E can compress more than just clear color, we create the CCS
* for it up-front. For CCS_D which only compresses clears, we create the
* CCS on-demand when a clear occurs that wants one.
*/
if (mt->aux_usage == ISL_AUX_USAGE_CCS_E) {
if (!intel_miptree_alloc_ccs(brw, mt)) {
intel_miptree_release(&mt);
return NULL;
}
if (!intel_miptree_alloc_aux(brw, mt)) {
intel_miptree_release(&mt);
return NULL;
}
return mt;
@ -1117,15 +1101,9 @@ intel_miptree_create_for_dri_image(struct brw_context *brw,
}
}
/* Since CCS_E can compress more than just clear color, we create the CCS
* for it up-front. For CCS_D which only compresses clears, we create the
* CCS on-demand when a clear occurs that wants one.
*/
if (mt->aux_usage == ISL_AUX_USAGE_CCS_E) {
if (!intel_miptree_alloc_ccs(brw, mt)) {
intel_miptree_release(&mt);
return NULL;
}
if (!intel_miptree_alloc_aux(brw, mt)) {
intel_miptree_release(&mt);
return NULL;
}
return mt;
@ -2001,6 +1979,51 @@ intel_miptree_alloc_hiz(struct brw_context *brw,
return true;
}
/**
* Allocate the initial aux surface for a miptree based on mt->aux_usage
*
* Since MCS and CCS_E can compress more than just clear color, we create the
* auxiliary surfaces up-front. CCS_D, on the other hand, can only compress
* clear color so we wait until an actual fast-clear to allocate it.
*/
static bool
intel_miptree_alloc_aux(struct brw_context *brw,
struct intel_mipmap_tree *mt)
{
switch (mt->aux_usage) {
case ISL_AUX_USAGE_NONE:
return true;
case ISL_AUX_USAGE_HIZ:
/* HiZ gets allocated elsewhere for no good reason. */
return true;
case ISL_AUX_USAGE_MCS:
assert(_mesa_is_format_color_format(mt->format));
assert(mt->num_samples > 1);
if (!intel_miptree_alloc_mcs(brw, mt, mt->num_samples))
return false;
return true;
case ISL_AUX_USAGE_CCS_D:
/* Since CCS_D can only compress clear color so we wait until an actual
* fast-clear to allocate it.
*/
return true;
case ISL_AUX_USAGE_CCS_E:
assert(_mesa_is_format_color_format(mt->format));
assert(mt->num_samples <= 1);
if (!intel_miptree_alloc_ccs(brw, mt))
return false;
return true;
}
unreachable("Invalid aux usage");
}
/**
* Can the miptree sample using the hiz buffer?
*/