From 0a2e878c69eedb14999c7a6577d80145ea6c680c Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 18 Jun 2016 23:44:44 -0700 Subject: [PATCH] i965: Pass tObj into intel_update_max_level instead of intel_obj. We want both anyway, but this will simplify things a tiny bit in an upcoming patch. Reviewed-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/intel_tex_validate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c index 2b7798c940a..efcf8604b89 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c @@ -43,10 +43,10 @@ * allow sampling beyond level 0. */ static void -intel_update_max_level(struct intel_texture_object *intelObj, +intel_update_max_level(struct gl_texture_object *tObj, struct gl_sampler_object *sampler) { - struct gl_texture_object *tObj = &intelObj->base; + struct intel_texture_object *intelObj = intel_texture_object(tObj); if (!tObj->_MipmapComplete || (tObj->_RenderToTexture && @@ -85,7 +85,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit) */ assert(intelObj->base._BaseComplete); - intel_update_max_level(intelObj, sampler); + intel_update_max_level(tObj, sampler); /* What levels does this validated texture image require? */ int validate_first_level = tObj->BaseLevel; -- 2.30.2