NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

i965/miptree: Drop the invalidate parameter form copy_teximage

Browse source 
This was a leftover from i915.  The one caller in i965 always passes in
false so there's no point in having the parameter.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2017-10-09 15:08:33 -07:00
parent b03b19f558
commit 92d3f21ec2
3 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1567,16 +1567,11 @@ intel_miptree_copy_slice(struct brw_context *brw,
/**
* Copies the image's current data to the given miptree, and associates that
* miptree with the image.
*
* If \c invalidate is true, then the actual image data does not need to be
* copied, but the image still needs to be associated to the new miptree (this
* is set to true if we're about to clear the image).
*/
void
intel_miptree_copy_teximage(struct brw_context *brw,
struct intel_texture_image *intelImage,
struct intel_mipmap_tree *dst_mt,
bool invalidate)
struct intel_mipmap_tree *dst_mt)
{
struct intel_mipmap_tree *src_mt = intelImage->mt;
struct intel_texture_object *intel_obj =
@ -1599,12 +1594,10 @@ intel_miptree_copy_teximage(struct brw_context *brw,
end_layer = intelImage->base.Base.Depth - 1;
}
if (!invalidate) {
for (unsigned i = start_layer; i <= end_layer; i++) {
intel_miptree_copy_slice(brw,
src_mt, level, i,
dst_mt, level, i);
}
for (unsigned i = start_layer; i <= end_layer; i++) {
intel_miptree_copy_slice(brw,
src_mt, level, i,
dst_mt, level, i);
}
intel_miptree_reference(&intelImage->mt, dst_mt);

2
src/mesa/drivers/dri/i965/intel_mipmap_tree.h
View file

@ -503,7 +503,7 @@ intel_miptree_copy_slice(struct brw_context *brw,
void
intel_miptree_copy_teximage(struct brw_context *brw,
struct intel_texture_image *intelImage,
struct intel_mipmap_tree *dst_mt, bool invalidate);
struct intel_mipmap_tree *dst_mt);
/**
* \name Miptree HiZ functions

6
src/mesa/drivers/dri/i965/intel_tex_validate.c
View file

@ -162,10 +162,8 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
if (intelImage == NULL)
break;
if (intelObj->mt != intelImage->mt) {
intel_miptree_copy_teximage(brw, intelImage, intelObj->mt,
false /* invalidate */);
}
if (intelObj->mt != intelImage->mt)
intel_miptree_copy_teximage(brw, intelImage, intelObj->mt);
/* After we're done, we'd better agree that our layout is
* appropriate, or we'll end up hitting this function again on the