summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ivan Lozano <ivanlozano@google.com> 2017-12-20 00:54:31 +0000
committer android-build-merger <android-build-merger@google.com> 2017-12-20 00:54:31 +0000
commit6531a6dc2350082a807424c27b09df0ccdaff073 (patch)
treedc958bd416bb9f5b1116f6f5b22440ffbd75fecf
parent4cc0c724b45968355504fc97deaebc407bf22723 (diff)
parente3d84283f86246baa7a6c603599a27d9bb92b9f4 (diff)
Merge "Fix sanitizer in setViewportAndProjection." am: 739c8b7cea
am: e3d84283f8 Change-Id: Ic0da170dce882ef9201734fb8271d9bbaf040407
-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) {