summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ivan Lozano <ivanlozano@google.com> 2017-12-20 00:46:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-12-20 00:46:28 +0000
commit739c8b7cea53635e6dfc5e684760cdfb89cdd97c (patch)
tree08a2c41709d92dd4644e95d526819d30da68856b
parenta9c7e6d15201dbb701dc1f535689910a581912b0 (diff)
parent054888fddbf8a5f62ebd65c10c849ff00b46c63c (diff)
Merge "Fix sanitizer in setViewportAndProjection."
-rw-r--r--services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
index 37a530b33a..9c0af8b2ed 100644
--- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
@@ -166,12 +166,12 @@ void GLES20RenderEngine::setViewportAndProjection(
size_t vpw, size_t vph, Rect sourceCrop, size_t hwh, bool yswap,
Transform::orientation_flags rotation) {
- size_t l = sourceCrop.left;
- size_t r = sourceCrop.right;
+ int32_t l = sourceCrop.left;
+ int32_t r = sourceCrop.right;
// In GL, (0, 0) is the bottom-left corner, so flip y coordinates
- size_t t = hwh - sourceCrop.top;
- size_t b = hwh - sourceCrop.bottom;
+ int32_t t = hwh - sourceCrop.top;
+ int32_t b = hwh - sourceCrop.bottom;
mat4 m;
if (yswap) {