[Mesa-dev] [PATCH 08/12] intel: Track miptrees for fake packed depth/stencil renderbuffers.

[Chad Versace]

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

On 12/06/2011 02:43 PM, Eric Anholt wrote:
> On Tue, 06 Dec 2011 10:43:15 -0800, Chad Versace <chad.versace at linux.intel.com> wrote:
>> On 12/05/2011 11:42 AM, Eric Anholt wrote:
> 
>>> --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
>>> +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
>>> @@ -808,8 +808,9 @@ intel_miptree_map_depthstencil(struct intel_context *intel,
>>>  	    ptrdiff_t s_offset = intel_offset_S8(s_mt->region->pitch,
>>>  						 x + s_image_x + map->x,
>>>  						 y + s_image_y + map->y);
>>> -	    ptrdiff_t z_offset = ((y + z_image_y) * z_mt->region->pitch +
>>> -				  (x + z_image_x));
>>> +	    ptrdiff_t z_offset = (((y + map->y + z_image_y) *
>>> +				   z_mt->region->pitch) +
>>> +				  (x + map->x + z_image_x));
>>>  	    uint8_t s = s_map[s_offset];
>>>  	    uint32_t z = z_map[z_offset];
>>
>> I think you intended to squash this hunk into the previous patch. But the hunk is
>> unnecessary anyway, because it just adds redundant parens.
> 
> The addition of map->x/y isn't redundant.  How about folding this hunk
> into HEAD~1 instead:

Oops. You're right, the hunk needs to be folded into HEAD~1.

- ----
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/

iQIcBAEBAgAGBQJO3qcUAAoJEAIvNt057x8iLtAP/0nm2cPke+rRkTdiyqsiTn0R
ZdI3d8bWhczw3JBqOGRFfYh5jRGYLOL8fd9D2O/btf7/vp40eFGBWds0urbPZox9
QE9ZQGGD3T5QTuYN8Xt3DXXD34myjYSb8E81KvqEzvmqqJ0ZebSroydZsYhaJVM8
JTIAjRewQqux6/3x0zGw4MbCTxGmqTfPc2o2LxnXWSpR+195DsXxBEUOkaUVfgMt
FjnsqIpQaDrHnlRvgUDYVTR2SvZQEqtwvmoUEOWmqvI8SYYdlqD39DFK5NbHRfiy
rNXzqhdH8sH0gYFRbfD9dPCwposSQvdaLBXi/ALZBCZAl18zsbdj63A8alo/YX8J
QGWH/L1f6M+0HrSh/0Se6q/xuLd1Zo/U25lUzxHMNRAOXLgUWYFKajQz8aICO4Ia
j8G7wS/4UVmaO3DfLQgHvCF3sRm4DfNvPJWEHjO/uq+P+4vxoFGWcwj9KH/hI1pV
Y5CGYP+DfrHdTHvGt1rZYAqczmn3nmUOG6bNMMZOIrD1NKzJ3Vrw0qc7kfr3TDoo
3aNfG8kddjpTpVDPPum8s+2Zkdce53M1SlPnnLUZfYPO7eI8fLbLFYGqoJ2Li6Pw
TDJ7zA3Eo+TjvSeeYZS7BPlxT+n78N0Ka9pq4Uua9/ZgEnwK7hWhQxOEHXQWW7ve
IyHBkpAdfUzuNnaWAM73
=yQUi
-----END PGP SIGNATURE-----