Module: Mesa Branch: master Commit: 73c376bbde0cbea1d1e5a6d71df965d2e903e003 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=73c376bbde0cbea1d1e5a6d71df965d2e903e003
Author: Eric Anholt <[email protected]> Date: Thu Dec 20 13:52:30 2012 -0800 intel: Turn a test in miptree_match_image into an assert. Reviewed-by: Kenneth Graunke <[email protected]> --- src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index 9ae7bcc..181130b 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -601,8 +601,11 @@ intel_miptree_match_image(struct intel_mipmap_tree *mt, GLuint level = intelImage->base.Base.Level; int width, height, depth; - if (target_to_target(image->TexObject->Target) != mt->target) - return false; + /* glTexImage* choose the texture object based on the target passed in, and + * objects can't change targets over their lifetimes, so this should be + * true. + */ + assert(target_to_target(image->TexObject->Target) == mt->target); gl_format mt_format = mt->format; if (mt->format == MESA_FORMAT_X8_Z24 && mt->stencil_mt) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
