diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-06-18 23:40:21 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-06-24 15:03:44 -0700 |
| commit | 3e258f7e31ab38edd6dbd07a4153c0cc6bce695c (patch) | |
| tree | 84710f3eb007a8a54f3552a7d4b1713d7fe5c57a /src/mesa | |
| parent | 8ee23d6866b9325450d787e5d55a367423ae4316 (diff) | |
| download | external_mesa3d-3e258f7e31ab38edd6dbd07a4153c0cc6bce695c.zip external_mesa3d-3e258f7e31ab38edd6dbd07a4153c0cc6bce695c.tar.gz external_mesa3d-3e258f7e31ab38edd6dbd07a4153c0cc6bce695c.tar.bz2 | |
i965: Drop unused return value from intel_finalize_mipmap_tree().
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>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_validate.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex.h b/src/mesa/drivers/dri/i965/intel_tex.h index 35d0a64..376f075 100644 --- a/src/mesa/drivers/dri/i965/intel_tex.h +++ b/src/mesa/drivers/dri/i965/intel_tex.h @@ -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, diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c index 19a854e..08cf3bf 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c @@ -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; } /** |