diff options
| author | Joshua Duong <joshuaduong@google.com> | 2023-04-18 19:05:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-18 19:05:55 +0000 |
| commit | a8eaebbacd54cff813fe19cbda9572c420463b0c (patch) | |
| tree | 7aa852a59e35a53fc636390a627b8a431bdefc5e | |
| parent | 25ea2519544539e361bd03056fec4f7e78337d4c (diff) | |
| parent | 5befea5fc51d0ed25773155dfd5ae046e896fe12 (diff) | |
| download | vulkan-cereal-a8eaebbacd54cff813fe19cbda9572c420463b0c.tar.gz | |
Use correct screen width/height in screenshots. am: f931778bbd am: ac31b833ab am: 5befea5fc5
Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2544010
Change-Id: I736f1330c3d3eb7e39f6e12c051ba1d836d66239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | stream-servers/FrameBuffer.cpp | 4 | ||||
| -rw-r--r-- | stream-servers/gl/ColorBufferGl.cpp | 2 |
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); |