Use the source stride for framebuffer blit.
Previously we assumed the source stride (in pixels) to be the width
rounded up to the next multiple of 2. This is currently correct but
may not hold in the future.
Change-Id: I23a79ace66f720398a120b70081d731c2cf1b4c0
Reviewed-on: https://swiftshader-review.googlesource.com/4481
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Main/FrameBuffer.cpp b/src/Main/FrameBuffer.cpp
index 29371db..ccf9083 100644
--- a/src/Main/FrameBuffer.cpp
+++ b/src/Main/FrameBuffer.cpp
@@ -119,8 +119,9 @@
updateState.width = width;
updateState.height = height;
updateState.destFormat = format;
+ updateState.destStride = stride;
updateState.sourceFormat = sourceFormat;
- updateState.stride = topLeftOrigin ? (int)sourceStride : -(int)sourceStride;
+ updateState.sourceStride = topLeftOrigin ? (int)sourceStride : -(int)sourceStride;
updateState.cursorWidth = cursor.width;
updateState.cursorHeight = cursor.height;
@@ -169,11 +170,10 @@
{
const int width = state.width;
const int height = state.height;
- const int width2 = (state.width + 1) & ~1;
const int dBytes = Surface::bytes(state.destFormat);
- const int dStride = state.stride;
+ const int dStride = state.destStride;
const int sBytes = Surface::bytes(state.sourceFormat);
- const int sStride = topLeftOrigin ? (sBytes * width2) : -(sBytes * width2);
+ const int sStride = state.sourceStride;
Function<Void(Pointer<Byte>, Pointer<Byte>, Pointer<Byte>)> function;
{
