From 3afbeb115ab19164fb2e5bf8df88b6d03d39254b Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 25 Mar 2015 12:22:40 +0800 Subject: ilo: move BOs from ilo_texture to ilo_image We want to work with ilo_image instead of ilo_texture in core. --- src/gallium/drivers/ilo/ilo_resource.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/gallium/drivers/ilo/ilo_resource.h') diff --git a/src/gallium/drivers/ilo/ilo_resource.h b/src/gallium/drivers/ilo/ilo_resource.h index 3b520aa5b27..b5be9b5300d 100644 --- a/src/gallium/drivers/ilo/ilo_resource.h +++ b/src/gallium/drivers/ilo/ilo_resource.h @@ -111,11 +111,8 @@ struct ilo_texture { struct ilo_image image; /* XXX thread-safety */ - struct intel_bo *bo; struct ilo_texture_slice *slices[PIPE_MAX_TEXTURE_LEVELS]; - struct intel_bo *aux_bo; - struct ilo_texture *separate_s8; }; @@ -149,7 +146,7 @@ static inline struct intel_bo * ilo_resource_get_bo(struct pipe_resource *res) { return (res->target == PIPE_BUFFER) ? - ilo_buffer(res)->bo : ilo_texture(res)->bo; + ilo_buffer(res)->bo : ilo_texture(res)->image.bo; } static inline struct ilo_texture_slice * @@ -206,7 +203,7 @@ ilo_texture_can_enable_hiz(const struct ilo_texture *tex, unsigned level, const struct ilo_texture_slice *slice = ilo_texture_get_slice(tex, level, 0); - return (tex->aux_bo && (slice->flags & ILO_TEXTURE_HIZ)); + return (tex->image.aux_bo && (slice->flags & ILO_TEXTURE_HIZ)); } #endif /* ILO_RESOURCE_H */ -- cgit v1.2.3