summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2016-06-18 23:44:44 -0700
committerKenneth Graunke <kenneth@whitecape.org>2018-01-31 11:33:52 -0800
commit0a2e878c69eedb14999c7a6577d80145ea6c680c (patch)
tree6958c5365cf178c7ae4f786fdd7e15437408fbce
parent876f1537e90685e76a1894f758c63ae9d98a8276 (diff)
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 <topi.pohjolainen@intel.com>
-rw-r--r--src/mesa/drivers/dri/i965/intel_tex_validate.c6
1 files 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 2b7798c940..efcf8604b8 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;