[Mesa-dev] [PATCH 11/41] intel: Kill intel_mipmap_level::nr_images

[Chad Versace]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/18/2011 12:22 PM, Eric Anholt wrote:
> On Thu, 17 Nov 2011 19:58:38 -0800, Chad Versace <chad.versace at linux.intel.com> wrote:
>>    - For GL_TEXTURE_3D, it is the texture's depth at each miplevel. It's
>>      value, like width and height, varies with miplevel.
> 
> "Its"

I'll fix the two "It's".

>> diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
> The changes in this file don't seem to fit in this patch.

Oops. These hunks are complete mistake. I assume they were introduced by a rebase.
They will be removed.

>> diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
>> index f4c1a68..8dad011 100644
>> --- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
>> +++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
>> @@ -140,12 +140,13 @@ intel_tex_map_image_for_swrast(struct intel_context *intel,
>>     if (mt->target == GL_TEXTURE_3D ||
>>         mt->target == GL_TEXTURE_2D_ARRAY ||
>>         mt->target == GL_TEXTURE_1D_ARRAY) {
>> -      int i;
>>  
>>        /* ImageOffsets[] is only used for swrast's fetch_texel_3d, so we can't
>>         * share code with the normal path.
>>         */
>> -      for (i = 0; i < mt->level[level].depth; i++) {
>> +      assert(face == 0);
>> +      int depth = mt->level[level].depth;
>> +      for (int i = 0; i < depth; i++) {
>>  	 intel_miptree_get_image_offset(mt, level, face, i, &x, &y);
>>  	 intel_image->base.ImageOffsets[i] = x + y * mt->region->pitch;
>>        }
> 
> Not really seeing the point of this hunk (pulling depth out of the loop)

This is really a sloppy commit. There is no need for this hunk either.

Other than the spurious hunks, are you ok with this patch?

- ----
Chad Versace
chad.versace at linux.intel.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOxs/XAAoJEAIvNt057x8i0YYP/1cgZSGYaug1vvgPgWkm1AUZ
V52Az/xLhDKtMEsiENuGPIZedNjk4jUyajnfxCc4vFYPtW4pcN0CefA7TYClSfXJ
7oIMvbV+MB7PLdfBKWDFcjoS/UNPyISOtc6nXISF3KAyq42ry82pNjtHP6D8r2zr
yh90bnQLEotXlsyYQKP9CG/FUXyG/tTFmh/JxEHyXOWu0zfEy/D8wKvxr9KzowoW
x+KOyR3NAQqyI20hivrwwJgqzD4H0nAZdghuTQl37LHV1RCjEKkZZ3jy7guVGwU8
bGBDYJUHdTmyzLxN+NlcZtMBbkAuCWlJmdVbtSIhHmk/OxVesCtqoKV7hqbciIsT
ofvz3QYgNqsvAaw0YEKx9GEpkqm9332saS5lBn9DLewk3fseXA+hmaGompvgl4nv
NbXW//rVuBoq1MmwUENMfXJfYdSkTMtvtpBurh/Ols57CaefD9bAaVxJGPhjdg3j
km3vrQ9qtCF+IrpCAvQ+SZkv2hU9N2C7ao2W8PRWEHfSVbOUxrJxNMQ+NAp/14XO
MLmUC+5W9nsw+3QB2kGngEosaghkcFqGn4vCqL1Vm7lZWsvx8s9uX/Ob6CU6fPeG
a7zCD6wBKocCcGhVbu1d1V3k3rrYd3pQyYqYs89YqkISOEjGte+sYr2lVeximbCE
d2DCo2vkxPU3on+IwFH0
=MDMI
-----END PGP SIGNATURE-----