Skip to content

S
swiftshader
Commit 9c27130b by Alexis Hetu Committed by Alexis Hétu
Options

Fixed flipX in Device::copyBuffer

When x was flipped, the entire row would be copied in the reverse byte order, which was wrong for any type with pixels larger than 1 byte. Now the full pixels are copied in the reverse order instead of the bytes, so pixels are no longer byte flipped. Change-Id: Ie0e0516546a49d0f890a4abe24d44ccb3ffb2350 Reviewed-on: https://swiftshader-review.googlesource.com/7362Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 3c99be0d
Showing with 10 additions and 7 deletions
src/OpenGL/libGLESv2/Device.cpp
......@@ -460,9 +460,6 @@ namespace es2
void Device::copyBuffer(sw::byte *sourceBuffer, sw::byte *destBuffer, unsigned int width, unsigned int height, unsigned int sourcePitch, unsigned int destPitch, unsigned int bytes, bool flipX, bool flipY)
{
unsigned int widthB = width * bytes;
unsigned int widthMaxB = widthB - 1;
if(flipX)
{
if(flipY)
......@@ -470,9 +467,11 @@ namespace es2
sourceBuffer += (height - 1) * sourcePitch;
for(unsigned int y = 0; y < height; ++y, sourceBuffer -= sourcePitch, destBuffer += destPitch)
{
for(unsigned int x = 0; x < widthB; ++x)
sw::byte *srcX = sourceBuffer + (width - 1) * bytes;
sw::byte *dstX = destBuffer;
for(unsigned int x = 0; x < width; ++x, dstX += bytes, srcX -= bytes)
{
destBuffer[x] = sourceBuffer[widthMaxB - x];
memcpy(dstX, srcX, bytes);
}
}
}
......@@ -480,15 +479,19 @@ namespace es2
{
for(unsigned int y = 0; y < height; ++y, sourceBuffer += sourcePitch, destBuffer += destPitch)
{
for(unsigned int x = 0; x < widthB; ++x)
sw::byte *srcX = sourceBuffer + (width - 1) * bytes;
sw::byte *dstX = destBuffer;
for(unsigned int x = 0; x < width; ++x, dstX += bytes, srcX -= bytes)
{
destBuffer[x] = sourceBuffer[widthMaxB - x];
memcpy(dstX, srcX, bytes);
}
}
}
}
else
{
unsigned int widthB = width * bytes;
if(flipY)
{
sourceBuffer += (height - 1) * sourcePitch;
......
Markdown is supported
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