diff options
author | Eric Anholt <eric@anholt.net> | 2011-01-05 16:02:42 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2011-01-05 16:11:30 -0800 |
commit | 1b18b45d79e065e4e05a1e89e9d756d96258ded5 (patch) | |
tree | 88cfc84a1b9c2cbc6d627ffe96f1e1985be7de1a /src/mesa/drivers/dri/intel/intel_tex_obj.h | |
parent | 9b7f57b18eff3959a525297f068697ac03a75840 (diff) |
intel: Clarify first_level/last_level vs baselevel/maxlevel by deletion.
This has always been ugly about our texture code -- object base/max
level vs intel object first/last level vs image level vs miptree
first/last level. We now get rid of intelObj->first_level which is
just tObj->BaseLevel, and make intelObj->_MaxLevel clearly based off
of tObj->_MaxLevel instead of duplicating its code (incorrectly, as
image->MaxLog2 only considers width/height and not depth!)
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_obj.h')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_obj.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_obj.h b/src/mesa/drivers/dri/intel/intel_tex_obj.h index 5f60e0ea4f..e93ef4a472 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_obj.h +++ b/src/mesa/drivers/dri/intel/intel_tex_obj.h @@ -32,11 +32,11 @@ struct intel_texture_object { struct gl_texture_object base; /* The "parent" object */ - /* The mipmap tree must include at least these levels once - * validated: + /* This is a mirror of base._MaxLevel, updated at validate time, + * except that we don't bother with the non-base levels for + * non-mipmapped textures. */ - GLuint firstLevel; - GLuint lastLevel; + unsigned int _MaxLevel; /* Offset for firstLevel image: */ |