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

Commit bfb2389a authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "[HWUI] Minor ANativeWindow usage cleanup"

parents 08885374 a5a0c962

libs/hwui/renderthread/EglManager.cpp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <log/log.h>

#include <private/gui/SyncFeatures.h>

#include <sync/sync.h>

#include <system/window.h>

#include <utils/Trace.h>



#include <string>

libs/hwui/renderthread/VulkanSurface.cpp

+10 −10
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ namespace renderthread { 


static int InvertTransform(int transform) {

    switch (transform) {

        case NATIVE_WINDOW_TRANSFORM_ROT_90:

            return NATIVE_WINDOW_TRANSFORM_ROT_270;

        case NATIVE_WINDOW_TRANSFORM_ROT_180:

            return NATIVE_WINDOW_TRANSFORM_ROT_180;

        case NATIVE_WINDOW_TRANSFORM_ROT_270:

            return NATIVE_WINDOW_TRANSFORM_ROT_90;

        case ANATIVEWINDOW_TRANSFORM_ROTATE_90:

            return ANATIVEWINDOW_TRANSFORM_ROTATE_270;

        case ANATIVEWINDOW_TRANSFORM_ROTATE_180:

            return ANATIVEWINDOW_TRANSFORM_ROTATE_180;

        case ANATIVEWINDOW_TRANSFORM_ROTATE_270:

            return ANATIVEWINDOW_TRANSFORM_ROTATE_90;

        default:

            return 0;

    }
@@ -47,11 +47,11 @@ static SkMatrix GetPreTransformMatrix(SkISize windowSize, int transform) { 
    switch (transform) {

        case 0:

            return SkMatrix::I();

        case NATIVE_WINDOW_TRANSFORM_ROT_90:

        case ANATIVEWINDOW_TRANSFORM_ROTATE_90:

            return SkMatrix::MakeAll(0, -1, height, 1, 0, 0, 0, 0, 1);

        case NATIVE_WINDOW_TRANSFORM_ROT_180:

        case ANATIVEWINDOW_TRANSFORM_ROTATE_180:

            return SkMatrix::MakeAll(-1, 0, width, 0, -1, height, 0, 0, 1);

        case NATIVE_WINDOW_TRANSFORM_ROT_270:

        case ANATIVEWINDOW_TRANSFORM_ROTATE_270:

            return SkMatrix::MakeAll(0, 1, 0, -1, 0, width, 0, 0, 1);

        default:

            LOG_ALWAYS_FATAL("Unsupported Window Transform (%d)", transform);
@@ -168,7 +168,7 @@ bool VulkanSurface::InitializeWindowInfoStruct(ANativeWindow* window, ColorMode 
    outWindowInfo->transform = query_value;



    outWindowInfo->actualSize = outWindowInfo->size;

    if (outWindowInfo->transform & NATIVE_WINDOW_TRANSFORM_ROT_90) {

    if (outWindowInfo->transform & ANATIVEWINDOW_TRANSFORM_ROTATE_90) {

        outWindowInfo->actualSize.set(outWindowInfo->size.height(), outWindowInfo->size.width());

    }