We want both anyway, but this will simplify things a tiny bit in an
upcoming patch.
---
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.15.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
