Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[HWUI] Minor ANativeWindow usage cleanup

Browse Source 
* Remove unused header in EglManager
* Rename usage of rotation flags to use the public names.

Bug: 137012798
Test: builds
Change-Id: Ia603e8d74c6ba51f77e352333d1e82816582d827
This commit is contained in:
Alec Mouri
2019-12-10 15:10:14 -08:00
parent 3cef3e0be3
commit a5a0c962b6
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hwui/renderthread/EglManager.cpp
View File

@@ -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>

20
libs/hwui/renderthread/VulkanSurface.cpp
View File

@@ -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());
}