Use correct screen width/height in screenshots. am: f931778bbd am: ac31b833ab am: 5befea5fc5 am: a8eaebbacd

Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2544010

Change-Id: I93196e961f453523a07919ae013bf38940a208e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 4 insertions, 2 deletions

diff --git a/stream-servers/FrameBuffer.cpp b/stream-servers/FrameBuffer.cpp
index 75b22986..90a2a744 100644
--- a/stream-servers/FrameBuffer.cpp
+++ b/stream-servers/FrameBuffer.cpp
@@ -2698,8 +2698,8 @@ int FrameBuffer::getScreenshot(unsigned int nChannels, unsigned int* width, unsi
     Post scrCmd;
     scrCmd.cmd = PostCmd::Screenshot;
     scrCmd.screenshot.cb = colorBuffer.get();
-    scrCmd.screenshot.screenwidth = *width;
-    scrCmd.screenshot.screenheight = *height;
+    scrCmd.screenshot.screenwidth = screenWidth;
+    scrCmd.screenshot.screenheight = screenHeight;
     scrCmd.screenshot.format = format;
     scrCmd.screenshot.type = GL_UNSIGNED_BYTE;
     scrCmd.screenshot.rotation = desiredRotation;
diff --git a/stream-servers/gl/ColorBufferGl.cpp b/stream-servers/gl/ColorBufferGl.cpp
index f3957bfc..3faea8b5 100644
--- a/stream-servers/gl/ColorBufferGl.cpp
+++ b/stream-servers/gl/ColorBufferGl.cpp
@@ -432,6 +432,8 @@ void ColorBufferGl::readPixelsScaled(int width, int height, GLenum p_format, GLe
         if (useSnipping) {
             s_gles2.glReadPixels(rect.pos.x, rect.pos.y, rect.size.w,
                                  rect.size.h, p_format, p_type, readPixelsDst);
+            width = rect.size.w;
+            height = rect.size.h;
         } else {
             s_gles2.glReadPixels(0, 0, width, height, p_format, p_type,
                                  readPixelsDst);