fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Drop unused return value from intel_finalize_mipmap_tree().

Browse source 
The old return type of GLuint was wonky - it should have been bool.
But nothing actually uses the return value anyway, so we can just drop
that and make it a void function.

In theory, it might make sense to ask whether the texture validated
successfully, but just checking intel_obj->mt != NULL works for that.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Kenneth Graunke 2016-06-18 23:40:21 -07:00
parent 8ee23d6866
commit 3e258f7e31
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@ intel_miptree_create_for_teximage(struct brw_context *brw,
struct intel_texture_image *intelImage,
uint32_t layout_flags);
GLuint intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit);
void intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit);
bool
intel_texsubimage_tiled_memcpy(struct gl_context *ctx,

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

@ -64,7 +64,7 @@ intel_update_max_level(struct intel_texture_object *intelObj,
* BaseLevel/MaxLevel/filtering, and copy in any texture images that are
* stored in other miptrees.
*/
GLuint
void
intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
{
struct gl_context *ctx = &brw->ctx;
@ -78,7 +78,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
/* TBOs require no validation -- they always just point to their BO. */
if (tObj->Target == GL_TEXTURE_BUFFER)
return true;
return;
/* We know that this is true by now, and if it wasn't, we might have
* mismatched level sizes and the copies would fail.
@ -98,7 +98,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
if (!intelObj->needs_validate &&
validate_first_level >= intelObj->validated_first_level &&
validate_last_level <= intelObj->validated_last_level) {
return true;
return;
}
/* On recent generations, immutable textures should not get this far
@ -149,7 +149,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
0 /* num_samples */,
layout_flags);
if (!intelObj->mt)
return false;
return;
}
/* Pull in any images not in the object's tree:
@ -180,8 +180,6 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
intelObj->validated_last_level = validate_last_level;
intelObj->_Format = intelObj->mt->format;
intelObj->needs_validate = false;
return true;
}
/**