Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da9904d6 authored by Ivan Lozano's avatar Ivan Lozano Committed by Android (Google) Code Review
Browse files

Merge "Fix sanitizer in setViewportAndProjection."

parents 6ac728f9 1f58ac53

services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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) {