diff options
author | 2017-12-16 00:23:30 +0000 | |
---|---|---|
committer | 2017-12-16 00:23:30 +0000 | |
commit | da9904d64dee0ca253d85c6674d04d87dd50d4b5 (patch) | |
tree | 772db109ebbb38ffdaee397c77acc4add7991e92 | |
parent | 6ac728f9644aad3813bad2a340f15b5338cc074b (diff) | |
parent | 1f58ac5324caee1665cce61a1679fa187c578b5b (diff) |
Merge "Fix sanitizer in setViewportAndProjection."
-rw-r--r-- | services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp index 3161888577..d1ee6f8c9c 100644 --- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp @@ -154,12 +154,12 @@ size_t GLES20RenderEngine::getMaxViewportDims() const { 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) { |