[Mesa-dev] [PATCH] nv50: correctly calculate the number of vertical blocks during transfer map

[Emil Velikov]

On 24/02/14 17:04, Ilia Mirkin wrote:
> On Mon, Feb 24, 2014 at 11:46 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> 
> Nice catch! Does this fix any piglits, or just fixes some
> XY_OUT_OF_BOUNDS errors? ms_x == ms_y for ms = 4, which oddly enough
> is where copyteximage passed (should have noticed that earlier, but
> only made the connection just now). [Interesting, copyteximage
> samples=4 even passes on nva0+, where it fails without samples being
> set...]
> 
> Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
> 
That's the bad part, I did not notice any difference in a couple of
piglits including the XY_OUT_OF_BOUNDS errors that brought me there in
the first place. There is minor improvements in some
EXT_framebuffer_multisample/accuracy tests but they were still failing.

Btw I will cc stable before pushing, unless someone objects on the subject.

Thanks
-Emil

>> ---
>>  src/gallium/drivers/nouveau/nv50/nv50_transfer.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_transfer.c b/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
>> index a990682..f716052 100644
>> --- a/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
>> +++ b/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
>> @@ -278,7 +278,7 @@ nv50_miptree_transfer_map(struct pipe_context *pctx,
>>
>>     if (util_format_is_plain(res->format)) {
>>        tx->nblocksx = box->width << mt->ms_x;
>> -      tx->nblocksy = box->height << mt->ms_x;
>> +      tx->nblocksy = box->height << mt->ms_y;
>>     } else {
>>        tx->nblocksx = util_format_get_nblocksx(res->format, box->width);
>>        tx->nblocksy = util_format_get_nblocksy(res->format, box->height);
>> --
>> 1.9.0
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev