ilo: remove ilo_image_disable_aux()

Fail resource creation when aux bo allocation fails.
This commit is contained in:
Chia-I Wu 2015-06-25 07:18:31 +08:00
parent 07acf9cb16
commit f825fe8e13
3 changed files with 2 additions and 28 deletions

View File

@ -1449,22 +1449,3 @@ ilo_image_init_for_imported(struct ilo_image *img,
return true;
}
bool
ilo_image_disable_aux(struct ilo_image *img, const struct ilo_dev *dev)
{
/* HiZ is required for separate stencil on Gen6 */
if (ilo_dev_gen(dev) == ILO_GEN(6) &&
img->aux.type == ILO_IMAGE_AUX_HIZ &&
img->separate_stencil)
return false;
/* MCS is required for multisample images */
if (img->aux.type == ILO_IMAGE_AUX_MCS &&
img->sample_count > 1)
return false;
img->aux.enables = 0x0;
return true;
}

View File

@ -157,9 +157,6 @@ ilo_image_init_for_imported(struct ilo_image *img,
enum gen_surface_tiling tiling,
unsigned bo_stride);
bool
ilo_image_disable_aux(struct ilo_image *img, const struct ilo_dev *dev);
static inline bool
ilo_image_can_enable_aux(const struct ilo_image *img, unsigned level)
{

View File

@ -283,8 +283,6 @@ tex_destroy(struct ilo_texture *tex)
static bool
tex_alloc_bos(struct ilo_texture *tex)
{
struct ilo_screen *is = ilo_screen(tex->base.screen);
if (!tex->imported && !tex_create_bo(tex))
return false;
@ -294,13 +292,11 @@ tex_alloc_bos(struct ilo_texture *tex)
switch (tex->image.aux.type) {
case ILO_IMAGE_AUX_HIZ:
if (!tex_create_hiz(tex) &&
!ilo_image_disable_aux(&tex->image, &is->dev))
if (!tex_create_hiz(tex))
return false;
break;
case ILO_IMAGE_AUX_MCS:
if (!tex_create_mcs(tex) &&
!ilo_image_disable_aux(&tex->image, &is->dev))
if (!tex_create_mcs(tex))
return false;
break;
default: