From 6ab9fe7673c77a367ceca3e77d95617b5a2a412f Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 31 May 2018 11:42:17 -0700 Subject: [PATCH] i965/miptree: Rename a parameter to create_for_dri_image Instead of having it be a general "is this a winsys image" boolean, make it more specific to the actual purpose. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 6 +++--- src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 7d1fa96b919..69024c0678b 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -1013,7 +1013,7 @@ struct intel_mipmap_tree * intel_miptree_create_for_dri_image(struct brw_context *brw, __DRIimage *image, GLenum target, mesa_format format, - bool is_winsys_image) + bool allow_internal_aux) { uint32_t bo_tiling, bo_swizzle; brw_bo_get_tiling(image->bo, &bo_tiling, &bo_swizzle); @@ -1056,7 +1056,7 @@ intel_miptree_create_for_dri_image(struct brw_context *brw, * other hand, have no resolve point so we can't have aux without a * modifier. */ - if (!is_winsys_image) + if (!allow_internal_aux) mt_create_flags |= MIPTREE_CREATE_NO_AUX; /* If we have a modifier which specifies aux, don't create one yet */ @@ -1105,7 +1105,7 @@ intel_miptree_create_for_dri_image(struct brw_context *brw, * as part of the flush operation. */ mt->supports_fast_clear = - is_winsys_image || mod_info->supports_clear_color; + allow_internal_aux || mod_info->supports_clear_color; /* We don't know the actual state of the surface when we get it but we * can make a pretty good guess based on the modifier. What we do know diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h index 42f73ba1f96..ef8f51840cc 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h @@ -410,7 +410,7 @@ intel_miptree_create_for_dri_image(struct brw_context *brw, __DRIimage *image, GLenum target, mesa_format format, - bool is_winsys_image); + bool allow_internal_aux); bool intel_update_winsys_renderbuffer_miptree(struct brw_context *intel, -- 2.30.2