Commit 9f7d4004 authored by Kenneth Moreland's avatar Kenneth Moreland
Browse files

Radix-k: Special case of no-split, one composite not handled correctly.

parent 413e5d7e
......@@ -720,8 +720,8 @@ static void radixkCompositeIncomingImages(radixkPartnerInfo *partners,
/* We will be reusing buffers like crazy, but we'll need at least one more
for the first composite, assuming we have at least two composites. */
width = icetSparseImageGetWidth(me->sendImage);
height = icetSparseImageGetHeight(me->sendImage);
width = icetSparseImageGetWidth(me->receiveImage);
height = icetSparseImageGetHeight(me->receiveImage);
if (total_composites >= 2) {
spare_image = icetGetStateBufferSparseImage(RADIXK_SPARE_BUFFER,
width,
......@@ -730,15 +730,18 @@ static void radixkCompositeIncomingImages(radixkPartnerInfo *partners,
spare_image = icetSparseImageNull();
}
/* Grumble. Stupid special case where there is only one composite and
we want the result to go in the same image as my send image (which can
/* Grumble. Stupid special case where there is only one composite and we
want the result to go in the same image as my receive image (which can
happen when not splitting). */
if (icetSparseImageEqual(me->sendImage,image) && (total_composites < 2)) {
if (icetSparseImageEqual(me->receiveImage,image) && (total_composites < 2)){
spare_image = icetGetStateBufferSparseImage(RADIXK_SPARE_BUFFER,
width,
height);
icetSparseImageCopyPixels(me->sendImage, 0, width*height, spare_image);
me->sendImage = spare_image;
icetSparseImageCopyPixels(me->receiveImage,
0,
width*height,
spare_image);
me->receiveImage = spare_image;
}
/* Start by trying to composite the implicit receive from myself. It won't
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment